more updates to the theme stuff

37 files changed, 257 insertions, 252 deletions

diff --git a/albums.php b/albums.php
index 606104d7..d62097e4 100644
--- a/albums.php
+++ b/albums.php
@@ -151,16 +151,22 @@ elseif ($_REQUEST['action'] === 'update_from_tags') {
 
 else {
 
-	if (strlen($_REQUEST['match']) < '1') { $match = 'none'; }
+	if (strlen($_REQUEST['match']) < '1') { $match = 'a'; }
 
 	// Setup the View Ojbect
         $view = new View();
         $view->import_session_view();
 
+	if ($match == 'Show_all' || $match == 'Show_missing_art' || $match == 'Browse') { $chr = ''; } 
+	else { $chr = $match; } 
+
+	require (conf('prefix') . '/templates/show_box_top.inc.php');
+	show_alphabet_list('albums','albums.php',$match);
+	show_alphabet_form($chr,_('Show Albums starting with'),"albums.php?action=match");
+	require (conf('prefix') . '/templates/show_box_bottom.inc.php');
+
 	switch($match) {
 		case 'Show_all':
-			show_alphabet_list('albums','albums.php','show_all');
-			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
 			$offset_limit = 99999;
                         $sql = "SELECT album.id FROM song,album ".
                                " WHERE song.album=album.id ".
@@ -168,8 +174,6 @@ else {
                                "  HAVING COUNT(song.id) > $min_album_size ";
 			break;
                 case 'Show_missing_art':
-                        show_alphabet_list('albums','albums.php','show_missing_art');
-			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
                         $offset_limit = 99999;
                         $sql = "SELECT album.id FROM song,album ".
                                " WHERE song.album=album.id ".
@@ -179,27 +183,12 @@ else {
                         break; 
 		case 'Browse':
 		case 'show_albums':
-			show_alphabet_list('albums','albums.php','browse');
-			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
-                        $sql = "SELECT album.id FROM song,album ".
-                               " WHERE song.album=album.id ".
-                               "GROUP BY song.album ".
-                               "  HAVING COUNT(song.id) > $min_album_size ";
-			break;
-		case 'none':
-			show_alphabet_list('albums','albums.php','a');
-			show_alphabet_form('',_("Show Albums starting with"),"albums.php?action=match");
                         $sql = "SELECT album.id FROM song,album ".
                                " WHERE song.album=album.id ".
-                               "   AND album.name LIKE 'a%'".
                                "GROUP BY song.album ".
                                "  HAVING COUNT(song.id) > $min_album_size ";
 			break;
 		default:
-			//FIXME: This is the old way of doing it, move this to browse 
-			show_alphabet_list('albums','albums.php',$match);
-			show_alphabet_form($match,_("Show Albums starting with"),"albums.php?action=match");
-			echo "<br /><br />";
                         $sql = "SELECT album.id FROM song,album ".
                                " WHERE song.album=album.id ".
                                "   AND album.name LIKE '$match%'".
diff --git a/artists.php b/artists.php
index 6d4191fb..1f86172d 100644
--- a/artists.php
+++ b/artists.php
@@ -190,21 +190,22 @@ switch($action) {
 	case 'match':
 	case 'Match':
 		$match = scrub_in($_REQUEST['match']);
-		preg_match("/^(\w*)/", $match, $matches);
+		if ($match == "Browse" || $match == "Show_all") { $chr = ""; }
+		else { $chr = $match; } 
+		/* Enclose this in the purty box! */
+		require (conf('prefix') . '/templates/show_box_top.inc.php'); 
 		show_alphabet_list('artists','artists.php',$match);
+		show_alphabet_form($chr,_('Show Artists starting with'),"artists.php?action=match");
+		require (conf('prefix') . '/templates/show_box_bottom.inc.php');
+
 		if ($match === "Browse") {
-			show_alphabet_form('',_('Show Artists starting with'),"artists.php?action=match");
 			show_artists();
 		}
 		elseif ($match === "Show_all") {
-			show_alphabet_form('',_('Show Artists starting with'),"artists.php?action=match");
 			$_SESSION['view_offset_limit'] = 999999;
 			show_artists();
 		}		
 	        else {
-			$chr = preg_replace("/[^a-zA-Z0-9]/", "", $matches[1]);
-			show_alphabet_form($chr,_("Show Artists starting with"),"artists.php?action=match");
-	
 			if ($chr == '') {
 				show_artists('A');
 			}
diff --git a/browse.php b/browse.php
index 8eb2ea12..d12f672a 100644
--- a/browse.php
+++ b/browse.php
@@ -116,10 +116,12 @@ switch($action) {
 
 		$match = scrub_in($_REQUEST['match']);
 
+		require (conf('prefix') . '/templates/show_box_top.inc.php');
 	        show_alphabet_list('song_title','browse.php',$match,'song_title');
                 /* Detect if it's Browse, and if so don't fill it in */
                 if ($match == 'Browse') { $match = ''; }
                 show_alphabet_form($match,_('Show Titles Starting With'),"browse.php?action=song_title&amp;match=$match");
+		require (conf('prefix') . '/templates/show_box_bottom.inc.php');
 	
 		$sql = $song->get_sql_from_match($_REQUEST['match']);
 
@@ -144,12 +146,13 @@ switch($action) {
 	break;
 	/* Throw recently added, updated here */
 	default:
-
+		show_box_top(); 
 		/* Show Most Popular artist/album/songs */
 		show_all_popular();
 
 		/* Show Recent Additions */
 		show_all_recent();
+		show_box_bottom();
 
 	break;
 
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index ee990567..55e82e5a 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.3.2
+	- Introduced new Theming method and 'migrated' all old themes in
+		/contrib results may vary. (Thx Ros)
 	- Added ability to search by Rating, requires MySQL 4.0 or above
 	- Page headers now limited to 20 pages with [....] between top
 		and bottom 10.
diff --git a/index.php b/index.php
index 9cf0b6c7..df7c693d 100644
--- a/index.php
+++ b/index.php
@@ -45,20 +45,21 @@ if (conf('refresh_limit') > 5) {
 }
 ?>
 
-<div id="nowplaying" style="margin-left:25px;">
+<div id="nowplaying">
 	<?php show_now_playing(); ?>
 </div> <!-- Close Now Playing Div -->
 
 <!-- Big Daddy Table -->
+<?php show_box_top(); ?>
 <table id="bigdaddy">
 <tr>
 	<td valign="top">
 		<table border="0"><!-- Left table -->
 		<tr>
-			<td valign="top" align="right">  <!-- sigger: why is it a problem to set width=50% -->
+			<td valign="top"> 
 				<?php show_local_catalog_info(); ?>
 			</td>
-			<td valign="top" align="left">   <!-- sigger: why is it a problem to set width=50% -->
+			<td valign="top">
 			<?php 
 				if ($items = get_global_popular('album')) { 
 					show_info_box(_('Most Popular Albums'), 'album',$items);
@@ -69,14 +70,14 @@ if (conf('refresh_limit') > 5) {
 		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr>
-			<td valign="top" align="right">
+			<td valign="top">
 			<?php
 				if ($items = get_global_popular('artist')) {
 					show_info_box(_('Most Popular Artists'), 'artist', $items);
 				}
 			?>
 			</td>
-			<td valign="top" align="left">
+			<td valign="top">
 			<?php
 				if ($items = get_global_popular('song')) {
 					show_info_box(_('Most Popular Songs'), 'song', $items);
@@ -86,14 +87,14 @@ if (conf('refresh_limit') > 5) {
 		</tr>
 		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr>
-			<td valign="top" align="right">
+			<td valign="top">
 			<?php
 				if ($items = get_newest('artist')) {
 					show_info_box(_('Newest Artist Additions'), '', $items);
 				}
 			?>
 			</td>
-			<td valign="top" align="left">
+			<td valign="top">
 			<?php
 				if ($items = get_newest('album')) {
 					show_info_box(_('Newest Album Additions'), '', $items);
@@ -105,5 +106,6 @@ if (conf('refresh_limit') > 5) {
 	</td>
 </tr>
 </table>
+<?php show_box_bottom(); ?>
 <!-- End Big Daddy Table -->
 <?php show_footer(); ?>
diff --git a/lib/class/genre.class.php b/lib/class/genre.class.php
index 49b21c52..5723ec7a 100644
--- a/lib/class/genre.class.php
+++ b/lib/class/genre.class.php
@@ -274,10 +274,12 @@ class Genre {
 	 */
 	function show_match_list($match) { 
 
+		require (conf('prefix') . '/templates/show_box_top.inc.php');
 		show_alphabet_list('genre','browse.php',$match,'genre');
 		/* Detect if it's Browse, and if so don't fill it in */
 		if ($match == 'Browse') { $match = ''; } 
-		show_alphabet_form($match,_("Show Genres starting with"),"browse.php?action=genre&amp;match=$match");
+		show_alphabet_form($match,_('Show Genres starting with'),"browse.php?action=genre&amp;match=$match");
+		require (conf('prefix') . '/templates/show_box_bottom.inc.php');
 
 	} // show_match_list
 
diff --git a/lib/init.php b/lib/init.php
index 329d1494..865593fa 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) {
 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.3.2 Build (002)';
+$results['version']		= '3.3.2 Build (003)';
 
 $results['raw_web_path']	= $results['web_path'];
 $results['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['web_path'];
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 7bca9ed2..f4783b53 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -210,7 +210,6 @@ function show_alphabet_list ($type,$script="artist.php",$selected="false",$actio
 	$style_name = "style_" . strtolower($selected);
 	${$style_name} = "style=\"font-weight:bold;\"";
 	unset($title);
-	require (conf('prefix') . '/templates/show_box_top.inc.php'); 
 	echo "<div class=\"alphabet\">";
 	foreach ($list as $l) {
 		$style_name = "style_" . strtolower($l);
@@ -224,7 +223,7 @@ function show_alphabet_list ($type,$script="artist.php",$selected="false",$actio
 
 	echo " <a href=\"". conf('web_path') ."/$script?action=$action&amp;match=Show_all\" $style_show_all>" . _("Show all") . "</a>";
 	echo "</div>\n";
-	require (conf('prefix') . '/templates/show_box_bottom.inc.php');
+
 } // show_alphabet_list
 
 /**
@@ -627,7 +626,7 @@ function show_local_catalog_info() {
 	if (!mysql_num_rows($db_results)) {
 		$items[] = "<span align=\"center\" class=\"error\">" . _("No Catalogs Found!") . "</span><br />";
 		$items[] = "<a href=\"" . conf('web_path') . "/admin/catalog.php?action=show_add_catalog\">" ._("Add a Catalog") . "</a>";
-		show_info_box(_("Catalog Statistics"),'catalog',$items);
+		show_info_box(_('Catalog Statistics'),'catalog',$items);
 		return false;
 	}
 
@@ -1264,4 +1263,26 @@ function show_catalog_select($name='catalog',$catalog_id=0,$style='') {
 
 } // show_catalog_select
 
+/**
+ * show_box_top
+ * This function requires the top part of the box
+ * it takes title as an optional argument
+ */
+function show_box_top($title='') { 
+
+	require (conf('prefix') . '/templates/show_box_top.inc.php');	
+
+} // show_box_top
+
+/**
+ * show_box_bottom
+ * This function requires the bottom part of the box
+ * it does not take any arguments
+ */
+function show_box_bottom() { 
+
+	require (conf('prefix') . '/templates/show_box_bottom.inc.php');
+
+} // show_box_bottom
+
 ?>
diff --git a/modules/admin.php b/modules/admin.php
index 42e24e48..33cf37d8 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -42,11 +42,10 @@ function show_access_list () {
 
 function show_manage_users () {
 
-	echo "<table class=\"text-box\">\n<tr><td>\n";
-	echo "<span class=\"header2\">" . _("Manage Users") . "</span><br />\n";
+	show_box_top(_('Manage Users'));
 	echo "<p>Use the following tools to manage the users that access your site.</p>\n";
 	echo "<ul>\n\t<li><a href=\"".conf('web_path') . "/admin/users.php?action=show_add_user\">" . _("Add a new user") . "</a></li>\n</ul>\n";
-	echo "</td></tr></table>";
+	show_box_bottom();
 	
 	show_users();
 } // show_manage_users()
diff --git a/stats.php b/stats.php
index 4a6bf329..5bb87a0c 100644
--- a/stats.php
+++ b/stats.php
@@ -36,10 +36,9 @@ else {
 }
 
 show_template('header');
+$title = $working_user->fullname . ' ' .  _('Favorites') . ':';
 ?>
-
-<span class="header1"><?php echo $working_user->fullname; ?> <?php echo _('Favorites'); ?>:</span>
-
+<?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 <table cellpadding="5" cellspacing="5" border="0" width="100%">
 	<tr>
 		<td valign="top">
@@ -79,4 +78,5 @@ show_template('header');
                 </td>
 	</tr>
 </table>
+<?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
 <?php show_footer(); ?>
diff --git a/templates/default.css b/templates/default.css
index d8fb9ccc..d94cd4f0 100644
--- a/templates/default.css
+++ b/templates/default.css
@@ -327,7 +327,7 @@ div#sidebar{
 /* Styles for Now Playing */
 #nowplaying{
 	clear: all;
-	margin: 10px;
+	width: 625px;
 }
 
 #np_container1{
@@ -427,7 +427,7 @@ margin-right:5em;
 	width: 80px;
 	height: 15px;
 	position: relative;
-	background: url(images/ratings/star_rating.gif) top left repeat-x;        
+	background: url(../images/ratings/star_rating.gif) top left repeat-x;        
 }
 .star-rating li{
 	padding:0px;
@@ -445,18 +445,18 @@ margin-right:5em;
 	padding: 0px;
 }
 .star-rating li a:hover{
-	background: url(images/ratings/star_rating.gif) left center;
+	background: url(../images/ratings/star_rating.gif) left center;
 	z-index: 2;
 	left: 0px;
 }
 li.zero-stars a:hover {
-	background: url(images/ratings/x.gif);
+	background: url(../images/ratings/x.gif);
 	height: 15px;
 	left: 80px;
 	display: block;
 }
 a.zero-stars {
-	background: url(images/ratings/x_off.gif);
+	background: url(../images/ratings/x_off.gif);
 	height: 15px;
 	left: 80px;
 	display: block;
@@ -492,7 +492,7 @@ a.five-stars:hover{
 	width: 80px;
 }
 li.current-rating{
-	background: url(images/ratings/star_rating.gif) left bottom;
+	background: url(../images/ratings/star_rating.gif) left bottom;
 	position: absolute;
 	height: 15px;
 	display: block;
@@ -504,7 +504,7 @@ li.current-rating{
 	padding:0px;
 	background: #f7f7f7;
 }
-.box #box-title { 
+.box-title { 
 	border-bottom: solid 1px; #000000;
 	font-weight: bold;
 }
diff --git a/templates/header.inc b/templates/header.inc
index 542f556e..06a45f3d 100644
--- a/templates/header.inc
+++ b/templates/header.inc
@@ -37,6 +37,7 @@ if (conf('use_rss')) { ?>
 </head>
 <body>
 <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/default.css" type="text/css">
+<link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css">
 <script src="<?php echo $web_path; ?>/lib/general.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script>
 <div id="maincontainer">
diff --git a/templates/show_access_list.inc b/templates/show_access_list.inc
index 25729ded..817dc04f 100644
--- a/templates/show_access_list.inc
+++ b/templates/show_access_list.inc
@@ -31,9 +31,7 @@
 $row_classes = array('even','odd');
 $web_path = conf('web_path');
 ?>
-
-<p class="header1"><?php print _("Host Access to Your Catalog"); ?></p>
-
+<?php show_box_top(_('Host Access to Your Catalog')); ?>
 <p>Since your catalog can be accessed remotely you may want to limit the access from
 remote sources so you are not in violation of copyright laws.  By default your
 server will allow anyone with an account to stream music. It will not allow any
@@ -41,7 +39,11 @@ other Ampache servers to connect to it to share catalog information.  Use tool b
 to add any server's IP address that you want to access your Ampache catalog or be able to 
 stream from this server.</p>
 
-<p><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _("Add Entry"); ?></a></p>
+<p>
+<span class="text-action">
+<a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add Entry'); ?></a>
+</span>
+</p>
 
 <table cellspacing="1" cellpadding="3" class="border">
 <tr class="table-header" align="center">
@@ -71,4 +73,5 @@ if (count($list)) {
 	<?php  } // end foreach ?>
 <?php  } // end if count ?>
 </table>
+<?php show_box_bottom(); ?>
 
diff --git a/templates/show_add_access.inc b/templates/show_add_access.inc
index 06827c9b..9c878365 100644
--- a/templates/show_add_access.inc
+++ b/templates/show_add_access.inc
@@ -24,8 +24,7 @@
 	@header Add Access List Entry
 */
 ?>
-<div class="text-box">
-<p style="font-size: 10pt; font-weight: bold;"><?php echo _('Add Access for a Host'); ?></p>
+<?php show_box_top(_('Add Access for a Host')); ?>
 <p><?php echo _('Use the form below to add a host that you want to have access to your Ampache catalog.'); ?></p>
 
 
@@ -69,4 +68,4 @@
 </tr>
 </table>
 </form>
-</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php
index b0414611..459355fd 100644
--- a/templates/show_admin_info.inc.php
+++ b/templates/show_admin_info.inc.php
@@ -29,21 +29,19 @@ $total_flagged	= $flag->get_total();
 /* Disabled Information Gathering */
 $catalog = new Catalog(); 
 $songs = $catalog->get_disabled(10);
-
 ?>
-<span class="header1"><?php echo _('Information'); ?></span><br />
-<div class="text-box"> 
-<span class="header2"><?php echo _('Last Ten Flagged Records'); ?></span><br />
+
+<?php show_box_top(_('Last Ten Flagged Records')); ?>
 	<?php require (conf('prefix') . '/templates/show_flagged.inc.php'); ?>
 	<div class="text-action">
 	<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"><?php echo _('Show All'); ?>...</a>
 	</div>
-</div><br />
-<span class="header2"><?php echo _('Disabled Songs'); ?></span><br />
-<div class="text-box">	
+<?php show_box_bottom(); ?>
+
+<?php show_box_top(_('Disabled Songs')); ?>
 	<!-- Show Last 10 Disabled Songs -->&nbsp;
 	<?php require (conf('prefix') . '/templates/show_disabled_songs.inc'); ?>
 	<div class="text-action">
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a>
 	</div>
-</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index b843feca..7c73fda2 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -25,10 +25,7 @@ $catalogs 	= $catalog->get_catalogs();
 $users		= $GLOBALS['user']->get_recent(10);
 
 ?>
-<span class="header1"><?php echo _('Catalogs'); ?></span>
-<div class="text-box"> 
-<div class="text-action">
-</div>
+<?php show_box_top(_('Catalogs')); ?>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Name'); ?></th>
@@ -73,18 +70,16 @@ $users		= $GLOBALS['user']->get_recent(10);
 <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a>
 
 </div>
-</div><br />
-<span class="header1"><?php echo _('Other Tools'); ?></span><br />
-<div class="text-box">
+<?php show_box_bottom(); ?>
+<?php show_box_top(_('Other Tools')); ?>
 <div class="text-action">
 	<a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a>
 	<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a>
 </div>
-</div><br />
-<span class="header2"><?php echo _('User Activity'); ?></span><br />
-<div class="text-box">
+<?php show_box_bottom(); ?>
+<?php show_box_top(_('User Activity')); ?>
         <?php require (conf('prefix') . '/templates/show_users_info.inc.php'); ?>
         <div class="text-action">
         <a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Show All'); ?>...</a>
         </div>
-</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php
index 486644b9..551c453e 100644
--- a/templates/show_all_popular.inc.php
+++ b/templates/show_all_popular.inc.php
@@ -23,7 +23,7 @@
 ?>
 <table class="tabledata">
 <tr>
-	<td valign="top" align="right">
+	<td valign="top" >
 		<?php show_info_box(_("Most Popular Artists"), 'artist', $artists); ?>
 	</td>
 	<td valign="top" align="left">
@@ -36,7 +36,7 @@
 	<td valign="top" align="left">
 		<?php show_info_box(_("Most Popular Genres"), '', $genres); ?>
 	</td>
-	<td valign="top" align="right">
+	<td valign="top" >
 		<?php show_info_box(_("Most Popular Songs"), 'song', $songs); ?>
 	</td>
 </tr>
diff --git a/templates/show_all_recent.inc.php b/templates/show_all_recent.inc.php
index 076da614..aec905fe 100644
--- a/templates/show_all_recent.inc.php
+++ b/templates/show_all_recent.inc.php
@@ -23,10 +23,10 @@
 ?>
 <table class="tabledata">
 <tr>
-	<td valign="top" align="right">
+	<td valign="top">
 		<?php show_info_box(_("Newest Artist Additions"), '', $artists); ?>
 	</td>
-	<td valign="top" align="left">
+	<td valign="top">
 		<?php show_info_box(_("Newest Album Additions"), '', $albums); ?>
 	</td>
 </tr>
diff --git a/templates/show_box.inc.php b/templates/show_box.inc.php
index 3e74d9b5..0682a9c4 100644
--- a/templates/show_box.inc.php
+++ b/templates/show_box.inc.php
@@ -20,7 +20,7 @@
 
 */
 ?>
-<?php require(conf('prefix') . '/templates/show_box_top.inc.php'); ?>
+	<span class="box-title"><?php echo $title; ?></span>
 	<ol>
 	<?php
 		foreach ($items as $item) {
@@ -28,4 +28,3 @@
 		}
 	?>
 	</ol>
-<?php require(conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php
index 26aa1fa2..1055ad4f 100644
--- a/templates/show_box_top.inc.php
+++ b/templates/show_box_top.inc.php
@@ -29,7 +29,7 @@
 <tr>
 	<td class="box-left" rowspan="2"></td>
 <?php if ($title) { ?>
-	<td id="box-title"><?php echo $title; ?></td>
+	<td class="box-title"><?php echo $title; ?></td>
 <?php } else { ?>
 	<td></td>
 <?php } ?>
diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php
index bf64f576..165df5b6 100644
--- a/templates/show_confirmation.inc.php
+++ b/templates/show_confirmation.inc.php
@@ -19,8 +19,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 ?>
-<div class="confirmation-box">
-<span class="header1"><?php echo scrub_out($title); ?></span><br />
+<?php show_box_top(scrub_out($title)); ?>
 <?php echo scrub_out($text); ?>
 <br />
 <div class="text-action">
@@ -29,4 +28,4 @@
 	<a href="<?php echo conf('web_path') . "/" . return_referer(); ?>"><?php echo _('Cancel'); ?></a>
 <?php } ?>
 </div>
-</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php
index 7a30034d..4b3f6c2d 100644
--- a/templates/show_local_catalog_info.inc.php
+++ b/templates/show_local_catalog_info.inc.php
@@ -20,35 +20,33 @@
 
 */
 ?>
-<table class="border" cellspacing="1" cellpadding="3" width="100%" border="0"> 
-<tr class="table-header">
-	<td class="table-header" colspan="2"><?php echo _("Catalog Statistics"); ?> </td>
-</tr>
-<tr class="<?php echo flip_class(); ?>">
+<span class="box-title"><?php echo _("Catalog Statistics"); ?></span>
+<table cellspacing="1" cellpadding="3" width="100%" border="0"> 
+<tr>
 	<td><?php echo _("Total Users"); ?></td>
 	<td><b><?php echo $users[0]; ?></b></td>
-  </tr>
-<tr class="<?php echo flip_class(); ?>">
+</tr>
+<tr>
 	<td><?php echo _("Connected Users"); ?></td>
 	<td><b><?php echo $connected_users[0]; ?></b></td>
 </tr>
-<tr class="<?php echo flip_class(); ?>">
+<tr>
 	<td><?php echo _("Albums"); ?></td>
 	<td><b><?php echo $albums[0]; ?></b></td>
 </tr>
-<tr class="<?php echo flip_class(); ?>">
+<tr>
 	<td><?php echo _("Artists"); ?></td>
 	<td><b><?php echo $artists[0]; ?></b></td>
 </tr>
-<tr class="<?php echo flip_class(); ?>">
+<tr>
 	<td><?php echo _("Songs"); ?></td>
 	<td><b><?php echo $songs['songs']; ?></b></td>
 </tr>
-<tr class="<?php echo flip_class(); ?>">
+<tr>
 	<td><?php echo _("Catalog Size"); ?></td>
 	<td><b><?php echo $total_size; ?> <?php echo $size_unit; ?></b></td>
 </tr>
-<tr class="<?php echo flip_class(); ?>">
+<tr>
 	<td><?php echo _("Catalog Time"); ?></td>
 	<td><b><?php echo $time_text; ?></b></td>
 </tr>
diff --git a/templates/show_localplay.inc.php b/templates/show_localplay.inc.php
index 8abc788a..72fa4c51 100644
--- a/templates/show_localplay.inc.php
+++ b/templates/show_localplay.inc.php
@@ -25,18 +25,15 @@ $localplay = init_localplay();
 $songs = $localplay->get();
 ?>
 
-<div class="text-box">
-<span class="header2"><?php echo ucfirst($localplay->type); ?> <?php echo _('Localplay'); ?></span>
+<?php show_box_top(ucfirst($localplay->type) . ' ' . _('Localplay')); ?>
 <ul class="text-action">
 <?php if ($localplay->has_function('delete_all')) { ?>
 	<li><a href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a></li>
 <?php } ?>
 </ul>
-</div>
-<br />
 <?php require_once(conf('prefix') . '/templates/show_localplay_status.inc.php'); ?>
-<br />
-<div class="text-box">
+<?php show_box_bottom(); ?>
+<?php show_box_top(_('Current Playlist')); ?>
 <table class="border" cellspacing="0" border="0">
 <tr class="table-header">
 	<th><?php echo _('Track'); ?></th>
@@ -61,4 +58,4 @@ $songs = $localplay->get();
 </tr>
 <?php } ?>
 </table>
-</div>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index df7857dc..c4352323 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -36,11 +36,9 @@ $track_name = $status['track_artist'] . ' - ' . $status['track_album'] . ' - ' .
 $track_name = ltrim(ltrim($track_name,' - '));
 
 ?>
-<div class="text-box">
 <?php echo _('State') .": ". ucfirst($status['state']); ?><br />
 <?php echo _('Repeat') . ":" . print_boolean($status['repeat']); ?>&nbsp;|&nbsp;
 <?php echo _('Random') . ":" . print_boolean($status['random']); ?><br />
 <?php echo _('Volume') . ":" . $status['volume']; ?><br />
 <br />
 <span class="header2"><?php echo _('Now Playing') . '</span><br />[' . $status['track'] . '] - ' . $track_name . '<br />'; ?>
-</div>
diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php
index 19960474..54f0020b 100644
--- a/templates/show_mail_users.inc.php
+++ b/templates/show_mail_users.inc.php
@@ -20,9 +20,10 @@
 
 */
 ?>
+
 <form name="mail" method="post" action="<?php echo conf('web_path'); ?>/admin/mail.php" enctype="multipart/form-data">
-<span class="header1"><?php echo _('Send E-mail to Users'); ?></span>
-<table class="text-box">
+<?php show_box_top(_('Send E-mail to Users')); ?>
+<table>
   <tr>
     <td><?php echo _('Mail to'); ?>:</td>
     <td>
@@ -56,4 +57,5 @@
     </td>
   </tr>
 </table>
+<?php show_box_bottom(); ?>
 </form>
diff --git a/templates/show_modules.inc.php b/templates/show_modules.inc.php
index 0fc80bfb..4530b75e 100644
--- a/templates/show_modules.inc.php
+++ b/templates/show_modules.inc.php
@@ -30,7 +30,7 @@
 $localplay_modules = get_localplay_controllers(); 
 $web_path = conf('web_path'); 
 ?>
-<span class="header1"><?php echo _('Modules'); ?></span>
+<?php show_box_top(_('Modules')); ?>
 <table class="border" border="0" cellspacing="0">
 <tr class="table-header">
 	<th><?php echo _('Module Name'); ?></th>
@@ -57,3 +57,4 @@ foreach ($localplay_modules as $module) {
 </tr>
 <?php } ?>
 </table>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_now_playing.inc b/templates/show_now_playing.inc
index 77f68dea..ab5773f5 100644
--- a/templates/show_now_playing.inc
+++ b/templates/show_now_playing.inc
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 if (count($results)) {
 ?>
-<table class="box" cellspacing="0" cellpadding="0">
+<table class="box" cellspacing="0" cellpadding="0" style="width:625px;">
 <tr>
         <td class="box-left-top"></td>
         <td class="box-top"></td>
@@ -37,7 +37,7 @@ if (count($results)) {
 </tr>
 <tr>
         <td class="box-left" rowspan="2"></td>
-        <td id="box-title"><?php echo _('Now Playing'); ?></td>
+        <td class="box-title"><?php echo _('Now Playing'); ?></td>
         <td class="box-right" rowspan="2"></td>
 </tr>
 <tr><td style="padding-top:3px;">
@@ -57,7 +57,7 @@ foreach ($results as $item) {
 </td></tr>
 <tr>
         <td class="box-left-bottom"></td>
-        <td class="box-bottom"></td>
+        <td class="box-bottom" style="width:100%;"></td>
         <td class="box-right-bottom"></td>
 </tr>
 </table>
diff --git a/templates/show_playlist_box.inc.php b/templates/show_playlist_box.inc.php
index 26055365..5f1ff2cc 100644
--- a/templates/show_playlist_box.inc.php
+++ b/templates/show_playlist_box.inc.php
@@ -27,12 +27,9 @@
 
 $web_path = conf('web_path'); 
 $playlist_id = scrub_out($_REQUEST['playlist_id']);
+$title = _('Playist Actions');
 ?>
-
-<table class="text-box"> <!-- Playlist Table -->
-<tr>
-	<td>
-		<span class="header1"><?php echo _('Playlist Actions'); ?></span><br />
+<?php require (conf('prefix') . '/templates/show_box_top.inc.php'); ?>
 		<ul class="text-action">
 		<?php if ($_REQUEST['playlist_id']) { ?>
 		<li><a href="<?php echo $web_path; ?>/playlist.php?action=edit&amp;playlist_id=<?php echo $playlist_id; ?>"><?php echo _('Edit Playlist'); ?></a></li>
@@ -48,7 +45,4 @@ $playlist_id = scrub_out($_REQUEST['playlist_id']);
 		<?php } ?>
 		<?php } ?>	
 		</ul>
-	</td>
-</tr>
-</table><!-- End Playlist Table -->
-<br />
+<?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index a18cb651..ce679928 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -25,9 +25,9 @@
  * /playlists.php $type is always passed
  */
 $web_path = conf('web_path');
-
+$title = $type . ' ' . _('Playlists'); 
 ?>
-<h3><?php echo $type . ' ' . _('Playlists'); ?></h3>
+<?php show_box_top($title); ?>
 <table class="tabledata" cellspacing="0" cellpadding="0" border="0"> <!-- Playlist Table -->
 <tr class="table-header">
 	<th><?php echo _('Playlist Name'); ?></th>
@@ -75,4 +75,6 @@ foreach ($playlists as $playlist) {
 	<td colspan="4"><?php echo _('No Playlists Found'); ?></td>
 </tr>
 <?php } ?>
-</table> <!-- End Playlist Table -->
+</table>
+<?php show_box_bottom(); ?>
+
diff --git a/templates/show_random_play.inc b/templates/show_random_play.inc
index 84ef198a..6ead2244 100644
--- a/templates/show_random_play.inc
+++ b/templates/show_random_play.inc
@@ -23,8 +23,7 @@
 
 ?>
 <form id="random" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/song.php">
-<div class="text-box">
-<span class="header2"><?php echo _('Play Random Selection'); ?></span>
+<?php show_box_top(_('Play Random Selection')); ?>
 <table>
 <tr>
 	<td><?php echo _("Item count"); ?></td>
@@ -87,5 +86,5 @@
 	</td>
 </tr>
 </table>
-</div>
+<?php show_box_bottom(); ?>
 </form>
diff --git a/templates/show_search.inc b/templates/show_search.inc
index 393a6c24..09262afe 100644
--- a/templates/show_search.inc
+++ b/templates/show_search.inc
@@ -140,11 +140,11 @@
 </table>
 </form>
 
-<?php if (isset($_REQUEST['search_object'])) { ?>
+<?php if ($_REQUEST['action'] == 'search' || $_REQUEST['action'] == 'quick_search') { ?>
 <br />
 <form method="post" action="<?php echo conf('web_path'); ?>/playlist.php?action=add_dyn_song">
 <?php echo _('Save Search As Track on'); ?>:
-<?php show_playlist_dropdown('', true); ?>
+<?php show_playlist_dropdown($_SESSION['data']['playlist_id']); ?>
 <input class="button" type="submit" value="<?php echo _('Save'); ?>" /></form>
 <?php } ?>
 <?php require (conf('prefix') . '/templates/show_box_bottom.inc.php'); ?>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index 50c918d4..c8dbcc7c 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -55,7 +55,7 @@ if (is_object($playlist) && ($GLOBALS['user']->username == $playlist->user || $G
 	<th><?php echo _('Genre'); ?></th>
 	<th><?php echo _('Action'); ?></th>
 	<?php if (conf('ratings') || conf('ratings')=="false") { ?>
-		<th width="90"><?php echo _('Rating'); ?></th>
+		<th width="95px"><?php echo _('Rating'); ?></th>
 	<?php } ?>            
 </tr>
 <?php
diff --git a/templates/show_users.inc b/templates/show_users.inc
index db3172dd..a6e6442b 100644
--- a/templates/show_users.inc
+++ b/templates/show_users.inc
@@ -28,7 +28,7 @@ $total_items = $view->total_items;
 $admin_menu = "admin/";
 ?>
 
-
+<?php show_box_top(); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0" border="0">
 <tr class="even" align="center">
         <td colspan="8">
@@ -137,3 +137,4 @@ while ($results = mysql_fetch_object($db_result)) {
 </tr>
 <?php } //end while ($results = mysql_fetch_object($db_result)) ?>
 </table>
+<?php show_box_bottom(); ?>
diff --git a/themes/burgundy/templates/style.inc b/themes/burgundy/templates/default.css
index 1eaff7f6..6b77d30e 100644
--- a/themes/burgundy/templates/style.inc
+++ b/themes/burgundy/templates/default.css
@@ -34,43 +34,43 @@
 		margin-top: 0px;
 		margin-left: 0px;
 		margin-right: 0px;
-		background: <?php echo conf('bg_color1'); ?>; 
-		font-family: <?php echo conf('font') ?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
-		color: <?php echo conf('font_color2'); ?>;
+		background: #320000; 
+		font-family: Verdana; 
+		font-size: 12px; 
+		color: #ffffcc;
 		}
 
 	p	
 		{ 
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		color: #ffffcc; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		}
 	a	
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #ffffcc; 
+		font-family: Verdana; 
 		}
 	a:visited 
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #ffffcc; 
+		font-family: Verdana; 
 		}
 	a:active  
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #ffffcc; 
+		font-family: Verdana; 
 		}
 	.text-box 
 		{
 		padding-left:5px;
 		padding-top:5px;
 		margin-bottom:10px;
-		background-color: <?php echo conf('base_color1'); ?>;
-		border-right:2px solid <?php echo conf('bg_color2'); ?>;
-		border-bottom:2px solid <?php echo conf('bg_color2'); ?>;
-		border-left:2px solid <?php echo conf('bg_color2'); ?>;
-		border-top:2px solid <?php echo conf('bg_color2'); ?>;
+		background-color: #320000;
+		border-right:2px solid #7A0000;
+		border-bottom:2px solid #7A0000;
+		border-left:2px solid #7A0000;
+		border-top:2px solid #7A0000;
 		}
     table.tabledata
     {
@@ -79,9 +79,9 @@
 	td	
 		{ 
         padding: 0px 8px 0px 8px;
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px;
+		color: #ffffcc; 
+		font-family: Verdana; 
+		font-size: 12px;
 		}
     th
         {
@@ -89,60 +89,60 @@
         }
 	input	
 		{
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font'); ?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		color: #ffffcc; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		font-weight: bold; 
-		background-color: <?php echo conf('base_color2') ?>; 
+		background-color: #9F0000; 
 		margin: 2px 2px 2px 2px;
 		cursor: pointer;
 		}
 	select	{ 
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
-		background-color: <?php echo conf('base_color2'); ?>; 
+		color: #ffffcc; 
+		font-family: Verdana; 
+		font-size: 12px; 
+		background-color: #9F0000; 
 		}
 	textarea 
 		{ 
-		background-color: <?php echo conf('base_color2'); ?>;
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		background-color: #9F0000;
+		color: #ffffcc; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		}
     .table-header
     {
-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2')?> repeat-x;
+        background: url(../burgundy/images/ampache-light-bg.gif) #9F0000 repeat-x;
         vertical-align: top;
     }
     .header1 
     { 
-	color: <?php echo conf('font_color2'); ?>; 
-	font-family: <?php echo conf('font'); ?>; 
+	color: #ffffcc; 
+	font-family: Verdana; 
 	font-size: <?php echo conf('font_size') + 6; ?>px; 
 	font-weight: 900;
     }
     .header2
     {
-    	color: <?php echo conf('font_color2'); ?>;
-	font-family: <?php echo conf('font'); ?>;
+    	color: #ffffcc;
+	font-family: Verdana;
 	font-size: <?php echo conf('font_size') + 2; ?>px;
 	font-weight: 900;
     }
 	.headrow 
 		{
-		background:<?php echo conf('row_color1'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#ffffcc;
+		font-size: 12px;
 		}
 	.odd 
 		{
-		background:<?php echo conf('row_color2'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#9F0000;
+		font-size: 12px;
 		}
 	.even
 		{
-		background:<?php echo conf('row_color3'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#7A0000;
+		font-size: 12px;
 		}
     .blank
         {
@@ -150,25 +150,25 @@
         }
 	.border 
 		{ 
-		background:<?php echo conf('bg_color2'); ?>; 
+		background:#7A0000; 
 		}
 	.header 
 		{ 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		font-size: 12px; 
 		}
  	.error	
 		{ 
-		color: <?php echo conf('error_color'); ?>; 
+		color: #ffffcc; 
 		}
 	.fatalerror
 		{
 		padding-top: 3px;
 		padding-bottom: 3px;
-		color: <?php echo conf('error_color'); ?>;
-                border-right:4px solid <?php echo conf('error_color'); ?>;
-                border-bottom:4px solid <?php echo conf('error_color'); ?>;
-                border-left:4px solid <?php echo conf('error_color'); ?>;
-                border-top:4px solid <?php echo conf('error_color'); ?>;		
+		color: #ffffcc;
+                border-right:4px solid #ffffcc;
+                border-bottom:4px solid #ffffcc;
+                border-left:4px solid #ffffcc;
+                border-top:4px solid #ffffcc;		
 		font-size: <?php echo conf('font_size')+2; ?>px;
 		font-weight: 900;
 		text-align: center;
@@ -179,7 +179,7 @@
 		}
 	.alphabet 
 		{ 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		font-size: 12px; 
 		font-weight: normal; 
 		}
 	.smallbutton
@@ -198,7 +198,7 @@
 		padding-top: 0px;
 		padding-left: 0px;
 		width:160px;
-		background: <?php echo conf('base_color2'); ?>;
+		background: #9F0000;
 		}
 /* These three lines make a menu horizontal */
 	#content { float: left; clear: both;}
@@ -216,7 +216,7 @@
 	#topbar
 		{
 			height: 80px;
-			background-color: <?php echo conf('bg_color1'); ?>;
+			background-color: #320000;
 		}
 	#topbarright
 		{
@@ -260,15 +260,15 @@
 	#sidebar a, .navbutton
 		{
 		padding: 5px 5px;
-		color: <?php echo conf('font_color2'); ?>;
-		background-color: <?php echo conf('row_color3'); ?>;
+		color: #ffffcc;
+		background-color: #7A0000;
 		text-decoration: none;
 		}
 
 	#sidebar a:hover
 		{
-		color: <?php echo conf('font_color1'); ?>;
-		background-color: <?php echo conf('row_color1'); ?>;
+		color: #222222;
+		background-color: #ffffcc;
 		text-decoration: none;
 		}
 	#sidebar ul ul {
@@ -291,15 +291,15 @@
 		{
 		display: block;
 		padding: 3px 3px 3px 3px;
-		color: <?php echo conf('font_color2'); ?>;
-		background-color: <?php echo conf('row_color2'); ?>;
+		color: #ffffcc;
+		background-color: #9F0000;
 		text-decoration: none;
 		}
 
 	#sidebar ul ul a:hover
 		{
-		color: <?php echo conf('font_color1'); ?>;
-		background-color: <?php echo conf('row_color1'); ?>;
+		color: #222222;
+		background-color: #ffffcc;
 		text-decoration: none;
 		}
 	#content
diff --git a/themes/classic/images/left.gif b/themes/classic/images/left.gif
index 62137075..0f9fb2d9 100644
--- a/themes/classic/images/left.gif
+++ b/themes/classic/images/left.gif
diff --git a/themes/classic/images/topleft.gif b/themes/classic/images/topleft.gif
index 1f9782db..3a931ff0 100644
--- a/themes/classic/images/topleft.gif
+++ b/themes/classic/images/topleft.gif
diff --git a/themes/greyblock/templates/style.inc b/themes/greyblock/templates/default.css
index cb21634e..8535af34 100644
--- a/themes/greyblock/templates/style.inc
+++ b/themes/greyblock/templates/default.css
@@ -35,32 +35,32 @@
 		margin-top: 0px;
 		margin-left: 0px;
 		margin-right: 0px;
-		background: <?php echo conf('bg_color1'); ?>; 
-		font-family: <?php echo conf('font') ?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
-		color: <?php echo conf('font_color2'); ?>;
+		background: #8B8B8B; 
+		font-family: Verdana; 
+		font-size: 12px; 
+		color: #292929;
 		}
 
 	p	
 		{ 
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		color: #292929; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		}
 	a	
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #292929; 
+		font-family: Verdana; 
 		}
 	a:visited 
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #292929; 
+		font-family: Verdana; 
 		}
 	a:active  
 		{ 
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
+		color: #292929; 
+		font-family: Verdana; 
 		}
 	.text-box 
 		{
@@ -68,11 +68,11 @@
 		padding-top:5px;
 		display: table-cell;
 		margin-bottom:10px;
-		background-color: <?php echo conf('base_color1'); ?>;
-		border-right:2px solid <?php echo conf('bg_color2'); ?>;
-		border-bottom:2px solid <?php echo conf('bg_color2'); ?>;
-		border-left:2px solid <?php echo conf('bg_color2'); ?>;
-		border-top:2px solid <?php echo conf('bg_color2'); ?>;
+		background-color: #C8C8C8;
+		border-right:2px solid #000000;
+		border-bottom:2px solid #000000;
+		border-left:2px solid #000000;
+		border-top:2px solid #000000;
 		}
 
 	.npsong
@@ -86,9 +86,9 @@
 	td	
 		{ 
         padding: 0px 8px 0px 8px;
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px;
+		color: #292929; 
+		font-family: Verdana; 
+		font-size: 12px;
 		}
     th
         {
@@ -96,59 +96,59 @@
         }
 	input	
 		{
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font'); ?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		color: #292929; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		font-weight: bold; 
-		background-color: <?php echo conf('base_color2') ?>; 
+		background-color: #D4D4D4; 
 		margin: 2px 2px 2px 2px;
 		}
 	select	{ 
-		color: <?php echo conf('font_color2'); ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
-		background-color: <?php echo conf('base_color2'); ?>; 
+		color: #292929; 
+		font-family: Verdana; 
+		font-size: 12px; 
+		background-color: #D4D4D4; 
 		}
 	textarea 
 		{ 
-		background-color: <?php echo conf('base_color2'); ?>;
-		color: <?php echo conf('font_color2') ?>; 
-		font-family: <?php echo conf('font')?>; 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		background-color: #D4D4D4;
+		color: #292929; 
+		font-family: Verdana; 
+		font-size: 12px; 
 		}
     .table-header
     {
-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) <?php echo conf('base_color2')?> repeat-x;
+        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) #D4D4D4 repeat-x;
         vertical-align: top;
     }
     .header1 
     { 
-	color: <?php echo conf('font_color2'); ?>; 
-	font-family: <?php echo conf('font'); ?>; 
+	color: #292929; 
+	font-family: Verdana; 
 	font-size: <?php echo conf('font_size') + 6; ?>px; 
 	font-weight: 900;
     }
     .header2
     {
-    	color: <?php echo conf('font_color2'); ?>;
-	font-family: <?php echo conf('font'); ?>;
+    	color: #292929;
+	font-family: Verdana;
 	font-size: <?php echo conf('font_size') + 2; ?>px;
 	font-weight: 900;
     }
 	.headrow 
 		{
-		background:<?php echo conf('row_color1'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#CCCCCC;
+		font-size: 12px;
 		}
 	.odd 
 		{
-		background:<?php echo conf('row_color2'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#7A7A7A;
+		font-size: 12px;
 		}
 	.even
 		{
-		background:<?php echo conf('row_color3'); ?>;
-		font-size: <?php echo conf('font_size'); ?>px;
+		background:#A2A2A2;
+		font-size: 12px;
 		}
     .blank
         {
@@ -156,25 +156,25 @@
         }
 	.border 
 		{ 
-		background:<?php echo conf('bg_color2'); ?>; 
+		background:#000000; 
 		}
 	.header 
 		{ 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		font-size: 12px; 
 		}
  	.error	
 		{ 
-		color: <?php echo conf('error_color'); ?>; 
+		color: #990033; 
 		}
 	.fatalerror
 		{
 		padding-top: 3px;
 		padding-bottom: 3px;
-		color: <?php echo conf('error_color'); ?>;
-                border-right:4px solid <?php echo conf('error_color'); ?>;
-                border-bottom:4px solid <?php echo conf('error_color'); ?>;
-                border-left:4px solid <?php echo conf('error_color'); ?>;
-                border-top:4px solid <?php echo conf('error_color'); ?>;		
+		color: #990033;
+                border-right:4px solid #990033;
+                border-bottom:4px solid #990033;
+                border-left:4px solid #990033;
+                border-top:4px solid #990033;		
 		font-size: <?php echo conf('font_size')+2; ?>px;
 		font-weight: 900;
 		text-align: center;
@@ -185,7 +185,7 @@
 		}
 	.alphabet 
 		{ 
-		font-size: <?php echo conf('font_size'); ?>px; 
+		font-size: 12px; 
 		font-weight: normal; 
 		}
 	.smallbutton
@@ -204,7 +204,7 @@
 		padding-right:0px;
 		padding-top: 0px;
 		padding-left: 0px;
-		background: <?php echo conf('base_color2'); ?>;
+		background: #D4D4D4;
 		}
 /* These three lines make a menu vertical */
         #content { float: none; }
@@ -224,7 +224,7 @@
 			height: 80px;
 			padding-top:10px;
 			padding-left:10px;
-			background-color: <?php echo conf('bg_color1'); ?>;
+			background-color: #8B8B8B;
 		}
 	#topbarright
 		{