diff --git a/CREDITS b/CREDITS
index d9cf7b17..f72d3049 100644
--- a/CREDITS
+++ b/CREDITS
@@ -112,6 +112,7 @@ Diego Penneno
  
 Patrick Kolla
  * Popup "wizard" for smart playlists
+ * Stylish new web interface look.. woohoo!
 
 slomo (from the forums)
  * Musepack tag parsing support.
diff --git a/admin-root/CREDITS b/admin-root/CREDITS
index d9cf7b17..f72d3049 100644
--- a/admin-root/CREDITS
+++ b/admin-root/CREDITS
@@ -112,6 +112,7 @@ Diego Penneno
  
 Patrick Kolla
  * Popup "wizard" for smart playlists
+ * Stylish new web interface look.. woohoo!
 
 slomo (from the forums)
  * Musepack tag parsing support.
diff --git a/admin-root/aspl-license.html b/admin-root/aspl-license.html
index c009700b..9bf33f2a 100644
--- a/admin-root/aspl-license.html
+++ b/admin-root/aspl-license.html
@@ -1,11 +1,8 @@
 @include hdr.html@
 
 <h1>ASPL License</h1>
-
-<div class="stx">
-
-<PRE>
+<p class="license"><pre>
 @include aspl-license.txt@
-</PRE>
+</pre></p>
 
 @include ftr.html@
diff --git a/admin-root/config.html b/admin-root/config.html
index eb0858f8..61fb23b1 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -2,98 +2,104 @@
 
 <h1>Configuration</h1>
 
-<p>
+<p class="description">
 Note that the following fields will only be editable if the
 configuration file itself is writable by the mt-daapd server.  If you
 make changes to these settings, they will not be reflected in the
 running server.  The server must be restarted for these values to
-take effect.
-</p>
-<div class="stx">
-    <form method="post" action="/config-update.html">
-      <table>
-	<tr>
-	  <td>Web Root</td>
-	  <td><input type="text" @READONLY@ name="WEB_ROOT" size="80" value="@WEB_ROOT@" /></td>
-	</tr>
-	<tr>
-	  <td>Playlist File</td>
-	  <td><input type="text" @READONLY@ name="PLAYLIST" size="80" value="@PLAYLIST@" /></td>
-	</tr>
-	<tr>
-	  <td>MP3 Dir</td>
-	  <td><input type="text" @READONLY@ name="MP3_DIR" size="80" value="@MP3_DIR@" /></td>
-	</tr>
-	<tr>
-	  <td>Database Dir</td>
-	  <td><input type="text" @READONLY@ name="DB_DIR" size="80" value="@DB_DIR@" /></td>
-	</tr>
-	<tr>
-	  <td>Port</td>
-	  <td><input type="text" @READONLY@ name="PORT" value="@PORT@" /></td>
-	</tr>
-	<tr>
-	  <td>Server Name</td>
-	  <td><input type="text" @READONLY@ name="SERVERNAME" value="@SERVERNAME@" /></td>
-	</tr>
-	<tr>
-	  <td>Logfile</td>
-	  <td><input type="text" @READONLY@ name="LOGFILE" value="@LOGFILE@" /></td>
-	</tr>
-	<tr>
-	  <td>Art Filename</td>
-	  <td><input type="text" @READONLY@ name="ART_FILENAME" value="@ART_FILENAME@" /></td>
-	</tr>
-	<tr>
-	  <td>Run As</td>
-	  <td><input type="text" @READONLY@ name="RUNAS" value="@RUNAS@" /></td>
-	</tr>
-	<tr>
-	  <td>Admin Password</td>
-	  <td><input type="text" @READONLY@ name="ADMIN_PW" value="@ADMIN_PW@" /></td>
-	</tr>
-	<tr>
-	  <td>MP3 Password</td>
-	  <td><input type="text" @READONLY@ name="PASSWORD" value="@PASSWORD@" /></td>
-	</tr>
-	<tr>
-	  <td>Extensions</td>
-	  <td><input type="text" @READONLY@ name="EXTENSIONS" value="@EXTENSIONS@" /></td>
-	</tr>
-	<tr>
-	  <td>Rescan Interval</td>
-	  <td><input type="text" @READONLY@ name="RESCAN_INTERVAL" value="@RESCAN_INTERVAL@" /></td>
-	</tr>
-	<tr>
-	  <td>Scan type</td>
-	  <td><input type="text" @READONLY@ name="SCAN_TYPE" value="@SCAN_TYPE@" /></td>
-	</tr>
-	<tr>
-	  <td>Always Scan</td>
-	  <td><input type="text" @READONLY@ name="ALWAYS_SCAN" value="@ALWAYS_SCAN@" /></td>
-	</tr>
-	<tr>
-	  <td>Compress</td>
-	  <td><input type="text" @READONLY@ name="COMPRESS" value="@COMPRESS@" /></td>
-	</tr>
-	<tr>
-	  <td>Process .m3u Files</td>
-	  <td><input type="text" @READONLY@ name="PROCESS_M3U" value="@PROCESS_M3U@" /></td>
-	</tr>
+take effect.</p>
 
+<form method="post" action="/config-update.html">
+<table>
+  <tr>
+    <th>mt-daapd.conf</th>
+    <th class="config"><input type="submit" name="SUBMIT" value="Submit"/></th>
+  </tr>
 	<tr>
-	  <td>Compilation Directories</td>
-	  <td><input type="text" @READONLY@ name="COMPDIRS" value="@COMPDIRS@" /></td>
+	  <td class="configname">Web Root</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="WEB_ROOT" size="80" value="@WEB_ROOT@" /></td>
 	</tr>
-
 	<tr>
-	  <td>Debug Level</td>
-	  <td><input type="text" @READONLY@ name="DEBUGLEVEL" value="@DEBUGLEVEL@" /></td>
+	  <td class="configname">Playlist File</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="PLAYLIST" size="80" value="@PLAYLIST@" /></td>
 	</tr>
