diff -upBr SlimServer_v2004-06-15/HTML/Default/home.html server/HTML/Default/home.html
--- SlimServer_v2004-06-15/HTML/Default/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Default/home.html	2004-06-15 10:20:46.000000000 -0700
@@ -62,7 +62,7 @@
 									<tr><td height="15" valign="center">&#149; <a href="browseid3.html?genre=*&amp;artist=*&amp;player=[% player | uri %]">[% "BROWSE_BY_ALBUM" | string %]</a></td></tr>
 [% IF additionalLinks.browse %]
     [% FOREACH link = additionalLinks.browse %]
-									<tr><td height="15" valign="center">&#149; <a href="[% link.value %]player=[% player | uri %]">[% link.key %]</a></td></tr>
+									<tr><td height="15" valign="center">&#149; <a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a></td></tr>
     [% END %]
 [% END %]
 								</table>
@@ -105,7 +105,7 @@
 									<tr><td height="15" valign="center">&#149; <a href="search.html?type=song&amp;player=[% player | uri %]">[% "SEARCHFOR_SONGTITLE" | string %]</a></td></tr>
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
-									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a></td></tr>
+									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a></td></tr>
     [% END %]
 [% END %]
 								</table>
@@ -147,7 +147,7 @@
 								[% player_list %]
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]
-									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key %]</a></td></tr>
+									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key | string %]</a></td></tr>
     [% END %]
 [% END %]
 								</table>
@@ -235,7 +235,7 @@
 									<tr><td height="15" valign="center">&#149; <a href="http://www.slimdevices.com/" target="website">[% "ABOUT_SLIMDEVICES" | string %]</a></td></tr>
 [% IF additionalLinks.help %]
     [% FOREACH key = additionalLinks.help.keys %]
-									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a></td></tr>
+									<tr><td height="15" valign="center">&#149; <a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a></td></tr>
     [% END %]
 [% END %]
 								</table>
diff -upBr SlimServer_v2004-06-15/HTML/EN/home.html server/HTML/EN/home.html
--- SlimServer_v2004-06-15/HTML/EN/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/EN/home.html	2004-06-15 10:25:00.000000000 -0700
@@ -22,9 +22,9 @@
  		<a href="browseid3.html?genre=*&artist=*&player=[% player | uri %]">[% "BROWSE_BY_ALBUM" | string %]</a>
  	</li>
 [% IF additionalLinks.browse %]
-    [% FOREACH key = additionalLinks.browse.keys %]
+    [% FOREACH link = additionalLinks.browse %]
     <li>
- 		<a href="[% additionalLinks.browse.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -43,7 +43,7 @@
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
     <li>
- 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -57,7 +57,7 @@
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]
     <li>
- 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -94,7 +94,7 @@
 [% IF additionalLinks.help %]
     [% FOREACH key = additionalLinks.help.keys %]
     <li>
- 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
diff -upBr SlimServer_v2004-06-15/HTML/Fishbone/home.html server/HTML/Fishbone/home.html
--- SlimServer_v2004-06-15/HTML/Fishbone/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Fishbone/home.html	2004-06-15 10:24:58.000000000 -0700
@@ -14,7 +14,7 @@
 [% IF additionalLinks.browse %]
     [% FOREACH link = additionalLinks.browse %]
     <li>
- 		<a href="[% link.value %]player=[% player | uri %]">[% link.key %]</a>
+ 		<a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -33,7 +33,7 @@
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
     <li>
- 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -47,7 +47,7 @@
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]
     <li>
- 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -84,7 +84,7 @@
 [% IF additionalLinks.help %]
     [% FOREACH key = additionalLinks.help.keys %]
     <li>
- 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
diff -upBr SlimServer_v2004-06-15/HTML/Fishbone/html/docs/help.html server/HTML/Fishbone/html/docs/help.html
--- SlimServer_v2004-06-15/HTML/Fishbone/html/docs/help.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Fishbone/html/docs/help.html	2004-06-15 10:24:57.000000000 -0700
@@ -9,7 +9,7 @@
 			<li><a href="http://www.slimdevices.com/" target="website">[% "ABOUT_SLIMDEVICES" | string %]</a></li>
 			  [% IF additionalLinks.help %]
 					  [% FOREACH key = additionalLinks.help.keys %]
-							  <li><a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a></li>
+							  <li><a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a></li>
 					  [% END %]
 			  [% END %]
 		</ul>
diff -upBr SlimServer_v2004-06-15/HTML/Fishbone/pageheader.html server/HTML/Fishbone/pageheader.html
--- SlimServer_v2004-06-15/HTML/Fishbone/pageheader.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Fishbone/pageheader.html	2004-06-15 10:34:54.000000000 -0700
@@ -99,7 +99,7 @@
 						<OPTION [% IF page == 'song' %]selected[% END %][% IF browseby == 'BROWSE_BY_SONG' %]selected[% END %] label="song" value="song">[% "BROWSE_BY_SONG" | string %]</OPTION>
 					[% IF additionalLinks.browse %]
 						[% FOREACH link = additionalLinks.browse %]
-						<OPTION [% IF page == link.key %]selected[% END %] value="song" label="[% link.key %]">[% link.key %]</OPTION>
+						<OPTION [% IF page == link.key %]selected[% END %] value="song" label="[% link.key %]">[% link.key | string %]</OPTION>
 						[% END %]
 					[% END %]
 					</SELECT> [% "FOR" | string %]
