diff --git a/trunk/README b/trunk/README
index b1e0a17..7f2350e 100755
--- a/trunk/README
+++ b/trunk/README
@@ -1,4 +1,4 @@
-GNUtube - http://mister-muffin.de/proj
+Yolanda - http://mister-muffin.de/proj
 =======================================================
 
 A video content management using Perl for the backend and XML and XSLT for the frontend. Video playback is provided by Fluendo's Cortado applet.
@@ -31,7 +31,7 @@ Important: The GNU java implementation does not seem to work with Cortado yet.
 Usage
 =====
 
-Launch the worker script (gnutube_daemon.pl).
+Launch the worker script (daemon.pl).
 
 Help
 ====
diff --git a/trunk/account.pl b/trunk/account.pl
index e4aeba6..a4cd6f6 100644
--- a/trunk/account.pl
+++ b/trunk/account.pl
@@ -20,6 +20,10 @@ if($userinfo->{'username'})
 		#language
 		#cortado or plugin
 	}
+	elsif($query->param('show') eq 'bookmarks')
+	{
+		$page->{'account'}->{'show'} = 'bookmarks';
+	}
 	elsif($query->param('show') eq 'uploads')
 	{
 		$page->{'account'}->{'show'} = 'uploads';
diff --git a/trunk/gnutube_daemon.pl b/trunk/daemon.pl
similarity index 100%
rename from trunk/gnutube_daemon.pl
rename to trunk/daemon.pl
diff --git a/trunk/download.pl b/trunk/download.pl
index 58324e4..c9306a5 100644
--- a/trunk/download.pl
+++ b/trunk/download.pl
@@ -61,7 +61,7 @@ if($query->param('id'))
 		}
 		
 		#in both cases - do some slurp-eaze to the browser
-		open(FILE, "<$gnutube_root/videos/".$query->param('id'));
+		open(FILE, "<$root/videos/".$query->param('id'));
 		print <FILE>;
 		close(FILE);
 	}
diff --git a/trunk/functions.pl b/trunk/functions.pl
index baee7b2..51bc857 100644
--- a/trunk/functions.pl
+++ b/trunk/functions.pl
@@ -5,7 +5,7 @@ require "include.pl";
 sub fill_tagcloud
 {
 	#connect to db
-	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
+	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass);
 	
 	#prepare query
 	my $sth = $dbh->prepare(qq{select text, count from tagcloud }) or die $dbh->errstr;
@@ -33,7 +33,7 @@ sub get_userinfo_from_sid
 	my ($sid) = @_;
 	
 	#connect to db
-	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
+	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass);
 	
 	#prepare query
 	my $sth = $dbh->prepare(qq{select id, username, locale, pagesize, cortado from users where sid = ?}) or die $dbh->errstr;
@@ -79,7 +79,7 @@ sub get_page_array
 sub fill_results
 {
 	#connect to db
-	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass) or die $dbh->errstr;
+	my $dbh = DBI->connect("DBI:mysql:$database:$dbhost", $dbuser, $dbpass);
 	
 	#prepare query
 	my $sth = $dbh->prepare($dbquery) or die $dbh->errstr;
diff --git a/trunk/images/yolanda.svg b/trunk/images/yolanda.svg
index 0d6ffbd..18f8097 100644
--- a/trunk/images/yolanda.svg
+++ b/trunk/images/yolanda.svg
@@ -15,10 +15,10 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="/var/www/gnutube/images"
+   sodipodi:docbase="/var/www/yolanda/images"
    sodipodi:docname="yolanda.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/var/www/gnutube/images/yolanda-big.png"
+   inkscape:export-filename="/var/www/yolanda/images/yolanda-big.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
diff --git a/trunk/include.pl b/trunk/include.pl
index a58cdab..871a8e0 100644
--- a/trunk/include.pl
+++ b/trunk/include.pl
@@ -9,12 +9,12 @@ use LWPx::ParanoidAgent;
 use Net::OpenID::Consumer;
 
 # change this as you install it somewhere else
