diff --git a/admin-root/config.html b/admin-root/config.html
index 32a68c02..be735ab0 100644
--- a/admin-root/config.html
+++ b/admin-root/config.html
@@ -2,88 +2,88 @@
 
 <h1>Configuration</h1>
 
-<P>
+<p>
 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@" SIZE="80"></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>
+    <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>
 
-      </TABLE>
-      <INPUT TYPE="SUBMIT" NAME="SUBMIT" VALUE="Submit">
-    </FORM>
+      </table>
+      <div><input type="submit" name="SUBMIT" value="Submit" /></div>
+    </form>
 </div>
 
 @include ftr.html@
diff --git a/admin-root/feedback.html b/admin-root/feedback.html
index 6a43eaff..088b0272 100644
--- a/admin-root/feedback.html
+++ b/admin-root/feedback.html
@@ -4,12 +4,12 @@
 
 <div class="stx">
 
-<FORM ACTION="http://www.pedde.com/mt-daapd/register.php" METHOD="POST">
+<form action="http://www.pedde.com/mt-daapd/register.php" method="post">
 
 <table>
 <tr valign="top">
   <th>Works?</th>
-  <td><input type="checkbox" name="works" value="CHECKED" CHECKED></td>
+  <td><input type="checkbox" name="works" value="CHECKED" checked="checked" /></td>
   <td>
   The most important question.  Did this version work for you?
   If not, uncheck the box, and put an explanation in the NOTES
@@ -19,7 +19,7 @@
 
 <tr valign="top">
   <th>Version</th>
-  <td><input type="text" name="version" value="@VERSION@"></td>
+  <td><input type="text" name="version" value="@VERSION@" /></td>
   <td>
   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
@@ -30,7 +30,7 @@
 
 <tr valign="top">
   <th>System</th>
-  <td><input type="text" name="system" value="@SYSTEM@"></td>
+  <td><input type="text" name="system" value="@SYSTEM@" /></td>
   <td>
   This is the operating system and version you are running.
   Use something like "Sparc Solaris 9" or "x86 Linux 2.6.3" or
@@ -41,7 +41,7 @@
 
 <tr valign="top">
   <th>Compile args</th>
-  <td><input type="text" name="compile" value="@FLAGS@"></td>
+  <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.
@@ -50,7 +50,7 @@
 
 <tr valign="top">
   <th>Notes</th>
-  <td><textarea rows=3 cols=40 name="notes"></textarea></td>
+  <td><textarea rows="3" cols="40" name="notes"></textarea></td>
   <td>
   If it didn't work for you, or if you just want to make a
   suggestion, leave those notes here.  Remember that these
@@ -60,7 +60,7 @@
 
 <tr valign="top">
   <th>Rating</th>
-  <td><input type="text" name="rating"></td>
+  <td><input type="text" name="rating" /></td>
   <td>
   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
@@ -69,7 +69,8 @@
 </tr>
 </table>
 
-<input type="submit" value="Leave Feedback">
+<div><input type="submit" value="Leave Feedback" /></div>
+</form>
 </div>
 
 @include ftr.html@
diff --git a/admin-root/hdr.html b/admin-root/hdr.html
index 6157e02a..8dc69ff1 100644
--- a/admin-root/hdr.html
+++ b/admin-root/hdr.html
@@ -1,9 +1,11 @@
-<html>
+<!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>
-
-    <link rel="stylesheet" type="text/css" href="mt-daapd.css">
-
+    <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" />:@
   </head>
 
   <body>
@@ -11,8 +13,8 @@
     <div>
       <!-- <h1>.: m t - d a a p d :.</h1> -->
       <table border="0" width="100%">
-	<tr><td width="90%">&nbsp;</td><td align="center"><img src="mt-daapd.png"
-	border="0"><br>Version @VERSION@</td></tr>
+	<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>
 
diff --git a/admin-root/status.html b/admin-root/status.html
index c9fcb372..b5bc5b61 100644
--- a/admin-root/status.html
+++ b/admin-root/status.html
@@ -1,13 +1,12 @@
 @include hdr.html@
 
-<META HTTP-EQUIV="refresh" content="10">
 
 <h1>Status</h1>
 
 <div class="stx">
 @THREADSTAT@
 
-<br>
+<br />
 
 @SERVICE-STATUS@
 </div>