-
-      </table>
-      <div><input type="submit" name="SUBMIT" value="Submit" /></div>
-    </form>
-</div>
+	<tr>
+	  <td class="configname">MP3 Directory</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="MP3_DIR" size="80" value="@MP3_DIR@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Database Directory</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="DB_DIR" size="80" value="@DB_DIR@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Compilation Directories</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="COMPDIRS" size="80" value="@COMPDIRS@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Logfile</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="LOGFILE" size="80" value="@LOGFILE@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Art Filename</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="ART_FILENAME" size="80" value="@ART_FILENAME@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Port</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="PORT" value="@PORT@" />
+	  &nbsp;The port the server should run at; default is 3689.</td>
+	</tr>
+	<tr>
+	  <td class="configname">Server Name</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="SERVERNAME" value="@SERVERNAME@" />
+	  &nbsp;the name iTunes and other daap clients should see.</td>
+	</tr>
+	<tr>
+	  <td class="configname">Run As</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="RUNAS" value="@RUNAS@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Admin Password</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="ADMIN_PW" value="@ADMIN_PW@" />
+	  &nbsp;The password for this administration interface.</td>
+	</tr>
+	<tr>
+	  <td class="configname">MP3 Password</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="PASSWORD" value="@PASSWORD@" />
+	  &nbsp;The password clients need to access this server.</td>
+	</tr>
+	<tr>
+	  <td class="configname">Extensions</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="EXTENSIONS" value="@EXTENSIONS@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Rescan Interval</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="RESCAN_INTERVAL" value="@RESCAN_INTERVAL@" />
+	  &nbsp;How often should mt-daapd look for new files? In seconds.</td>
+	</tr>
+	<tr>
+	  <td class="configname">Scan Type</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="SCAN_TYPE" value="@SCAN_TYPE@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Always Scan</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="ALWAYS_SCAN" value="@ALWAYS_SCAN@" /></td>
+	</tr>
+	<tr>
+	  <td class="configname">Compress</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="COMPRESS" value="@COMPRESS@" />
+	  &nbsp;Should browsing data be compressed on the way to the client?</td>
+	</tr>
+	<tr>
+	  <td class="configname">Process .m3u Files</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="PROCESS_M3U" value="@PROCESS_M3U@" />
+	  Should m3u files be processed as playlists?</td>
+	</tr>
+	<tr>
+	  <td class="configname">Debug Level</td>
+	  <td class="configdata"><input class="text" type="text" @READONLY@ name="DEBUGLEVEL" value="@DEBUGLEVEL@" />
+	  &nbsp;Possible values are 0 to 9, 9 being the most detailed debug level.</td>
+	</tr>
+</table>
+</form>
 
 @include ftr.html@
diff --git a/admin-root/feedback.html b/admin-root/feedback.html
index 088b0272..a21e923c 100644
--- a/admin-root/feedback.html
+++ b/admin-root/feedback.html
@@ -2,76 +2,104 @@
 
 <h1>Feedback</h1>
 
-<div class="stx">
+<p class="description">
+Here you can send feedback on your mt-daapd installation to the developer.
+</p>
 
 <form action="http://www.pedde.com/mt-daapd/register.php" method="post">
+<table><tr>
+  <th>Feedback</th>
+  <th><input type="submit" value="Leave Feedback" /></th>
+  </th>
+</tr>
 
-<table>
-<tr valign="top">
-  <th>Works?</th>
-  <td><input type="checkbox" name="works" value="CHECKED" checked="checked" /></td>
-  <td>
+<tr>
+  <td class="feedbackname" rowspan="2">Works?</td>
+  <td class="feedbacktext">
   The most important question.  Did this version work for you?
   If not, uncheck the box, and put an explanation in the NOTES
   entry below.
   </td>
 </tr>
+<tr>
+  <td class="feedbackdata"><input class="feedbackfield" type="checkbox" name="works" value="CHECKED" checked="checked" /></td>
+</tr>
 
-<tr valign="top">
-  <th>Version</th>
-  <td><input type="text" name="version" value="@VERSION@" /></td>
-  <td>
+<tr>
+  <td class="feedbackname" rowspan="2">Version</td>
+  <td class="feedbacktext">
   This is the version of mt-daapd you are running.  If you are using a 
   public release, use the version number (0.1.0, 0.1.1, etc).  If it is
   manually checked out of cvs, use 'cvs', if it is a nightly snapshot,
   use the snapshot name, for example: 'cvs-20040328'.
   </td>
 </tr>
+<tr>
+  <td class="feedbackdata"><input class="feedbackfield" type="text" size="40" name="version" value="@VERSION@" /></td>
+</tr>
 
-<tr valign="top">
-  <th>System</th>
-  <td><input type="text" name="system" value="@SYSTEM@" /></td>
-  <td>
+<tr>
+  <td class="feedbackname" rowspan="2">System</td>
+  <td class="feedbacktext">
   This is the operating system and version you are running.
   Use something like "Sparc Solaris 9" or "x86 Linux 2.6.3" or
   "Mac OSX 10.3" or something to help identify what platform and
   version you are running.
   </td>
 </tr>
-
-<tr valign="top">
-  <th>Compile args</th>
-  <td><input type="text" name="compile" value="@FLAGS@" /></td>
-  <td>
-  If you used any compile flags, that would be helpful.  Examples
-  might include '--with-gdbm', or '--enable-howl' or something else.
-  </td>
+<tr>
+  <td class="feedbackdata"><input class="feedbackfield" type="text" size="40" name="system" value="@SYSTEM@" /></td>
 </tr>
 
-<tr valign="top">
-  <th>Notes</th>
-  <td><textarea rows="3" cols="40" name="notes"></textarea></td>
-  <td>
+<tr>
+  <td class="feedbackname" rowspan="2">Compile arguments</td>
+  <td class="feedbacktext">
+  If you used any compile flags, that would be helpful.  Examples might include 
+  '--with-gdbm', or '--enable-howl' or something else.
+  </td>
+</tr>
+<tr>
+  <td class="feedbackdata"><input class="feedbackfield" type="text" size="40" name="compile" value="@FLAGS@" /></td>
+</tr>
+
+<tr>
+  <td class="feedbackname" rowspan="2">Notes</td>
+  <td class="feedbacktext">
   If it didn't work for you, or if you just want to make a
   suggestion, leave those notes here.  Remember that these
   notes are publicly viewable.
   </td>
 </tr>
+<tr>
+  <td class="feedbackdata"><textarea class="feedbackfield" rows="3" cols="40" name="notes"></textarea></td>
+</tr>
 
-<tr valign="top">
-  <th>Rating</th>
-  <td><input type="text" name="rating" /></td>
-  <td>
+<tr>
+  <td class="feedbackname" rowspan="2">Rating</td>
+  <td class="feedbacktext">
   Just for fun, give this release a rating from 1 to 10, 1 being
   so bad it started your computer on fire, 10 meaning works so
   well, it even made your breath fresher.
   </td>
 </tr>
+<tr>
+  <td class="feedbackdata">
+  <select class="feedbackfield" name="rating">
+    <option value="10">10 - it made my breath fresher</option>
+    <option value="9">9</option>
+    <option value="8">8</option>
+    <option value="7">7</option>
+    <option value="6" selected="SELECTED">6 - we're gonna wait and see</option>
+    <option value="5">5</option>
+    <option value="4">4</option>
+    <option value="3">3</option>
+    <option value="2">2</option>
+    <option value="1">1 - it set my computer on fire</option>
+  </select>
+  </td>
+</tr>
 </table>
-
-<div><input type="submit" value="Leave Feedback" /></div>
 </form>
-</div>
 
 @include ftr.html@
 
diff --git a/admin-root/ftr.html b/admin-root/ftr.html
index 8d39ca52..c3f8a389 100644
--- a/admin-root/ftr.html
+++ b/admin-root/ftr.html
@@ -1,8 +1,3 @@
-	      </div>
-	    </div>
-	  </td>
-	</tr>
-      </tbody>
-    </table>
-  </body>
-</html>
+</td></tr></table>
+
+</body></html>
\ No newline at end of file
diff --git a/admin-root/gpl-license.html b/admin-root/gpl-license.html
index e3924d3d..ab50075a 100644
--- a/admin-root/gpl-license.html
+++ b/admin-root/gpl-license.html
@@ -2,10 +2,8 @@
 
 <h1>GPL License</h1>
 