-$gnutube_root = '/var/www/gnutube';
+$root = '/var/www/yolanda';
 
-use lib qw(/var/www/gnutube);
+use lib qw(/var/www/yolanda);
 
 #set global variables
-$database = 'gnutube';
+$database = 'yolanda';
 $dbhost = 'localhost';
 $dbuser = 'root';
 $dbpass = '';
@@ -22,7 +22,7 @@ $domain = 'http://localhost';
 $session_name = 'sid';
 $XMLDecl = qq{<?xml version="1.0" encoding="UTF-8" ?><?xml-stylesheet type="text/xsl" href="/xsl/xhtml.xsl" ?>};
 $locale = "en-US";
-$stylesheet = "/style/gnutube.css";
+$stylesheet = "/style/default.css";
 $xmlns_dc = "http://purl.org/dc/elements/1.1/";
 $xmlns_cc = "http://web.resource.org/cc/";
 $xmlns_rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
diff --git a/trunk/init_sql.pl b/trunk/init_sql.pl
index ead187b..c6266c1 100644
--- a/trunk/init_sql.pl
+++ b/trunk/init_sql.pl
@@ -39,9 +39,9 @@ $dbh->do(qq{insert into
 $dbh->do(qq{create table
 	config
 	(
-		key			varchar(255)		not null,
+		attribute	varchar(255)		not null,
 		value		varchar(255)		not null,
-		primary key (key)
+		primary key (attribute)
 	)
 }) or die $dbh->errstr;
 
diff --git a/trunk/locale/en-us.xml b/trunk/locale/en-us.xml
index ffa1c0d..c752273 100755
--- a/trunk/locale/en-us.xml
+++ b/trunk/locale/en-us.xml
@@ -20,9 +20,9 @@
 	<str id="logout">logout</str>
 
 	<!-- footer -->
-	<str id="gnutube_authors">&#169; 2007 GNUtube team</str>
-	<str id="gnutube_license">license</str>
-	<str id="gnutube_source_code">download source code</str>
+	<str id="authors">&#169; 2007 Yolanda team</str>
+	<str id="license">license</str>
+	<str id="source_code">download source code</str>
 
 	<!-- front page -->
 	<str id="button_find">Find</str>
diff --git a/trunk/site/main.xml b/trunk/site/main.xml
index 457f266..ba51a7e 100755
--- a/trunk/site/main.xml
+++ b/trunk/site/main.xml
@@ -19,9 +19,9 @@
 	<str id="page_login">/login.pl</str>
 	<str id="page_login-openid">/login.pl?action=openid</str>
 	<str id="page_logout">/login.pl?action=logout</str>
-	<str id="page_gnutube-authors">INSERT LINK TO GNUTUBE AUTHORS HERE</str>
-	<str id="page_gnutube-license">http://gplv3.fsf.org/agplv3-dd1.html</str>
-	<str id="page_gnutube-source-code">http://mister-muffin.de/proj/browser</str>
+	<str id="page_authors">INSERT LINK TO YOLANDA AUTHORS HERE</str>
+	<str id="page_license">http://gplv3.fsf.org/agplv3-dd1.html</str>
+	<str id="page_source-code">http://mister-muffin.de/proj/browser</str>
 	<str id="page_register">/register.pl</str>
 	<str id="page_results">search.pl?query=</str>
 	<str id="page_upload">/upload.pl</str>
diff --git a/trunk/uploader.pl b/trunk/uploader.pl
index f5fca25..1766cc3 100644
--- a/trunk/uploader.pl
+++ b/trunk/uploader.pl
@@ -44,7 +44,7 @@ if($userinfo->{'id'})
 
 	#save uploaded file into temppath
 	$upload_filehandle = $query->upload("file");
-	open(TEMPFILE, ">$gnutube_root/tmp/$id") or die "cannot open";
+	open(TEMPFILE, ">$root/tmp/$id") or die "cannot open";
 	while ( <$upload_filehandle> )
 	{
 		print TEMPFILE;
diff --git a/trunk/xsl/xhtml.xsl b/trunk/xsl/xhtml.xsl
index 9db3906..b591b80 100755
--- a/trunk/xsl/xhtml.xsl
+++ b/trunk/xsl/xhtml.xsl
@@ -20,7 +20,7 @@
 <xsl:include href="/xsl/xhtml/results.xsl"/>
 <xsl:include href="/xsl/xhtml/video.xsl"/>
 
-<xsl:variable name="site_strings" select="document('../site/gnutube.xml')//strings/str" />
+<xsl:variable name="site_strings" select="document('../site/main.xml')//strings/str" />
 <xsl:variable name="locale_strings" select="document(concat('../locale/',/page/@locale,'.xml'))//strings/str" />
 
 <!-- this kills 99% of the processed XML... sorry Tim Bray.... -->
@@ -180,23 +180,23 @@
 			<div class="footer">
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_gnutube-authors']" />
+						<xsl:value-of select="$site_strings[@id='page_authors']" />
 					</xsl:attribute>
-					<xsl:value-of select="$locale_strings[@id='gnutube_authors']" />
+					<xsl:value-of select="$locale_strings[@id='authors']" />
 				</a>
 				<xsl:value-of select="$locale_strings[@id='separator']" />
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_gnutube-license']" />
+						<xsl:value-of select="$site_strings[@id='page_license']" />
 					</xsl:attribute>
-					<xsl:value-of select="$locale_strings[@id='gnutube_license']" />
+					<xsl:value-of select="$locale_strings[@id='license']" />
 				</a>
 				<xsl:value-of select="$locale_strings[@id='separator']" />
 				<a>
 					<xsl:attribute name="href">
-						<xsl:value-of select="$site_strings[@id='page_gnutube-source-code']" />
+						<xsl:value-of select="$site_strings[@id='page_source-code']" />
 					</xsl:attribute>
-				<xsl:value-of select="$locale_strings[@id='gnutube_source_code']" />
+				<xsl:value-of select="$locale_strings[@id='source_code']" />
 				</a>
 			</div>
 
@@ -208,7 +208,7 @@
 <xsl:template name="frontpage">
 
 	<div class="logo-big">
-		<img src="/images/logo-big.png" alt="GNUtube logo (320x100)" />
+		<img src="/images/logo-big.png" alt="Yolanda logo (320x100)" />
 	</div>
 
 	<div class="search">
@@ -257,7 +257,7 @@
 
 	<div class="logo-small-top">
 		<a href="/">
-			<img src="/images/logo-small-top.png" alt="GNUtube logo top (160x25)" />
+			<img src="/images/logo-small-top.png" alt="Yolanda logo top (160x25)" />
 		</a>
 	</div>
 
@@ -275,7 +275,7 @@
 
 	<div class="logo-small-bottom">
 		<a href="/">
-			<img src="/images/logo-small-bottom.png" alt="GNUtube logo top (160x25)" />
+			<img src="/images/logo-small-bottom.png" alt="Yolanda logo top (160x25)" />
 		</a>
 	</div>
 
@@ -541,6 +541,9 @@
 		<xsl:when test="//account/@show='settings'">
 			settings
 		</xsl:when>
+		<xsl:when test="//account/@show='bookmarks'">
+			bookmarks
+		</xsl:when>
 	</xsl:choose>
 </xsl:template>
 
diff --git a/trunk/xsl/xspf.xsl b/trunk/xsl/xspf.xsl
index a21847c..a040dfc 100644
--- a/trunk/xsl/xspf.xsl
+++ b/trunk/xsl/xspf.xsl
@@ -17,7 +17,7 @@
 	omit-xml-declaration="no"
 />
 
-<xsl:variable name="site_strings" select="document('../site/gnutube.xml')//strings" />
+<xsl:variable name="site_strings" select="document('../site/main.xml')//strings" />
 <xsl:variable name="locale_strings" select="document(concat('../locale/',/page/@locale,'.xml'))//strings" />
 
 <xsl:template match="/">
@@ -55,4 +55,4 @@
 
 </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>