diff --git a/admin-root/thanks.html b/admin-root/thanks.html
index 6b38f147..de2c3cc1 100644
--- a/admin-root/thanks.html
+++ b/admin-root/thanks.html
@@ -26,5 +26,5 @@ Special thanks to the following people:
       this page</a>, as I found it to be an excellent reference
   </li>
 </ul>
-
+</div>
 @include ftr.html@
diff --git a/src/configfile.c b/src/configfile.c
index 3b029d5c..46045d57 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -789,10 +789,10 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
     int r_days, r_hours, r_mins, r_secs;
     int scanning;
 
-    ws_writefd(pwsc,"<TABLE><TR><TH ALIGN=LEFT>Service</TH>");
-    ws_writefd(pwsc,"<TH ALIGN=LEFT>Status</TH><TH ALIGN=LEFT>Control</TH></TR>\n");
+    ws_writefd(pwsc,"<table><tr><th align=\"left\">Service</th>");
+    ws_writefd(pwsc,"<th align=\"left\">Status</th><th align=\"left\">Control</th></tr>\n");
 
-    ws_writefd(pwsc,"<TR><TD>Rendezvous</TD>");
+    ws_writefd(pwsc,"<tr><td>Rendezvous</td>");
 #ifndef WITHOUT_MDNS
     if(config.use_mdns) {
 	mdns_running=!rend_running();
@@ -803,35 +803,35 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
 	    html="<a href=\"config-update.html?action=startmdns\">Start MDNS Server</a>";
 	}
 
-	ws_writefd(pwsc,"<TD>%s</TD><TD>%s</TD></TR>\n",mdns_running ? "Running":"Stopped",
+	ws_writefd(pwsc,"<td>%s</td><td>%s</td></tr>\n",mdns_running ? "Running":"Stopped",
 		   html);
     } else {
-	ws_writefd(pwsc,"<TD>Not configured</TD><TD>&nbsp;</TD></TR>\n");
+	ws_writefd(pwsc,"<td>Not configured</td><td>&nbsp;</td></tr>\n");
     }
 #else
-    ws_writefd(pwsc,"<TD>No Support</TD><TD>&nbsp;</TD></TR>\n");
+    ws_writefd(pwsc,"<td>No Support</td><td>&nbsp;</td></tr>\n");
 #endif
 
-    ws_writefd(pwsc,"<TR><TD>DAAP Server</TD><TD>%s</TD>",config.stop ? "Stopping":"Running");
+    ws_writefd(pwsc,"<tr><td>DAAP Server</td><td>%s</td>",config.stop ? "Stopping":"Running");
     if(config.stop) {
-	ws_writefd(pwsc,"<TD>Wait...</TD></TR>\n");
+	ws_writefd(pwsc,"<td>Wait...</td></tr>\n");
     } else {
-	ws_writefd(pwsc,"<TD><a href=\"config-update.html?action=stopdaap\">Stop DAAP Server</a></TD></TR>");
+	ws_writefd(pwsc,"<td><a href=\"config-update.html?action=stopdaap\">Stop DAAP Server</a></td></tr>");
     }
 
     scanning = config.reload;
-    ws_writefd(pwsc,"<TR><TD>Background scanner</TD><TD>%s</TD>",scanning ? "Running":"Idle");
+    ws_writefd(pwsc,"<tr><td>Background scanner</td><td>%s</td>",scanning ? "Running":"Idle");
     if(scanning) {
-	ws_writefd(pwsc,"<TD>Wait...</TD></TR>");
+	ws_writefd(pwsc,"<td>Wait...</td></tr>");
     } else {
-	ws_writefd(pwsc,"<TD><A HREF=\"config-update.html?action=rescan\">Start Scan</A></TD></TR>");
+	ws_writefd(pwsc,"<td><a href=\"config-update.html?action=rescan\">Start Scan</a></td></tr>");
     }
 
-    ws_writefd(pwsc,"</TABLE>\n");
+    ws_writefd(pwsc,"</table>\n");
 
-    ws_writefd(pwsc,"<TABLE>\n");
-    ws_writefd(pwsc,"<TR>\n");
-    ws_writefd(pwsc," <TH>Uptime</TH>\n");
+    ws_writefd(pwsc,"<table>\n");
+    ws_writefd(pwsc,"<tr>\n");
+    ws_writefd(pwsc," <th>Uptime</th>\n");
 
     r_secs=time(NULL)-config.stats.start_time;
 
@@ -860,34 +860,34 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
     sprintf((char*)&buf[strlen(buf)],"%d second%s ", r_secs,
 	    r_secs == 1 ? "" : "s");
     