-<div class="stx">
-
-<PRE>
+<p class="license"><pre>
 @include gpl-license.txt@
-</PRE>
+</pre></p>
 
 @include ftr.html@
diff --git a/admin-root/hdr.html b/admin-root/hdr.html
index 15513742..868d97b8 100644
--- a/admin-root/hdr.html
+++ b/admin-root/hdr.html
@@ -1,131 +1,46 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <title>.: m t - d a a p d :.</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="mt-daapd.css" />
-    @ispage status.html:<meta http-equiv="refresh" content="10" />:@
-    @ispage smart.html:<script type="text/javascript" src="smart.js"></script>:@
-    @ispage playlist.html:<script type="text/javascript" src="playlist.js"></script>:@
-  </head>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+<head>
+  <title>mt-daapd</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <link rel="stylesheet" type="text/css" href="mt-daapd.css" />
+  @ispage status.html:<meta http-equiv="refresh" content="10" />:@
+  @ispage smart.html:<script type="text/javascript" src="smart.js" />:@
+  <script type="text/javascript" src="mt-daapd.js" />
+</head>
+<body @ispage playlist.html:onload="init();":@ @ispage smart.html:onload="init()":@>
 
-  <body @ispage playlist.html:onload="init()":@ @ispage smart.html:onload="init()":@>
-@ispage playlist.html:<!--:@
-    <div>
-      <table border="0" width="100%">
-	<tr><td style="width: 90%;">&nbsp;</td><td align="center"><img src="mt-daapd.png" alt="mt-daap logo"/>
-  <br />Version @VERSION@</td></tr>
-	</table>
-    </div>
-@ispage playlist.html:-->:@
-    <!--    <hr size="" class="netscape4"> -->
-    <div class="tabs">
-      <a href="index.html" class="@ispage index.html:selected:plain@">Home</a>
-      <a href="config.html" class="@ispage config.html:selected:plain@">Config</a>
-      <a href="status.html" class="@ispage status.html:selected:plain@">Status</a>
-      <!-- <a href="playlist.html" class="@ispage
-      playlist.html:selected:plain@">Playlist</a> -->
-      <a href="feedback.html" class="@ispage
-      feedback.html:selected:plain@">Feedback</a>
-      <a href="smart.html" class="@ispage smart.html:selected:plain@">Smart</a>
-      <a href="thanks.html" class="@ispage thanks.html:selected:plain@">Thanks</a>
-    </div>
+<table class="main" border="0" width="100%" summary="Main navigation"><tr>
+<td class="navi" width="182">
 
-    <div class="personalBar">&nbsp;
-      <span>@session-count@ Connected Users</span>
-    </div>
+<img src="mt-daapd.png" width="182" height="71" alt="mt-daap logo"/>
 
-    <div class="pathBar">
-      Welcome, @user@
-    </div>
+<div class="ministatus">Version @VERSION@</div>
 
-    <table class="columns">
-      <tbody>
-	<tr>
-@ispage playlist.html:<!--:@
-	  <td class="left">
-	    <div class="box">
-	      <h5>Links</h5>
-	      <div class="body">
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="http://mt-daapd.sourceforge.net" 
-                       class="plain" title="Home Page">
-                      
-                      &nbsp;mt-daapd&nbsp;Home
-                    </a>
-		  </span>
-		</div>
+<div class="naviheader">Welcome, @user@</div>
+<div class="navibox">
+ <div class="navilink"><a class="@ispage index.html:naviselected:navi@" href="index.html">home</a></div>
+ <div class="navilink"><a class="@ispage config.html:naviselected:navi@" href="config.html">config</a></div>
+ <div class="navilink"><a class="@ispage status.html:naviselected:navi@" href="status.html">status</a></div>
+ <div class="navilink"><a class="@ispage smart.html:naviselected:navi@" href="smart.html">smart</a></div>
+ <div class="navilink"><a class="@ispage feedback.html:naviselected:navi@" href="feedback.html">feedback</a></div>
+ <div class="navilink"><a class="@ispage thanks.html:naviselected:navi@" href="thanks.html">thanks</a></div>
+</div>
 
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="http://cvs.sourceforge.net/viewcvs.py/mt-daapd/"
-                       class="plain" title="CVS">
-                      
-                      &nbsp;mt-daapd&nbsp;CVS
-                    </a>
-		  </span>
-		</div>
+<div class="naviheader">Experimental</div>
+<div class="navibox">
+ <div class="navilink"><a class="@ispage playlist.html:naviselected:navi@" href="playlist.html">playlist</a></div>
+ <div class="navilink"><a class="@ispage applet.html:naviselected:navi@" href="applet.html">applet</a></div>
+</div>
 
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="gpl-license.html"
-                       class="plain" title="GPL License">
-                      
-                      &nbsp;GPL&nbsp;License
-                    </a>
-		  </span>
-		</div>
-		
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="aspl-license.html"
-                       class="plain" title="ASPL License">
-                      
-                      &nbsp;ASPL&nbsp;License
-                    </a>
-		  </span>
-		</div>
+<div class="naviheader">Links</div>
+<div class="navibox">
+ <div class="navilink"><a class="navi" href="http://mt-daapd.sourceforge.net/">mt-daapd home</a></div>
+ <div class="navilink"><a class="navi" href="http://cvs.sourceforge.net/viewcvs.py/mt-daapd/">mt-daapd cvs</a></div>
+ <div class="navilink"><a class="@ispage gpl-license.html:naviselected:navi@" href="gpl-license.html">GPL license</a></div>
+ <div class="navilink"><a class="@ispage aspl-license.html:naviselected:navi@" href="aspl-license.html">ASPL license</a></div>
+</div>
 
-		
+<div class="ministatus">@session-count@ Connected Users</div>
 
-	      </div>
-	    </div>
-
-	    <div class="box">
-	      <h5>Experimental</h5>
-	      <div class="body">
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="playlist.html" 
-                       class="plain" title="Playlist page">
-                      
-                      &nbsp;Playlist&nbsp;Page
-                    </a>
-		  </span>
-		</div>
-
-		<div style="white-space: nowrap;">
-		  <span>
-                    &nbsp;
-                    <a href="applet.html"
-                       class="plain" title="Java Applet">
-                      
-                      &nbsp;Java&nbsp;Applet
-                    </a>
-		  </span>
-		</div>
-	      </div>
-	    </div>
-
-
-	  </td>
-@ispage playlist.html:-->:@
-	  <td class="main">
-	    <div class="document">
-	      <div> 
+</td><td class="main">
\ No newline at end of file
diff --git a/admin-root/index.html b/admin-root/index.html
index 0ab47149..9044e4db 100644
--- a/admin-root/index.html
+++ b/admin-root/index.html
@@ -1,27 +1,29 @@
 @include hdr.html@
 
 <h1>Welcome</h1>