diff -upBr SlimServer_v2004-06-15/HTML/Handheld/home.html server/HTML/Handheld/home.html
--- SlimServer_v2004-06-15/HTML/Handheld/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Handheld/home.html	2004-06-15 10:23:38.000000000 -0700
@@ -19,9 +19,9 @@
          <a href="browseid3.html?genre=*&artist=*&player=[% player | uri %]">[% "BROWSE_BY_ALBUM" | string %]</a>
     </li>
 [% IF additionalLinks.browse %]
-    [% FOREACH key = additionalLinks.browse.keys %]
+    [% FOREACH link = additionalLinks.browse %]
     <li>
- 		<a href="[% additionalLinks.browse.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -41,7 +41,7 @@
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
     <li>
- 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
diff -upBr SlimServer_v2004-06-15/HTML/Moser/home.html server/HTML/Moser/home.html
--- SlimServer_v2004-06-15/HTML/Moser/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/Moser/home.html	2004-06-15 10:24:13.000000000 -0700
@@ -12,9 +12,9 @@
     <li><a href="browseid3.html?genre=*&player=[% player | uri %]">[% "BROWSE_BY_ARTIST" | string %]</a></li>
     <li><a href="browseid3.html?genre=*&artist=*&player=[% player | uri %]">[% "BROWSE_BY_ALBUM" | string %]</a></li>
 [% IF additionalLinks.browse %]
-    [% FOREACH key = additionalLinks.browse.keys %]
+    [% FOREACH link = additionalLinks.browse %]
     <li>
- 		<a href="[% additionalLinks.browse.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -27,7 +27,7 @@
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
     <li>
- 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -39,7 +39,7 @@
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]
     <li>
- 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -65,7 +65,7 @@
 [% IF additionalLinks.help %]
     [% FOREACH key = additionalLinks.help.keys %]
     <li>
- 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
diff -upBr SlimServer_v2004-06-15/HTML/NBMU/home.html server/HTML/NBMU/home.html
--- SlimServer_v2004-06-15/HTML/NBMU/home.html	2004-06-15 02:03:28.000000000 -0700
+++ server/HTML/NBMU/home.html	2004-06-15 10:24:47.000000000 -0700
@@ -34,9 +34,9 @@
         </li>
         <li> <a href="browseid3.html?genre=*&artist=*&player=[% player | uri %]">[% "BROWSE_BY_ALBUM" | string %]</a> 
 [% IF additionalLinks.browse %]
-    [% FOREACH key = additionalLinks.browse.keys %]
+    [% FOREACH value = additionalLinks.browse %]
     <li>
- 		<a href="[% additionalLinks.browse.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% link.value %]player=[% player | uri %]">[% link.key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -49,7 +49,7 @@
 [% IF additionalLinks.search %]
     [% FOREACH key = additionalLinks.search.keys %]
     <li>
- 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.search.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -62,7 +62,7 @@
 [% IF additionalLinks.settings %]
     [% FOREACH key = additionalLinks.settings.keys %]
     <li>
- 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.settings.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
@@ -94,7 +94,7 @@
 [% IF additionalLinks.help %]
     [% FOREACH key = additionalLinks.help.keys %]
     <li>
- 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key %]</a>
+ 		<a href="[% additionalLinks.help.$key %]player=[% player | uri %]">[% key | string %]</a>
  	</li>
     [% END %]
 [% END %]
--- SlimServer_v2004-06-15/Slim/Web/Pages.pm	2004-06-15 02:03:27.000000000 -0700
+++ server/Slim/Web/Pages.pm	2004-06-15 11:30:43.000000000 -0700
@@ -27,23 +27,23 @@ sub home {
 	$params->{'newVersion'} = $::newVersion if $::newVersion;
 
 	if (Slim::Utils::Prefs::get('lookForArtwork')) {
-		addLinks("browse",{string('BROWSE_BY_ARTWORK') => "browseid3.html?genre=*&artist=*&artwork=1"});
+		addLinks("browse",{'BROWSE_BY_ARTWORK' => "browseid3.html?genre=*&artist=*&artwork=1"});
 	} else {
-		addLinks("browse",{string('BROWSE_BY_ARTWORK') => undef});
+		addLinks("browse",{'BROWSE_BY_ARTWORK' => undef});
 		$params->{'noartwork'} = 1;
 	}
 	
 	if (Slim::Utils::Prefs::get('audiodir')) {
-		addLinks("browse",{string('BROWSE_MUSIC_FOLDER') => "browse.html?dir="});
+		addLinks("browse",{'BROWSE_MUSIC_FOLDER' => "browse.html?dir="});
 	} else {
-		addLinks("browse",{string('BROWSE_MUSIC_FOLDER') => undef});
+		addLinks("browse",{'BROWSE_MUSIC_FOLDER' => undef});
 		$params->{'nofolder'}=1;
 	}
 	
 	if (Slim::Utils::Prefs::get('playlistdir') || Slim::Music::iTunes::useiTunesLibrary() || Slim::Music::MoodLogic::useMoodLogic()) {
-		addLinks("browse",{string('SAVED_PLAYLISTS') => "browse.html?dir=__playlists"});
+		addLinks("browse",{'SAVED_PLAYLISTS' => "browse.html?dir=__playlists"});
 	} else {
-		addLinks("browse",{string('SAVED_PLAYLISTS') => undef});
+		addLinks("browse",{'SAVED_PLAYLISTS' => undef});
 	}
 	
 	# fill out the client setup choices