-    ws_writefd(pwsc," <TD>%s</TD>\n",buf);
-    ws_writefd(pwsc,"</TR>\n");
+    ws_writefd(pwsc," <td>%s</td>\n",buf);
+    ws_writefd(pwsc,"</tr>\n");
     
-    ws_writefd(pwsc,"<TR>\n");
-    ws_writefd(pwsc," <TH>Songs</TH>\n");
-    ws_writefd(pwsc," <TD>%d</TD>\n",db_get_song_count());
-    ws_writefd(pwsc,"</TR>\n");
+    ws_writefd(pwsc,"<tr>\n");
+    ws_writefd(pwsc," <th>Songs</th>\n");
+    ws_writefd(pwsc," <td>%d</td>\n",db_get_song_count());
+    ws_writefd(pwsc,"</tr>\n");
 
-    ws_writefd(pwsc,"<TR>\n");
-    ws_writefd(pwsc," <TH>Songs Served</TH>\n");
-    ws_writefd(pwsc," <TD>%d</TD>\n",config.stats.songs_served);
-    ws_writefd(pwsc,"</TR>\n");
+    ws_writefd(pwsc,"<tr>\n");
+    ws_writefd(pwsc," <th>Songs Served</th>\n");
+    ws_writefd(pwsc," <td>%d</td>\n",config.stats.songs_served);
+    ws_writefd(pwsc,"</tr>\n");
 
     if(!scanning) {
-	ws_writefd(pwsc,"<TR>\n");
-	ws_writefd(pwsc," <TH>DB Version</TH>\n");
-	ws_writefd(pwsc," <TD>%d</TD>\n",db_version());
-	ws_writefd(pwsc,"</TR>\n");
+	ws_writefd(pwsc,"<tr>\n");
+	ws_writefd(pwsc," <th>DB Version</th>\n");
+	ws_writefd(pwsc," <td>%d</td>\n",db_version());
+	ws_writefd(pwsc,"</tr>\n");
     }
 
     /*
-    ws_writefd(pwsc,"<TR>\n");
-    ws_writefd(pwsc," <TH>Bytes Served</TH>\n");
-    ws_writefd(pwsc," <TD>%d</TD>\n",config.stats.songs_served);
-    ws_writefd(pwsc,"</TR>\n");
+    ws_writefd(pwsc,"<tr>\n");
+    ws_writefd(pwsc," <th>Bytes Served</th>\n");
+    ws_writefd(pwsc," <td>%d</td>\n",config.stats.songs_served);
+    ws_writefd(pwsc,"</tr>\n");
     */
 
-    ws_writefd(pwsc,"</TABLE>\n");
+    ws_writefd(pwsc,"</table>\n");
 }
 
 
@@ -954,19 +954,19 @@ void config_emit_threadstatus(WS_CONNINFO *pwsc, void *value, char *arg) {
     if(config_mutex_lock())
 	return;
 
-    ws_writefd(pwsc,"<TABLE><TR><TH ALIGN=LEFT>Thread</TH>");
-    ws_writefd(pwsc,"<TH ALIGN=LEFT>Session</TH><TH ALIGN=LEFT>Host</TH>");
-    ws_writefd(pwsc,"<TH ALIGN=LEFT>Action</TH></TR>\n");
+    ws_writefd(pwsc,"<table><tr><th align=\"left\">Thread</th>");
+    ws_writefd(pwsc,"<th align=\"left\">Session</th><th align=\"left\">Host</th>");
+    ws_writefd(pwsc,"<th align=\"left\">Action</th></tr>\n");
 
 
     pss=scan_status.next;
     while(pss) {
-	ws_writefd(pwsc,"<TR><TD>%d</TD><TD>%d</TD><TD>%s</TD><TD>%s</TD></TR>\n",
+	ws_writefd(pwsc,"<tr><td>%d</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 		   pss->thread,pss->session,pss->host,pss->what);
 	pss=pss->next;
     }
 
-    ws_writefd(pwsc,"</TABLE>\n");
+    ws_writefd(pwsc,"</table>\n");
     config_mutex_unlock();
 }
 
@@ -1076,7 +1076,7 @@ int config_file_is_readonly(void) {
  */
 void config_emit_readonly(WS_CONNINFO *pwsc, void *value, char *arg) {
     if(config_file_is_readonly()) {
-	ws_writefd(pwsc,"READONLY");
+	ws_writefd(pwsc,"readonly=\"readonly\"");
     }
 }