-
-<div class="description">
-  This is the administrative web interface for
-  mt-daapd
-</div>
-
-<div class="stx">
+<p class="description">
+This is the administrative web interface for mt-daapd, version @version@.
+</p>
 
 <h3>About</h3>
+<p class="description">
 mt-daapd is a multi-threaded pthreads implementation of Apple's DAAP
 server.  It works for me, it might work for you, too.  No promises
 though.  See the section below titled "No Warranty".  This work,
 although released under the GNU General Public License, is Copyright
-(C) 2003 Ron Pedde.  All Rights reserved.  See the link labeled "GPL
-License" for more information.
+&copy; 2003-2005 Ron Pedde.  All Rights reserved.  See the link labeled 
+<a href="gpl-license.html">GPL License</a> for more information.
+</p>
 
-<h3>Legal Crap</h3> Portions of this program are Copyright (c)
+<h3>Legal Crap</h3>
+<p class="description">
+Portions of this program are Copyright &copy;
 1999-2001 Apple Computer, Inc. All Rights Reserved.  See the link
-labeled "ASPL License" for more information.
+labeled <a href="aspl-license.html">ASPL License</a> for more information.
+</p>
 
 <h3>No Warranty</h3>
+<p class="license">
 BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
@@ -31,8 +33,6 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
-
-</div>
-
+</p>
 
 @include ftr.html@
diff --git a/admin-root/mt-daapd.css b/admin-root/mt-daapd.css
index ec1d0c0b..166d0feb 100644
--- a/admin-root/mt-daapd.css
+++ b/admin-root/mt-daapd.css
@@ -1,983 +1,176 @@
-/* 
-** Plone style sheet for CSS2-capable browsers.
-** Copyright Alexander Limi, 2002-2003 - http://www.plonesolutions.com
-**
-** Thanks to Geir Bkholt, Stian Siland for input and guidance.
-**
-** Style sheet documentation can be found at http://plone.org/documentation
-**
-** You should preferrably use ploneCustom.css to add your own CSS classes and to
-** customize your portal, as these are the base fundaments of Plone, and will 
-** change and be refined in newer versions. Keeping your changes in
-** ploneCustom.css will make it easier to upgrade. 
-**
-** Feel free to use whole or parts of this for your own designs, but give credit
-** where credit is due.
-**
-*/
+/* General */
 
-
-/*
-**  DTML instructions to set caching headers. Inside comments area to play nicer with CSS editors.
-**
-** **   
-**   
-**   
-**   
-** */
-/*  */
-
-
-table.hovertable tr:hover {
-    background-color: #8CACBB;
-}
-
-body {
-    font: 0.7em Verdana, Helvetica, Arial, sans-serif;
-    background: White;
-    color: Black;
-    margin: 0;
-    padding: 0;
-/* These work in IE only, changes the look of the scrollbar + textareas */
-    scrollbar-base-color: #DEE7EC;
-    scrollbar-highlight-color: #DEE7EC;
-    scrollbar-track-color: #F7F9FA;
-    scrollbar-darkshadow-color: #F7F9FA;
-    scrollbar-3dlight-color: #8CACBB;
-    scrollbar-shadow-color: #8CACBB;
-    scrollbar-arrow-color: #436976;
-}
-
-
-table {
-    font-size: 100%;
-}
-
-a {
-	text-decoration: none;
-    color: #436976;
-    background-color: transparent;
-}
-
-img {
-    border: none;
-	vertical-align: middle;
-}
-
-p {
-    margin: 0.5em 0em 1em 0em;
-    text-align: justify;
-    line-height: 1.5em;
-}
-
-p a {
-    text-decoration: underline;
-}
-
-p a:visited {
-	color: Purple;
-    background-color: transparent;
-}
-
-p a:active {
-	color: Red;
-    background-color: transparent;
-}
-
-p img {
-    border: 0;
-    margin: 0;
-}
-
-
-hr {
-    clear: both;
-    height: 1px;
-    color: #8CACBB;
-    background-color: transparent;
-}
-
-
-h1, h2, h3, h4, h5, h6 {
-    color: Black;
-    clear: left;
-    font: 100% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding-top: 0.5em;
-    border-bottom: 1px solid #8CACBB;
-}
-
-h1 a,
-h2 a,
-h3 a,
-h4 a,
-h5 a,
-h6 a { color: Black ! important; }
-
-
-h1 {
-    font-size: 160%;
-}
-
-h2 {
-    font-size: 150%;
-}
-
-h3 {
-    font-size: 140%;
-}
-
-h4 {
-    font-size: 120%;
-}
-
-h5 {
-    font-size: 100%;
-}
-
-h6 {
-    font-size: 80%;
-}
-
-ul { 
-    line-height: 1.5em;
-    list-style-type: square;
-    margin: 0.5em 0 0 2em;
-    padding:0;
-}
-
-ol {
-    line-height: 1.5em;
-    margin: 0.5em 0 0 2em;
-    padding:0;
-}
-
-ul a, ol a {
-    text-decoration: underline;
-}
-
-li {
-    margin-bottom: 1em;
-}
-
-dl {
-}
-
-dt {
-    font-weight: bold;    
-}
-
-dt a {
-    text-decoration: underline;
-}
-
-
-dd {
-    line-height: 1.5em;
-    margin-bottom: 1em;
-}
-
-d a {
-    text-decoration: underline;
-}
-
-
-fieldset {
-    border: 1px solid #8cacbb;
-    margin: 2em 0em 1em 0em;
-    padding: 1em 0em;
-}
-
-legend {
-    background: White;
-    padding: 0.5em;
-}
-
-
-form {
-    border: none;
-    margin: 0;
-}
-
-textarea {
-    border: 1px solid #8cacbb;  
-    color: Black;
-    background-color: white;
-    width: 88%;
-    padding: 0.1em;
-}
-
-input {
-    font: 100% Verdana, Helvetica, Arial, sans-serif;
-    border: 1px solid #8cacbb;  
-    color: Black;
-    background-color: white;
-    vertical-align: middle;
-    margin-bottom: 1px; /* IE bug fix */
-    padding: 0.1em;
-}
-
-select {
-    font: 100% Verdana, Helvetica, Arial, sans-serif;
-    border: 1px solid #8cacbb;  
-    vertical-align: top;
-    width: 100%;
-}
-
-abbr, acronym, .explain {
-    border-bottom: 1px dotted Black;
-    color: Black;
-    background-color: transparent;
-    cursor: help;
-}
-
-q {
-    font-family: Times, "Times New Roman", serif;
-    font-style: italic;
-    font-size: 120%;
-}
-
-blockquote {
-    font-family: Times, "Times New Roman", serif; 
-    font-style: italic;
-    font-size: 120%;
-}
-
-code {
-    font-size: 120%;
-    color: Black;
-    background-color: #dee7ec;
-}
-
-pre {
-    font-size: 120%;
-    padding: 1em;
-    border: 1px solid #8cacbb;
-    color: Black;
-    background-color: #dee7ec;
-}
-
-.netscape4 {
-    display: none;
-}
-
-/*
-** Structural Elements
-*/
-
-div.top {
-    /* Top section */
-    background: transparent;
-    margin: 0;
-    padding: 0;
-}
-
-.logo {
-    /* Logo properties */
-    margin: 1em 0em 1em 2em;
-    padding: 0;
-}
-
-div.searchBox {
-    /*searchbox style and positioning */
-    background-color: transparent;
-    color: Black;
-    float: right;
-    margin: 3em 0em 0em 0em;
-    padding: 0em 2em 0em 0em;
-    text-align: right;
-    text-transform: lowercase;
-    width: 30%;
-}
-
-input.searchButton {
-    font-size: 100% ! important;
-    margin-bottom: 1px ! important;
-}
-
-div.tabs {
-    /* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
-    background: transparent;
-    border-collapse: collapse;
-    border-bottom-color: #8CACBB;
-    border-bottom-style: solid;
-    border-bottom-width: 1px;
-    padding: 0.5em 0em 0em 2em;
-    white-space: nowrap;
-}
-
-div.tabs a {
-    /* The normal, unselected tabs. They are all links */
-    background: transparent;
-    border-color: #8CACBB;
-    border-width: 1px; 
-    border-style: solid solid none solid;
-    color: #436976;
-    font-weight: normal;
-    height: 1.2em;
-    margin-right: 0.5em;
-    padding: 0em 2em;
-    text-transform: lowercase;
-}
-
-div.tabs a.selected {
-    /* The selected tab. There's only one of this */
-    background: #DEE7EC;
-    border: 1px solid #8CACBB;
-    border-bottom: #DEE7EC 1px solid;
-    color: #436976;
-    font-weight: normal;
-}
-
-div.tabs a:hover {
-    background: #DEE7EC;
-    border-color: #8CACBB;
-    border-bottom-color: #DEE7EC;
-    color: #436976;
-}
-
-div.personalBar {
-    /* Bar with personalized menu (user preferences, favorites etc) */
-    background: #DEE7EC;
-    border-bottom-color: #8CACBB;
-    border-bottom-style: solid;
-    border-bottom-width: 1px;
-    color: Black;
-    padding-right: 3em;
-    text-align: right;
-    text-transform: lowercase;
-}
-
-div.personalBar a {
-    background-color: transparent;
-	color: #436976;
-    font-weight: normal;
-    margin-left: 1em;
-}
-
-div.personalBar img {
-    vertical-align: top;
-}
-.caseSensitive {
-    text-transform: none;
-}
-
-div.pathBar {
-    /* The path bar, including breadcrumbs and add to favorites */
-    border-bottom-color: #8CACBB;
-    border-bottom-style: solid;
-    border-bottom-width: 1px;
-    padding-left: 2em;
-    padding-right: 2em;
-    text-transform: lowercase;
-}
-
-.breadcrumbs {
-    float: left;
-    text-transform: lowercase;
-}
-
-.addFavorite {
-    vertical-align: bottom;
-}
-
-table.columns {
-	width: 100%;
-}
-
-table.columns td.left {
-    vertical-align: top;
-    width: 15%;
-    padding: 2em 0em 1em 2em;
-}
-
-table.columns td.main {
-    vertical-align: top;
-    padding: 0em 2em 1em 2em;
-    margin: 0;
-
-}
-
-table.columns td.right {
-    vertical-align: top;
-    width: 15%;
-    padding: 2em 2em 1em 0em;
-}
-
-#contentTabs {
-    background: transparent;
-    border-collapse: collapse;
-    border-bottom: 1px solid #74AE0B;
-    padding-left: 1em;
-    margin-top: 2em;
-    white-space: nowrap;
-}
-
-#contentTabs a {
-    background: transparent;
-    border: 1px solid #74AE0B;
-    border-style: solid solid none solid;
-    color: #578308;
-    font-weight: normal;
-    height: 1.2em;
-    margin-right: 0.5em;
-    padding: 0em 2em;
-    text-transform: lowercase;
-}
-
-#contentTabs a.selected {
-    background: #CDE2A7;
-    border-bottom: #CDE2A7 1px solid;
-    color: #578308;
-    font-weight: normal;
+body 
+{ background: #DEE7EC;
+  font: 0.7em Verdana, Helvetica, Arial, sans-serif;
+  color: #3C5C6B;
 }
 
-#contentTabs a:hover {
-    background-color: #CDE2A7;
-    color: #578308;
-}
-
-#contentBar {
-    background: #CDE2A7;
-    border-left: 1px solid #74AE0B;
-    border-right: 1px solid #74AE0B;
-    color: #578308;
-    text-align: right;
-    text-transform: lowercase;
-}
-
-/* Fix for IE6 disappearing float bug */
-#content {  
-    height: 100%; 
-}
-
-
-div.document {
-    background: White;
-    font: 120% Verdana, Helvetica, Arial, sans-serif;
-    padding: 0;
-    margin: 0em 0em 2em 0em;
-}
-
-div.editableDocument {
-    background: White;
-    border: 1px solid #74AE0B;
-    font: 120% Verdana, Helvetica, Arial, sans-serif;
-    margin: 0em 0em 2em 0em;
-    padding: 0em 1em 2em 1em;
-}
-
-div.documentActions {
-    float: right; 
-    margin-top: 1.5em;
-}
-
-div.message {
-    background: #FFCE7B;
-    border: 1px solid #FFA500;
-    color: Black;
-    font: bold 80% Verdana, Helvetica, Arial, sans-serif;
-    margin: 2em 0em 1em 0em;
-    padding: 0.5em 1em;
-    vertical-align: middle;
-}
-
-div.message a {
-	color: Black;
-    text-decoration: underline;
-}
-
-
-
-div.title {
-    margin-top: 1em;
-}
-
-.description {
-    /* The summary text describing the document */
-    font: bold 100% Verdana, Helvetica, Arial, sans-serif;
-    display: block;
-    margin: 1em 0em;
-    line-height: 1.5em;
-}
+table.main
+{ border: 0px;
 
-.footer {
-    background: #DEE7EC;
-    border-top: 1px solid #8CACBB;
-    border-bottom: 1px solid #8CACBB;
-    color: Black;
-    clear: both;
-    float: none;
-    margin: 2em 0em;
-    padding: 0.5em 0em 1em 0em;
-    text-align: center;
 }
-
-
-/* Accessibility and visual enhancement elements */
-
-a.skipnav {
-    visibility: hidden;
-    position: absolute;
-} 
-
-
-/*
-** Widgets
-*/
-
-input.standalone {
-    background: #DEE7EC url(linkOpaque.gif) 9px 1px no-repeat;
-    color: Black;
-    cursor: pointer;
-    font-size: 80%;
-    font-weight: normal;
-    margin-bottom: 1em;
-    padding: 1px 1px 1px 15px;
-    text-transform: lowercase;
-}
-
-input.context {
-    background: White url(linkTransparent.gif) 9px 1px no-repeat;
-    color: Black;
-    cursor: pointer;
-    font-size: 80%;
-    font-weight: normal;
-    margin-bottom: 1em;
-    padding: 1px 1px 1px 15px;
-    text-transform: lowercase;
-}
-
-input.destructive {
-    background: #FFCE7B url(linkTransparent.gif) 9px 1px no-repeat;
-    border: 1px solid #FFA500;  
-    color: Black;
-    cursor: pointer;
-    font-size: 80%;
-    font-weight: normal;
-    margin-bottom: 1em;
-    padding: 1px 1px 1px 15px;
-    text-transform: lowercase;
-}
-
-input.noborder {
-    border: none;
-    margin: 0;
-    background-color: transparent;
-}
-
-div.row {
-    clear: both;
-    min-height: 4em;
-    margin: 0em 0em 1em 0em;
-    position: relative;
+div.ministatus
+{ text-align: center;
+  margin: 1em 0em 1em 0em;
 }
 
-.group {
-    border: 1px solid #8cacbb;
-    margin: 1em 0em 1em 0em;
-    padding: 0em 1em;
-}
-span.legend {
-    background: White;
-    font-size: 80%;
-    padding: 0.5em;
-    position : relative;
-    top: -0.8em;
-    left: 0em;
+td.navi
+{ vertical-align: top; 
+  text-align: left;
+  border: 0px;
 }
 
-div.label {
-    font-weight: bold;
-    display: inline;
-    padding-right: 0.5em;
+td.main
+{ vertical-align: top;
+  text-align: left;
+  padding: 0em 0em 0em 2em;
+  border: 0px;
 }
 
-div.field {
-    margin-top: 0.2em;
+a
+{ color: blue;
+  text-decoration: none;
 }
 
-div.help {
-    background-color: #FFFFE1; 
-    border: 1px solid black; 
-    font-size: 80%;
-    font-weight: normal;
-    line-height: normal;
-    text-align: left;
-    position: absolute;
-    left: -18em;
-    top: 1.5em;
-    width: 16em;
-    padding: 0.5em;
+a:hover
+{ color: blue;
+  text-decoration: underline; 
 }
 
-.error {
-    /* Class for error indication in forms */
-    background: #FFCE7B;
-    border: 1px solid #FFA500;
-    padding: 1em;
-    margin: 0;
-    width: 68% !important;
-}
+/* Navigation */
 
-.required {
-    /* Used in addition to class "label" on required elements */
-    background: url(required.gif) right no-repeat;
+div.naviheader
+{ background: #8CACBB;
+  color: #DEE7EC;
+  padding: 0.5em 0em 0.5em 1em;
+  margin: 1em 0em 0em 0em;
+  font-weight: bold;
 }
 
-span.card {
-    background: #DEE7EC;
-    border-color: #8CACBB;
-    border-width: 1px;
-    border-style: solid;
-    float: left;
-    margin: 1em;
-    padding: 1em;
-    text-align: center;
-    width: 15%;
+div.navibox
+{ border: 1px solid #8CACBB;
+  padding: 0.5em 0em 0.5em 0em;
+  margin: 0em 0em 1em 0em;
 }
 
-table.listing,
-div.stx table {
-    /* The default table for document listings. Contains name, document types, modification times etc in a file-browser-like fashion */
-    border-collapse: collapse;
-    border-left: 1px solid #8CACBB;
-    border-bottom: 1px solid #8CACBB;
-    font-size: 80%;
-    margin: 1em 0em 1em 0em;
-    clear: both;
+div.navilink
+{ padding: 0.1em 0.1em 0.1em 1.1em;
 }
 
-table.listing th,
-div.stx table th {
-    background: #DEE7EC;
-    border-top: 1px solid #8CACBB;
-    border-bottom: 1px solid #8CACBB;
-    border-right: 1px solid #8CACBB;
-    color: Black;
-    font-weight: normal;
-    padding: 0em 1em 0em 1em;
-    text-transform: lowercase;
-    white-space: nowrap;
+div.navilink:hover
+{ background: #FFFFFF;
 }
 
-table.listing td.top {
-    border-left: 1px solid White;
-    border-top: 1px solid White ! important;
-    border-right: 1px solid White ! important;
-    text-align: right ! important;
-    padding: 0em 0em 1em 0em;
-    /* insane IE row bug workaround */
-    position: relative;
-    left: -1px;
-    top: -1px;
+a.navi,a.navi:visited,a.naviselected
+{ text-decoration: none;
+  color: #3C5C6B;
 }
 
-table.listing tr.odd {
-    /*every second line should be shaded */
-    background: transparent;
+a.naviselected
+{ font-weight: bold;
 }
 
-table.listing tr.even {
-    background: #F7F9FA;
-}
+/* Main */
 
-table.listing td,
-div.stx table td {
-    border-right: 1px solid #8CACBB;
-    padding: 0em 1em;
-    text-align: left;
+h1,h2,h3
+{ border-bottom: 1px solid #8CACBB;
 }
 
-table.listing a:hover {
-    text-decoration: underline;
-}
-
-table.listing img {
-	vertical-align: middle;
-}
-
-/* Additional STX workaround classes */
-
-div.stx table p /* stupid STX table workaround */
+p.description
 {
-    margin: 0;
-    padding: 0;
 }
 
-div.stx table  /* stupid STX table workaround */
-{
-    border: 1px solid #8CACBB ! important;
-}
-div.stx table td {
-    border-bottom: 1px solid #8CACBB;
+p.license
+{ text-align: justify;
 }
 
-
-div.box {
-    border: none;
-    margin: 0em 0em 2em 0em;
-    padding: 0;
+pre 
+{ font-size: 120%;
 }
 
-div.box h4 {
-    font-size: 1em;
+input.text
+{ border: 0px solid black;
+  padding: 4px 0px 4px 0.5em;
 }
 
-div.box h5 { 
-    background: #DEE7EC;
-    border: 1px solid #8CACBB;
-    border-style: solid solid none solid;
-    color: Black;
-    padding: 0em 1em 0em 1em;
-    text-transform: lowercase;
-    display: inline;
-    font-size: 1em;
-    height: 1em;
+.feedbackfield
+{ border: 0px solid black;
+  padding: 4px 0px 4px 0.5em;
+  width: 400px;
 }
 
-div.box h6 { 
-    background: #DEE7EC;
-    border: 1px solid #8CACBB;
-    border-style: solid solid none solid;
-    color: Black;
-    padding: 0em 1em 0em 1em;
-    text-transform: lowercase;
-    display: block;
-    font-size: 1em;
-    height: 1.2em;
+.playlistfield
+{ border: 0px solid black;
+  padding: 4px 0px 4px 0.5em;
+  width: 300px;
 }
 
-
-div.box div.body {
-    background: transparent;
-    border-collapse: collapse;
-    border: 1px solid #8CACBB;
+textarea.text
+{ border: 0px solid black;
+  padding: 4px 0px 4px 0.5em;
 }
 
-.boxDetails {
-    text-align: right;
+td.configname
+{ text-align: right;
+  padding-right: 0.5em;
+  border-bottom: 1px solid #8CACBB;
 }
 
-div.box .content {
-    padding: 1em;
+td.configdata
+{ text-align: left;
+  padding: 0px;
+  border-bottom: 1px solid #8CACBB;
 }
 
-div.box a.close {
-    float: right;
-    text-transform: none;
-    border-left: 1px solid #8CACBB;
-    padding: 0em 0.2em;
+td.feedbackdata
+{ text-align: left;
+  padding: 0px;
+  border-bottom: 1px solid #8CACBB;
+  padding-bottom: 4px;
 }
 
-div.box h1, 
-div.box h2, 
-div.box h3, 
-div.box h4 {
-    margin: 0;
-    padding: 0;
-}
-
-div.box .even {
-    background-color: #F7F9FA;
-}
-
-div.box .odd {
-    background-color: transparent;
-}
-
-div.box input {
-    font-size: 100%;
-}
-
-div.spacer {
-	margin: 1em;
-}
-
-.currentNavItem {
-    color: Black;
-    font-weight: bold;
-}
-
-.private {
-    color: Black;
-}
-
-.published {
-    color: #74AE0B;
-}
-
-.pending {
-    color: #FFA500;
-}
-
-.syndicated {
-    color: #008000;
-}
-
-.expired {
-    color: Red;
-}
-
-.even {
-    background-color: #F7F9FA;
-}
-
-.odd {
-    background-color: transparent;
-}
-
-.highlight {
-    background-color: #F7F9FA;
-}
-
-div.listingBar {
-    background: #DEE7EC;
-    border-color: #8CACBB;
-    border-style: solid;
-    border-width: 1px;
-    padding: 0em 1em;
-    text-align: center;
-    text-transform: lowercase;
-    clear: both;
-    vertical-align: top;
-    margin: 1em 0em;
-}
-
-div.listingBar span.previous {
-    text-align: left;
-    float: left;
-}
-
-div.listingBar span.next {
-    text-align: right;
-    float: right;
-}
-
-div listingBar img {
-	vertical-align: middle;
-}
-
-
-/*
-** Calendar elements - used in the calendar rendering 
-*/
-
-div.day {
-    background-color: #FFFFBB;
-    border: 1px solid Black;
-    padding: 0.2em;
-    position: absolute;
-    visibility: hidden;
-    width: 12em;
-    z-index: 2;
-}
-
-div.date {
-    font-weight: bold;
-}
-
-  
-table.calendar {
-    border: 1px solid #8CACBB;
-    margin: 0em 1em 2em 0em;
-    text-align: right;
-}
-
-table.calendar a {
-    text-decoration: none;
-    color: #436976;
-}
-
-table.calendar a:hover {
-    text-decoration: none;
-}
-
-table.calendar th {
-    background-color: #DEE7EC;
-    color: Black;
-    font-weight: bold;
-    text-align: center;
-}
-
-table.calendar td {
-    background-color: transparent;
-    width: 1.5em;
-    padding: 2px;
-}
-
-table.calendar td.weekdays {
-    background-color: #DEE7EC;
-    border: 1px solid #8CACBB;
-    border-style: solid none;
-    text-align: center;
-}
-
-table.calendar td.event {
-    background-color: #DEE7EC;
-    font-weight: bold;
-}
-
-table.calendar td.noevent {
-    background-color: transparent;
-}
-
-table.calendar td.todayevent {
-    background-color: #DEE7EC;
-    border: 2px solid #FFA500;
-    font-weight: bold;
-}
-
-table.calendar td.todaynoevent {
-    border-collapse: collapse;
-    border: 2px solid #FFA500;
-}
-
-.odd {
-  background-color: #ffffff;
-  border-top: 0px;
+td.feedbacktext
+{ text-align: left;
   border-bottom: 0px;
-}
-.even {
-  background-color: #edf3fe;
-  border-top: 0px;
-  border-bottom: 0px;
-}
-.mytbody {
-  /*height: 300px;
-  overflow: auto;*/
-  font: icon !important;
-}
-#browse {
-  font: icon !important;
-  width: 100%;
-}
-.mytable {
-    /* The default table for document listings. Contains name, document types, modification times etc in a file-browser-like fashion */
-    border-collapse: collapse;
-    border: 1px solid #8CACBB;
-    margin: 1em 0em 1em 0em;
-    font: icon !important;
-    width: 100%;
-    clear: both;
+  padding-top: 4px;
 }
 
-.mytable th {
-    background: #DEE7EC;
-    border-top: 1px solid #8CACBB;
-    border-bottom: 1px solid #8CACBB;
-    border-right: 1px solid #8CACBB;
-    color: Black;
-    font-weight: normal;
-    padding: 0em 1em 0em 1em;
-    text-transform: lowercase;
-    white-space: nowrap;
-}
-.mytable td {
-  padding-left: 2px;
-  padding-right: 2px;
-  border-right: 1px solid #BCDCDF;
+td.feedbackname
+{ text-align: right;
+  font-weight: bold;
+  width: 10em;
+  border-bottom: 1px solid #8CACBB;
 }
 
-/*  */
+td.submit
+{ text-align: right;
+}
 
+table
+{ border: 1px solid #8CACBB;
+  border-spacing: 0px;
+  border-collapse: collapse;
+}
+
+th
+{ font-weight: bold;
+  text-align: right;
+  background: #8CACBB;
+  color: #DEE7EC; 
+}
+
+td
+{ text-align: right;
+  padding: 0px 4px 0px 4px;
+  border-bottom: 1px solid #8CACBB;
+}
+
+td.text
+{ text-align: left;
+}
+
+
+li
+{ padding-bottom: 0.5em;
+}
diff --git a/admin-root/smart.html b/admin-root/smart.html
index ba92a781..50efcc60 100644
--- a/admin-root/smart.html
+++ b/admin-root/smart.html
@@ -1,7 +1,5 @@
 @include hdr.html@
 
-<div class="stx">
-
 <h2>Smart Playlists</h2>
 <table width="400">
 <thead><tr><th>ID</th><th>Playlist Name</th><th>Type</th><th>Action</th></tr></thead>
@@ -14,29 +12,31 @@
 </div>
 
 <div id="pl_editor" style="display:none">
-<h3>Playlist Spec</h3>
+<h2>Please specify new playlist</h2>
 <form name="pl_form" action="">
 <input type="hidden" name="playlist_id"/>
 <table width="400">
 <tr>
-<th>Name</th>
-<td><input type="text" name="playlist_name"/></td>
-</tr>
-
-<tr>
-<th>Playlist Criteria</th>
-<td><textarea rows="5" name="playlist_spec"></textarea></td>
-</tr>
-</table>
-
+  <th>New playlist</th>
+  <th>
 <input type="button" onclick="javascript:pl_update();" name="submit_button" value="Submit"/>
 <input type="button" onclick="javascript:pl_cancel();" value="Cancel"/>
-<input type="button" onclick="javascript:pl_popup('smartpopup.html');" value="Wizard"/>
+<input type="button" onclick="javascript:popUp('smartpopup.html');" value="Wizard"/>
+  </th>
+<tr>
+  <td>Name</td>
+  <td><input class="playlistfield" type="text" name="playlist_name"/></td>
+</tr>
+<tr>
+  <td>Playlist criteria</td>
+  <td><textarea class="playlistfield" rows="5" name="playlist_spec"></textarea></td>
+</tr>
+</table>
 </form>
 </div>
 
 <div id="pl_warning" class="message" style="display:none">
-Error Messages Go here
+Error messages go here...
 </div>
 
 
diff --git a/admin-root/smart.js b/admin-root/smart.js
index c91fdf6c..f7e12db6 100644
--- a/admin-root/smart.js
+++ b/admin-root/smart.js
@@ -2,12 +2,6 @@ var req;
 var playlist_info={};
 
 
-function pl_popup(URL) {
-    day = new Date();
-    id = day.getTime();
-    eval("pagemtdaapdplPop = window.open(URL, 'mtdaapdple', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=500,height=240,left = 320,top = 448');");
-}
-
 function pl_editor_state(state) {
     var pleditor = document.getElementById("pl_editor");
     if(!pleditor)
diff --git a/admin-root/smartpopup.html b/admin-root/smartpopup.html
index e4cafd07..e7c1d1db 100755
--- a/admin-root/smartpopup.html
+++ b/admin-root/smartpopup.html
@@ -1,5 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>mt-daapd playlist wizard</title></head>
+<html>
+<head>
+  <title>mt-daapd playlist wizard</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <link rel="stylesheet" type="text/css" href="mt-daapd.css" />
+</head>
 <script language="JavaScript" type="text/javascript">
 
 function loadOpenerCriteria()
@@ -103,8 +108,8 @@ function plRowShow(x)
 function plOutputRow(x,vis)
 { document.write('<tr id="rowcrit',x,'" style="visibility:');
   document.write(vis?'visible':'hidden');
-  document.write(';"><th>Criterion ',x,':<\/th>',
-'<td><select name="playlist_crit',x,'field" style="width:100%" onChange="javascript:plUpdateComp(\'',x,'\');plTemplateWizard()">',
+  document.write(';"><td>Criterion ',x,':<\/td>',
+'<td><select class="playlistfield" name="playlist_crit',x,'field" style="width:100%" onChange="javascript:plUpdateComp(\'',x,'\');plTemplateWizard()">',
 '<optgroup label="Basic">',
 '<option value="title">Title<\/option>',
 '<option value="artist">Artist<\/option>',
@@ -136,10 +141,10 @@ function plOutputRow(x,vis)
 '<option value="compilation">Compilation<\/option>',
 '<\/optgroup>',
 '<\/select><\/td>',
-'<td><select name="playlist_crit',x,'comp" style="width:100%" onChange="javascript:plTemplateWizard()">',
+'<td><select class="playlistfield" name="playlist_crit',x,'comp" style="width:100%" onChange="javascript:plTemplateWizard()">',
 '<option value="=">=<\/option>',
 '<\/select><\/td>',
-'<td><input name="playlist_crit',x,'data" onChange="javascript:plTemplateWizard()" style="width:100%"/><\/td>');
+'<td><input class="playlistfield" name="playlist_crit',x,'data" onChange="javascript:plTemplateWizard()" style="width:100%"/><\/td>');
   document.write('<\/tr>');
 }
 
@@ -199,6 +204,7 @@ function plUpdateComp(x)
   objComp = document.getElementsByName("playlist_crit"+x+"comp");
   objComp[0].options.length = 0;
   objComp[0].options[0] = new Option('=','=');
+  objComp[0].options[1] = new Option('not =','not =');
   if ((objField[0].value=='artist') 
    || (objField[0].value=='title')
    || (objField[0].value=='album')
@@ -211,12 +217,12 @@ function plUpdateComp(x)
    || (objField[0].value=='grouping')
    || (objField[0].value=='url')
    || (objField[0].value=='codectype'))
-  { objComp[0].options[1] = new Option('includes','includes');
+  { objComp[0].options[2] = new Option('includes','includes');
   } else
-  { objComp[0].options[1] = new Option('>','>');
-    objComp[0].options[2] = new Option('>=','>=');
-    objComp[0].options[3] = new Option('<','<');
-    objComp[0].options[4] = new Option('<=','<=');
+  { objComp[0].options[2] = new Option('>','>');
+    objComp[0].options[3] = new Option('>=','>=');
+    objComp[0].options[4] = new Option('<','<');
+    objComp[0].options[5] = new Option('<=','<=');
   }
 }
 
@@ -305,11 +311,11 @@ function plTemplatePlaylist()
 <body onLoad="loadOpenerCriteria();">
 <form name="pleditor" action="">
 <input type="hidden" name="playlist_id"/>
-<table style="border:1px solid black;" width="100%">
+<table width="100%">
 
-<tr><th colspan="4">Wizard</th></tr>
-<tr><th>Template:</th>
-<td colspan="3"><select name="playlist_template" style="width:100%" onChange="javascript:plTemplatePlaylist()">
+<tr><th>Wizard</th><th colspan="3"></th></tr>
+<tr><td>Template:</td>
+<td colspan="3"><select class="playlistfield" name="playlist_template" style="width:100%" onChange="javascript:plTemplatePlaylist()">
 <option value="" selected="SELECTED">Custom playlist</option>
 <option value="60s">Music from the 60's</option>
 <option value="70s">Music from the 70's</option>
@@ -328,7 +334,7 @@ plOutputRow(4,true);
 plOutputRow(5,true);
 </script>
 
-<tr><th>Combine:</th>
+<tr><td>Combine:</td>
 <td colspan="3">
 <input type="radio" name="playlist_combine" value=" AND " checked="CHECKED" onChange="javascript:plTemplateWizard()"> match all 
 <input type="radio" name="playlist_combine" value=" OR " onChange="javascript:plTemplateWizard()"> match some 
diff --git a/admin-root/status.html b/admin-root/status.html
index b5bc5b61..888db4db 100644
--- a/admin-root/status.html
+++ b/admin-root/status.html
@@ -1,14 +1,12 @@
 @include hdr.html@
 
-
 <h1>Status</h1>
-
-<div class="stx">
+<p>
 @THREADSTAT@
+</p>
 
-<br />
-
+<p>
 @SERVICE-STATUS@
-</div>
+</p>
 
 @include ftr.html@
diff --git a/admin-root/thanks.html b/admin-root/thanks.html
index db7d7313..ee1565ce 100644
--- a/admin-root/thanks.html
+++ b/admin-root/thanks.html
@@ -2,13 +2,13 @@
 
 <h1>Thanks</h1>
 
-<div class="stx">
-
+<p class="description">
 Special thanks to the following people:
+</p>
 
-<pre>
+<p class="description"><pre>
 @include CREDITS@
-</pre>
+</pre></p>
 
 </div>
 @include ftr.html@