From: Art Cancro <ajc@citadel.org>
Date: Tue, 11 Jan 2005 05:05:11 +0000 (+0000)
Subject: * *** HUGE CHANGES ***   *** WARNING: NOT FULLY FUNCTIONAL ***
X-Git-Tag: v7.86~5155
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=792253218528e4327e0ddf1da78e424c9c9f08a4

* *** HUGE CHANGES ***   *** WARNING: NOT FULLY FUNCTIONAL ***
* Ripped things apart in a big way.  The frameset is gone (except for
  chat, for which we'll probably keep frames).  Iconbar and banner are
  now done using CSS and <div> tags.
* Room read/enter/goto controls are currently missing.  Stay tuned.
* I am in the process of rewriting all of the markup as valid XHTML.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index a1eca06f8..f7ba8dd30 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,12 @@
 $Log$
+Revision 528.3  2005/01/11 05:05:08  ajc
+* *** HUGE CHANGES ***   *** WARNING: NOT FULLY FUNCTIONAL ***
+* Ripped things apart in a big way.  The frameset is gone (except for
+  chat, for which we'll probably keep frames).  Iconbar and banner are
+  now done using CSS and <div> tags.
+* Room read/enter/goto controls are currently missing.  Stay tuned.
+* I am in the process of rewriting all of the markup as valid XHTML.
+
 Revision 528.2  2004/12/29 22:08:08  ajc
 * roomops.c: provide a way to create room shares with a mapping to an
   alternate room name on the other end.
@@ -2154,4 +2162,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/auth.c b/webcit/auth.c
index 50e42586d..a2f51d6d7 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -46,7 +46,8 @@ void display_login(char *mesg)
 {
 	char buf[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"text\">\n");
 
 	if (mesg != NULL) if (strlen(mesg) > 0) {
 		stresc(buf, mesg, 0, 0);
@@ -59,7 +60,7 @@ void display_login(char *mesg)
 
 	do_template("login");
 
-	wDumpContent(0);	/* No menu here; not logged in yet! */
+	wDumpContent(2);
 }
 
 
@@ -159,7 +160,8 @@ void do_welcome(void)
 
         svprintf("STARTPAGE", WCS_STRING, startpage);
 
-        do_template("mainframeset");
+	/* FIXME ... go to my start page, not to the summary */
+	summary();
 }
 
 
@@ -181,7 +183,8 @@ void do_logout(void)
 	strcpy(WC->wc_password, "");
 	strcpy(WC->wc_roomname, "");
 
-	output_headers(2);	/* note "2" causes cookies to be unset */
+	/* Calling output_headers() this way causes the cookies to be un-set */
+	output_headers(1, 1, 0, 1, 0, 0, 0);
 
 	wprintf("<CENTER>");
 	serv_puts("MESG goodbye");
@@ -201,7 +204,7 @@ void do_logout(void)
 		);
 	}
 
-	wprintf("<HR><A HREF=\"/\">Log in again</A>&nbsp;&nbsp;&nbsp;"
+	wprintf("<hr /><A HREF=\"/\">Log in again</A>&nbsp;&nbsp;&nbsp;"
 		"<A HREF=\"javascript:window.close();\">Close window</A>"
 		"</CENTER>\n");
 	wDumpContent(2);
@@ -209,7 +212,6 @@ void do_logout(void)
 }
 
 
-
 /* 
  * validate new users
  */
@@ -220,7 +222,7 @@ void validate(void)
 	char buf[SIZ];
 	int a;
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	strcpy(buf, bstr("user"));
 	if (strlen(buf) > 0)
@@ -228,14 +230,14 @@ void validate(void)
 			serv_printf("VALI %s|%s", buf, bstr("axlevel"));
 			serv_gets(buf);
 			if (buf[0] != '2') {
-				wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+				wprintf("<EM>%s</EM><br />\n", &buf[4]);
 			}
 		}
 	serv_puts("GNUR");
 	serv_gets(buf);
 
 	if (buf[0] != '3') {
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
@@ -253,38 +255,38 @@ void validate(void)
 			serv_gets(buf);
 			++a;
 			if (a == 1)
-				wprintf("User #%s<BR><H1>%s</H1>",
+				wprintf("User #%s<br /><H1>%s</H1>",
 					buf, &cmd[4]);
 			if (a == 2)
-				wprintf("PW: %s<BR>\n", buf);
+				wprintf("PW: %s<br />\n", buf);
 			if (a == 3)
-				wprintf("%s<BR>\n", buf);
+				wprintf("%s<br />\n", buf);
 			if (a == 4)
-				wprintf("%s<BR>\n", buf);
+				wprintf("%s<br />\n", buf);
 			if (a == 5)
 				wprintf("%s, ", buf);
 			if (a == 6)
 				wprintf("%s ", buf);
 			if (a == 7)
-				wprintf("%s<BR>\n", buf);
+				wprintf("%s<br />\n", buf);
 			if (a == 8)
-				wprintf("%s<BR>\n", buf);
+				wprintf("%s<br />\n", buf);
 			if (a == 9)
 				wprintf("Current access level: %d (%s)\n",
 					atoi(buf), axdefs[atoi(buf)]);
 		} while (strcmp(buf, "000"));
 	} else {
-		wprintf("<H1>%s</H1>%s<BR>\n", user, &cmd[4]);
+		wprintf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
 	}
 
-	wprintf("<HR>Select access level for this user:<BR>\n");
+	wprintf("<hr />Select access level for this user:<br />\n");
 	for (a = 0; a <= 6; ++a) {
 		wprintf("<A HREF=\"/validate&user=");
 		urlescputs(user);
 		wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
 			a, axdefs[a]);
 	}
-	wprintf("<BR>\n");
+	wprintf("<br />\n");
 
 	wprintf("</CENTER>\n");
 	do_template("endbox");
@@ -335,11 +337,11 @@ void display_changepw(void)
 {
 	char buf[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Change your password");
 	do_template("beginbox");
-	wprintf("<CENTER><BR>");
+	wprintf("<CENTER><br />");
 	serv_puts("MESG changepw");
 	serv_gets(buf);
 	if (buf[0] == '1') {
@@ -354,7 +356,7 @@ void display_changepw(void)
 	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
 	wprintf("<TR><TD>Enter it again to confirm:</TD>\n");
 	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-	wprintf("</TABLE><BR>\n");
+	wprintf("</TABLE><br />\n");
 	wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n"
 		"&nbsp;"
 		"<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
diff --git a/webcit/calendar.c b/webcit/calendar.c
index a28eadaa3..e5f839025 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -38,7 +38,7 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 		" but support for calendars is not available on this "
 		"particular system.  Please ask your system administrator to "
 		"install a new version of the Citadel web service with "
-		"calendaring enabled.</I><BR>\n"
+		"calendaring enabled.</I><br />\n"
 	);
 
 }
@@ -48,7 +48,7 @@ void display_calendar(long msgnum) {
 		"Cannot display calendar item.  You are seeing this error "
 		"because your WebCit service has not been installed with "
 		"calendar support.  Please contact your system administrator."
-		"</i><br>\n");
+		"</i><br />\n");
 }
 
 void display_task(long msgnum) {
@@ -56,7 +56,7 @@ void display_task(long msgnum) {
 		"Cannot display to-do item.  You are seeing this error "
 		"because your WebCit service has not been installed with "
 		"calendar support.  Please contact your system administrator."
-		"</i><br>\n");
+		"</i><br />\n");
 }
 
 #else /* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -332,7 +332,7 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 	cal = icalcomponent_new_from_string(part_source);
 
 	if (cal == NULL) {
-		wprintf("Error parsing calendar object<BR>\n");
+		wprintf("Error parsing calendar object<br />\n");
 		return;
 	}
 
@@ -352,12 +352,14 @@ void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum) {
 void respond_to_request(void) {
 	char buf[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
 
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
 		"<SPAN CLASS=\"titlebar\">Respond to meeting request</SPAN>"
-		"</TD></TR></TABLE><BR>\n"
+		"</TD></TR></TABLE>\n"
 	);
+	wprintf("</div>\n<div id=\"text\">\n");
 
 	serv_printf("ICAL respond|%s|%s|%s|",
 		bstr("msgnum"),
@@ -394,7 +396,7 @@ void respond_to_request(void) {
 
 	wprintf("<A HREF=\"/dotskip?room=");
 	urlescputs(WC->wc_roomname);
-	wprintf("\"><BR>Return to messages</A><BR>\n");
+	wprintf("\"><br />Return to messages</A><br />\n");
 
 	wDumpContent(1);
 }
@@ -407,12 +409,14 @@ void respond_to_request(void) {
 void handle_rsvp(void) {
 	char buf[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
 
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
 		"<SPAN CLASS=\"titlebar\">"
 		"Update your calendar with this RSVP</SPAN>"
-		"</TD></TR></TABLE><BR>\n"
+		"</TD></TR></TABLE>\n"
+		"</div><div id=\"text\">\n"
 	);
 
 	serv_printf("ICAL handle_rsvp|%s|%s|%s|",
@@ -445,7 +449,7 @@ void handle_rsvp(void) {
 
 	wprintf("<A HREF=\"/dotskip?room=");
 	urlescputs(WC->wc_roomname);
-	wprintf("\"><BR>Return to messages</A><BR>\n");
+	wprintf("\"><br />Return to messages</A><br />\n");
 
 	wDumpContent(1);
 }
@@ -517,10 +521,12 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
 		created_new_vtodo = 1;
 	}
 
-	output_headers(3);
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n"
+		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
 		"<SPAN CLASS=\"titlebar\">Edit task</SPAN>"
-		"</TD></TR></TABLE><BR>\n"
+		"</TD></TR></TABLE>\n"
+		"</div><div id=\"text\">\n"
 	);
 	
 	do_template("beginbox_nt");
@@ -913,7 +919,7 @@ void do_freebusy(char *req) {
 
 	if (buf[0] != '1') {
 		wprintf("HTTP/1.0 404 %s\n", &buf[4]);
-		output_headers(0);
+		output_headers(0, 0, 0, 0, 0, 0, 0);
 		wprintf("Content-Type: text/plain\n");
 		wprintf("\n");
 		wprintf("%s\n", &buf[4]);
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index d89af8631..975d8c198 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -29,11 +29,11 @@
 #ifndef WEBCIT_WITH_CALENDAR_SERVICE
 
 void do_calendar_view(void) {	/* stub for non-libical builds */
-	wprintf("<CENTER><I>Calendar view not available</I></CENTER><BR>\n");
+	wprintf("<CENTER><I>Calendar view not available</I></CENTER><br />\n");
 }
 
 void do_tasks_view(void) {	/* stub for non-libical builds */
-	wprintf("<CENTER><I>Tasks view not available</I></CENTER><BR>\n");
+	wprintf("<CENTER><I>Tasks view not available</I></CENTER><br />\n");
 }
 
 #else	/* WEBCIT_WITH_CALENDAR_SERVICE */
@@ -52,7 +52,7 @@ void calendar_month_view_display_events(time_t thetime) {
 	int all_day_event = 0;
 
 	if (WC->num_cal == 0) {
-		wprintf("<BR><BR><BR>\n");
+		wprintf("<br /><br /><br />\n");
 		return;
 	}
 
@@ -112,7 +112,7 @@ lprintf(9, "Event: %04d/%02d/%02d, Now: %04d/%02d/%02d\n",
 					);
 					escputs((char *)
 						icalproperty_get_comment(p));
-					wprintf("</A></FONT><BR>\n");
+					wprintf("</A></FONT><br />\n");
 
 					if (all_day_event) {
 						wprintf("</TD></TR></TABLE>");
@@ -225,7 +225,7 @@ void calendar_month_view(int year, int month, int day) {
 			wprintf("%s ", months[tm.tm_mon]);
 		}
 		wprintf("<A HREF=\"readfwd?calview=day&year=%d&month=%d&day=%d\">"
-			"%d</A></B><BR>",
+			"%d</A></B><br />",
 			tm.tm_year + 1900,
 			tm.tm_mon + 1,
 			tm.tm_mday,
@@ -251,7 +251,7 @@ void calendar_month_view(int year, int month, int day) {
 
 
 void calendar_week_view(int year, int month, int day) {
-	wprintf("<CENTER><I>week view FIXME</I></CENTER><BR>\n");
+	wprintf("<CENTER><I>week view FIXME</I></CENTER><br />\n");
 }
 
 
@@ -269,7 +269,7 @@ void calendar_day_view_display_events(int year, int month,
 	int all_day_event = 0;
 
 	if (WC->num_cal == 0) {
-		wprintf("<BR><BR><BR>\n");
+		wprintf("<br /><br /><br />\n");
 		return;
 	}
 
@@ -313,7 +313,7 @@ void calendar_day_view_display_events(int year, int month,
 					);
 					escputs((char *)
 						icalproperty_get_comment(p));
-					wprintf("</A></FONT><BR>\n");
+					wprintf("</A></FONT><br />\n");
 
 					if (all_day_event) {
 						wprintf("</TD></TR></TABLE>");
@@ -424,9 +424,9 @@ void calendar_day_view(int year, int month, int day) {
 
 	/* Today's date */
 	wprintf("<TD ALIGN=CENTER>");
-	wprintf("<FONT SIZE=+2>%s</FONT><BR>"
-		"<FONT SIZE=+3>%d</FONT><BR>"
-		"<FONT SIZE=+2>%d</FONT><BR>",
+	wprintf("<FONT SIZE=+2>%s</FONT><br />"
+		"<FONT SIZE=+3>%d</FONT><br />"
+		"<FONT SIZE=+2>%d</FONT><br />",
 		months[month-1], day, year);
 	wprintf("</TD>");
 
@@ -441,11 +441,11 @@ void calendar_day_view(int year, int month, int day) {
 	wprintf("</TR></TABLE>\n");
 	/* End todays-date-with-left-and-right-arrows */
 
-	wprintf("<BR><BR><CENTER><font color=#FFFFFF>"
+	wprintf("<br /><br /><CENTER><font color=#FFFFFF>"
 		"&nbsp;<A HREF=\"/display_edit_event?msgnum=0"
 		"&year=%d&month=%d&day=%d\">"
 		"Add new calendar event</A>"
-		"<BR><BR>\n",
+		"<br /><br />\n",
 		year, month, day
 	);
 
@@ -515,7 +515,7 @@ void calendar_summary_view(void) {
 				if (p != NULL) {
 					escputs((char *)
 						icalproperty_get_comment(p));
-					wprintf(" (%s)<BR>\n", timestring);
+					wprintf(" (%s)<br />\n", timestring);
 				}
 			}
 		}
@@ -685,7 +685,7 @@ void do_tasks_view(void) {
 
 	wprintf("</TABLE>\n");
 
-	wprintf("<HR><A HREF=\"/display_edit_task?msgnum=0\">"
+	wprintf("<hr /><A HREF=\"/display_edit_task?msgnum=0\">"
 		"Add new task</A>\n"
 	);
 
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index c8b0fda4c..e9ea3772a 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -263,7 +263,6 @@ void context_loop(int sock)
 	int desired_session = 0;
 	int got_cookie = 0;
 	struct wcsession *TheSession, *sptr;
-	int outside_frameset_allowed = 0;
 
 	/*
 	 * Find out what it is that the web browser is asking for
@@ -333,27 +332,6 @@ void context_loop(int sock)
 				"?force_close_session=yes HTTP/1.0");
 	}
 
-	/* These are the URL's which may be executed outside of the
-	 * main frameset.  If it's not one of these, the page will
-	 * need JavaScript added to force the frameset to reload.
-	 */
-	if ( (!strcasecmp(buf, "/"))
-	   || (!strncasecmp(buf, "/static/", 8))
-	   || (!strncasecmp(buf, "/do_welcome", 11))
-	   || (!strncasecmp(buf, "/do_logout", 10))
-	   || (!strncasecmp(buf, "/login", 6))
-	   || (!strncasecmp(buf, "/page_popup", 11))
-	   || (!strncasecmp(buf, "/page_user", 10))	/* Sometimes this is wrong */
-	   || (!strncasecmp(buf, "/display_page", 10))	/* Sometimes this is wrong */
-	   || (!strncasecmp(buf, "/listsub", 8))
-	   || (!strncasecmp(buf, "/freebusy", 9))
-	   || (!strncasecmp(buf, "/termquit", 9)) ) {
-		outside_frameset_allowed = 1;
-	}
-	else {
-		outside_frameset_allowed = 0;
-	}
-
 	/*
 	 * See if there's an existing session open with the desired ID
 	 */
@@ -399,7 +377,6 @@ void context_loop(int sock)
 	pthread_setspecific(MyConKey, (void *)TheSession);
 	TheSession->http_sock = sock;
 	TheSession->lastreq = time(NULL);			/* log */
-	TheSession->outside_frameset_allowed = outside_frameset_allowed;
 	session_loop(req);				/* do transaction */
 	pthread_mutex_unlock(&TheSession->SessionMutex);	/* unbind */
 
diff --git a/webcit/event.c b/webcit/event.c
index b9ea1fea3..595f103ab 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -84,7 +84,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 	}
 
 	/* Begin output */
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 	do_template("beginbox_nt");
 	wprintf("<h3>&nbsp;<IMG ALIGN=CENTER SRC=\"/static/vcalendar.gif\">"
 		"&nbsp;Add or edit an event</h3>\n");
@@ -96,8 +96,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 	if (p != NULL) {
 		escputs((char *)icalproperty_get_comment(p));
 	}
-	wprintf("<BR>\n");
-	wprintf("SEQUENCE == %d<BR>\n", sequence);
+	wprintf("<br />\n");
+	wprintf("SEQUENCE == %d<br />\n", sequence);
 	*************************************************************/
 
 	wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" ACTION=\"/save_event\">\n");
@@ -323,7 +323,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 	wprintf("</TD></TR>\n");
 
 	/* Attendees */
-	wprintf("<TR><TD><B>Attendees</B><BR>"
+	wprintf("<TR><TD><B>Attendees</B><br />"
 		"<FONT SIZE=-2>(One per line)"
 		"</FONT></TD><TD>"
 		"<TEXTAREA %s NAME=\"attendees\" wrap=soft "
@@ -366,7 +366,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 
 	wprintf("</FORM>\n");
 	
-	wprintf("<SCRIPT language=\"javascript\">"
+	wprintf("<script language=\"javascript\">"
 		"<!--"
 			"if (document.EventForm.alldayevent.checked) {"
 				"document.EventForm.dtstart_hour.value='0';"
@@ -391,7 +391,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
 				"document.EventForm.dtend_year.disabled = false;"
 			"}"
 		"//-->"
-		"</SCRIPT>\n"
+		"</script>\n"
 	);
 
 	do_template("endbox");
diff --git a/webcit/floors.c b/webcit/floors.c
index 37b471594..a76743389 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -41,7 +41,7 @@ void display_floorconfig(char *prepend_html)
 	char floorname[SIZ];
 	int refcount;
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
 
 	if (prepend_html != NULL) {
 		client_write(prepend_html, strlen(prepend_html));
@@ -50,10 +50,12 @@ void display_floorconfig(char *prepend_html)
 	serv_printf("LFLR");	/* FIXME put a real test here */
 	serv_gets(buf);
 	if (buf[0] != '1') {
+		wprintf("<div id=\"banner\">\n");
         	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
         	wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
-        	wprintf("</TD></TR></TABLE><BR>\n");
-        	wprintf("%s<BR>\n", &buf[4]);
+        	wprintf("</TD></TR></TABLE>\n");
+		wprintf("</div><div id=\"text\">\n");
+        	wprintf("%s<br />\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
@@ -77,7 +79,7 @@ void display_floorconfig(char *prepend_html)
 			wprintf("</TD><TD>"
 				"<A HREF=\"/delete_floor?floornum=%d\">"
 				"<FONT SIZE=-1>(delete floor)</A>"
-				"</FONT><BR>", floornum
+				"</FONT><br />", floornum
 			);
 		}
 		wprintf("<FONT SIZE=-1>"
@@ -129,10 +131,10 @@ void delete_floor(void) {
 
 	if (buf[0] == '2') {
 		sprintf(message, "<B><I>Floor has been deleted."
-				"</I></B><BR><BR>\n");
+				"</I></B><br /><br />\n");
 	}
 	else {
-		sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+		sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
 	}
 
 	display_floorconfig(message);
@@ -149,7 +151,7 @@ void create_floor(void) {
 	serv_printf("CFLR %s|1", floorname);
 	serv_gets(buf);
 
-	sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+	sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
 
 	display_floorconfig(message);
 }
@@ -167,7 +169,7 @@ void rename_floor(void) {
 	serv_printf("EFLR %d|%s", floornum, floorname);
 	serv_gets(buf);
 
-	sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+	sprintf(message, "<B><I>%s</I></B>><br />", &buf[4]);
 
 	display_floorconfig(message);
 }
diff --git a/webcit/graphics.c b/webcit/graphics.c
index e6897f1b9..964a05926 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -31,7 +31,7 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 		display_main_menu();
 		return;
 	}
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Set/change your photo");
 	do_template("beginbox");
@@ -47,11 +47,11 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
 
 	wprintf("You can upload any image directly from your computer,\n");
 	wprintf("as long as it is in GIF format (JPEG, PNG, etc. won't\n");
-	wprintf("work).<BR><BR>\n");
+	wprintf("work).<br /><br />\n");
 
-	wprintf("Please select a file to upload:<BR><BR>\n");
+	wprintf("Please select a file to upload:<br /><br />\n");
 	wprintf("<INPUT TYPE=\"FILE\" NAME=\"filename\" SIZE=\"35\">\n");
-	wprintf("<BR><BR>");
+	wprintf("<br /><br />");
 	wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" VALUE=\"Upload\">\n");
 	wprintf("&nbsp;");
 	wprintf("<INPUT TYPE=\"RESET\" VALUE=\"Reset Form\">\n");
diff --git a/webcit/html2html.c b/webcit/html2html.c
index 6eb490a60..31a396b40 100644
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -57,7 +57,7 @@ void output_html(void) {
 		msg = realloc(msg, buffer_length);
 		if (msg == NULL) {
 			wprintf("<B>realloc() error!  "
-				"couldn't get %d bytes: %s</B><BR><BR>\n",
+				"couldn't get %d bytes: %s</B><br /><br />\n",
 				buffer_length + 1,
 				strerror(errno));
 			return;
@@ -196,7 +196,7 @@ void output_html(void) {
 	client_write(converted_msg, output_length);
 
 	/* A little trailing vertical whitespace... */
-	wprintf("<BR><BR>\n");
+	wprintf("<br /><br />\n");
 
 	/* Now give back the memory */
 	free(converted_msg);
diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 9a9320398..6f14bd35e 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -78,7 +78,6 @@ void do_iconbar(void) {
 		if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
 	}
 
-	output_headers(11);
 	do_template("beginbox_nt");
 
 	wprintf("<center>\n");
@@ -86,21 +85,21 @@ void do_iconbar(void) {
 	if (ib_logo) if (ib_displayas != IB_TEXTONLY) wprintf(
 		"<IMG BORDER=\"0\" WIDTH=\"48\" "
 			"HEIGHT=\"48\" SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
-			"<BR>\n"
+			"<br />\n"
 	);
 
 	if (ib_summary) {
 		wprintf("<SPAN CLASS=\"iconbar_link\">"
 			"<A HREF=\"/summary\" "
 			"TITLE=\"Your summary page\" "
-			"TARGET=\"workspace\"><P>"
+			"><P>"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-				"SRC=\"/static/summary.gif\"><BR>");
+				"SRC=\"/static/summary.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Summary<BR>");
+			wprintf("Summary<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -109,14 +108,14 @@ void do_iconbar(void) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/dotgoto?room=_MAIL_\" "
 			"TITLE=\"Go to your e-mail inbox\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-				"SRC=\"/static/mail.gif\"><BR>");
+				"SRC=\"/static/mail.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Mail<BR>");
+			wprintf("Mail<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -125,14 +124,14 @@ void do_iconbar(void) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/dotgoto?room=Calendar\" "
 			"TITLE=\"Go to your personal calendar\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/vcalendar.gif\"><BR>");
+			"SRC=\"/static/vcalendar.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Calendar<BR>");
+			wprintf("Calendar<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -141,14 +140,14 @@ void do_iconbar(void) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/dotgoto?room=Contacts\" "
 			"TITLE=\"Go to your personal address book\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/vcard.gif\"><BR>");
+			"SRC=\"/static/vcard.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Contacts<BR>");
+			wprintf("Contacts<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -157,14 +156,14 @@ void do_iconbar(void) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/dotgoto?room=Notes\" "
 			"TITLE=\"Go to your personal notes\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/note.gif\"><BR>");
+			"SRC=\"/static/note.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Notes<BR>");
+			wprintf("Notes<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -173,29 +172,29 @@ void do_iconbar(void) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/dotgoto?room=Tasks\" "
 			"TITLE=\"Go to your personal task list\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/vcalendar.gif\"><BR>");
+			"SRC=\"/static/vcalendar.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Tasks<BR>");
+			wprintf("Tasks<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
 
 	if (ib_rooms) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
-			"<A HREF=\"/knrooms\" TITLE=\"Shows a list of all "
-			"Rooms that you have access to\" TARGET=\"workspace\">"
+			"<A HREF=\"/knrooms\" TITLE=\"List all of your "
+			"accessible rooms\" >"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/rooms-icon.gif\"><BR>");
+			"SRC=\"/static/rooms-icon.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Rooms<BR>");
+			wprintf("Rooms<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -203,14 +202,14 @@ void do_iconbar(void) {
 	if (ib_users) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
 			"<A HREF=\"/whobbs\" TITLE=\"See who is online right now\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/users-icon.gif\"><BR>");
+			"SRC=\"/static/users-icon.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Users<BR>");
+			wprintf("Users<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -225,10 +224,10 @@ void do_iconbar(void) {
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/chat-icon.gif\"><BR>");
+			"SRC=\"/static/chat-icon.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Chat<BR>");
+			wprintf("Chat<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -238,29 +237,29 @@ void do_iconbar(void) {
 			"<A HREF=\"/display_main_menu\" "
 			"TITLE=\"Advanced Options Menu: Advanced Room commands, "
 			"Account Info, and Chat\" "
-			"TARGET=\"workspace\">"
+			">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 			wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/advanced-icon.gif\"><BR>");
+			"SRC=\"/static/advanced-icon.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Advanced options<BR>");
+			wprintf("Advanced options<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
 
 	if (ib_logoff) {
 		wprintf("<SPAN CLASS=\"iconbar_link\"><P>"
-			"<A HREF=\"/termquit\" TITLE=\"Log off\" TARGET=\"_top\" "
+			"<A HREF=\"/termquit\" TITLE=\"Log off\" "
 			"onClick=\"return confirm('Log off now?');\">"
 		);
 		if (ib_displayas != IB_TEXTONLY) {
 		wprintf("<IMG BORDER=\"0\" WIDTH=\"32\" HEIGHT=\"32\" "
-			"SRC=\"/static/exit-icon.gif\"><BR>");
+			"SRC=\"/static/exit-icon.gif\"><br />");
 		}
 		if (ib_displayas != IB_PICONLY) {
-			wprintf("Log off<BR>");
+			wprintf("Log off<br />");
 		}
 		wprintf("</A></P></SPAN>\n");
 	}
@@ -269,25 +268,24 @@ void do_iconbar(void) {
 		"<SPAN CLASS=\"customize\"><P>"
 		"<A HREF=\"/display_customize_iconbar\" "
 		"TITLE=\"Customize this menu\" "
-		"TARGET=\"workspace\">customize this menu</A>"
+		">customize this menu</A>"
 		"</P></SPAN>\n"
 	);
 
 	if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
 		"<SPAN CLASS=\"powered_by\"><P>"
-		"<A HREF=\"http://uncensored.citadel.org/citadel\" "
-		"TITLE=\"Find out more about Citadel\" TARGET=\"aboutcit\" "
+		"<A HREF=\"http://www.citadel.org\" "
+		"title=\"Find out more about Citadel\" target=\"aboutcit\" "
 		"onMouseOver=\"window.status='Find out more about "
-		"Citadel'; return true;\">powered by<BR><IMG "
+		"Citadel'; return true;\">powered by<br /><IMG "
 		"BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/citadel-logo.gif\" ALT=\"CITADEL\">"
-		"<BR>CITADEL</A>"
+		"<br />CITADEL</A>"
 		"</P></SPAN>\n"
 	);
 
 	wprintf("</CENTER>\n");
 	do_template("endbox");
-	wDumpContent(2);
 }
 
 
@@ -342,7 +340,7 @@ void display_customize_iconbar(void) {
 		if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
 	}
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 	svprintf("BOXTITLE", WCS_STRING, "Customize the icon bar");
 	do_template("beginbox");
 
@@ -359,11 +357,11 @@ void display_customize_iconbar(void) {
 		if (i == IB_TEXTONLY) wprintf("text only");
 		wprintf("\n");
 	}
-	wprintf("<BR><BR>\n");
+	wprintf("<br /><br />\n");
 
 	wprintf("Select the icons you would like to see displayed "
 		"in the &quot;icon bar&quot; menu on the left side of the "
-		"screen.</CENTER><BR>\n"
+		"screen.</CENTER><br />\n"
 	);
 
 	wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
@@ -374,7 +372,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/image&name=hello\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Site logo</B><BR>"
+		"<B>Site logo</B><br />"
 		"A graphic describing this site"
 		"</TD></TR>\n",
 		(ib_logo ? "CHECKED" : "")
@@ -386,7 +384,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/summary.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Summary</B><BR>"
+		"<B>Summary</B><br />"
 		"Your summary page"
 		"</TD></TR>\n",
 		(ib_summary ? "CHECKED" : "")
@@ -398,7 +396,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/mail.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Mail (inbox)</B><BR>"
+		"<B>Mail (inbox)</B><br />"
 		"A shortcut to your e-mail Inbox."
 		"</TD></TR>\n",
 		(ib_inbox ? "CHECKED" : "")
@@ -411,7 +409,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/vcard.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Contacts</B><BR>"
+		"<B>Contacts</B><br />"
 		"Your personal address book."
 		"</TD></TR>\n",
 		(ib_contacts ? "CHECKED" : "")
@@ -424,7 +422,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/note.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Notes</B><BR>"
+		"<B>Notes</B><br />"
 		"Your personal notes."
 		"</TD></TR>\n",
 		(ib_notes ? "CHECKED" : "")
@@ -438,7 +436,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Calendar</B><BR>"
+		"<B>Calendar</B><br />"
 		"A shortcut to your personal calendar."
 		"</TD></TR>\n",
 		(ib_calendar ? "CHECKED" : "")
@@ -450,7 +448,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/vcalendar.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Tasks</B><BR>"
+		"<B>Tasks</B><br />"
 		"A shortcut to your personal task list."
 		"</TD></TR>\n",
 		(ib_tasks ? "CHECKED" : "")
@@ -463,7 +461,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/rooms-icon.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Rooms</B><BR>"
+		"<B>Rooms</B><br />"
 		"Clicking this icon displays a list of all accesible "
 		"rooms (or folders) available."
 		"</TD></TR>\n",
@@ -476,7 +474,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/users-icon.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Users</B><BR>"
+		"<B>Users</B><br />"
 		"Clicking this icon displays a list of all users "
 		"currently logged in."
 		"</TD></TR>\n",
@@ -489,7 +487,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/chat-icon.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Chat</B><BR>"
+		"<B>Chat</B><br />"
 		"Clicking this icon enters real-time chat mode "
 		"with other users in the same room."
 		"</TD></TR>\n",
@@ -503,7 +501,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Advanced options</B><BR>"
+		"<B>Advanced options</B><br />"
 		"Access to the complete menu of Citadel functions."
 		"</TD></TR>\n",
 		(ib_advanced ? "CHECKED" : "")
@@ -516,7 +514,7 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/exit-icon.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Log off</B><BR>"
+		"<B>Log off</B><br />"
 		"Exit from the Citadel system.  If you remove this icon "
 		"then you will have no way out!"
 		"</TD></TR>\n",
@@ -529,13 +527,13 @@ void display_customize_iconbar(void) {
 		"<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
 		"SRC=\"/static/citadel-logo.gif\" ALT=\"&nbsp;\">"
 		"</TD><TD>"
-		"<B>Citadel logo</B><BR>"
+		"<B>Citadel logo</B><br />"
 		"Displays the &quot;Powered by Citadel&quot; graphic"
 		"</TD></TR>\n",
 		(ib_citadel ? "CHECKED" : "")
 	);
 
-	wprintf("</TABLE><BR>\n"
+	wprintf("</TABLE><br />\n"
 		"<CENTER>"
 		"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
 		"&nbsp;"
@@ -587,11 +585,10 @@ void commit_iconbar(void) {
 
 	set_preference("iconbar", iconbar);
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 	do_template("beginbox_nt");
 	wprintf(
-		"<IMG SRC=\"/static/advanced-icon.gif\" "
-		"onLoad=\"javascript:top['iconbarframe'].location.reload();\">"
+		"<IMG SRC=\"/static/advanced-icon.gif\">"
 		"&nbsp;"
 		"Your icon bar has been updated.  Please select any of its "
 		"choices to continue.\n"
diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index fb6063193..139af319e 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -81,10 +81,12 @@ void display_inetconf(void)
 	}
 	ic_misc = strdup("");
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Internet configuration</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	serv_printf("CONF GETSYS|application/x-citadel-internet-config");
 	serv_gets(buf);
@@ -121,7 +123,7 @@ void display_inetconf(void)
 		do_template("beginbox");
 		wprintf("<span class=\"menudesc\">");
 		escputs(ic_desc[which]);
-		wprintf("</span><br>");
+		wprintf("</span><br />");
 		wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
 		if (strlen(ic_spec[which]) > 0) {
 			for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
diff --git a/webcit/listsub.c b/webcit/listsub.c
index 0d79857af..961e253a6 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -51,7 +51,7 @@ void do_listsub(void)
 	wprintf("<CENTER>"
 		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
 		"<SPAN CLASS=\"titlebar\">List subscribe/unsubscribe</SPAN>\n"
-		"</TD></TR></TABLE><BR>\n"
+		"</TD></TR></TABLE><br />\n"
 	);
 
 	/*
@@ -77,16 +77,16 @@ void do_listsub(void)
 				"your subscription.  This extra step is for "
 				"your protection, as it prevents others from "
 				"being able to subscribe you to lists "
-				"without your consent.<BR><BR>"
+				"without your consent.<br /><br />"
 				"Please click on the link which is being "
 				"e-mailed to you and your subscription will "
-				"be confirmed.<BR>\n"
+				"be confirmed.<br />\n"
 				"<A HREF=\"/listsub\">Back...</A></CENTER>\n"
 			);
 		}
 		else {
 			wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
-				"</FONT><BR><BR>\n",
+				"</FONT><br /><br />\n",
 				&buf[4]);
 			goto FORM;
 		}
@@ -114,16 +114,16 @@ void do_listsub(void)
 				"your unsubscription.  This extra step is for "
 				"your protection, as it prevents others from "
 				"being able to unsubscribe you from "
-				"lists without your consent.<BR><BR>"
+				"lists without your consent.<br /><br />"
 				"Please click on the link which is being "
 				"e-mailed to you and your unsubscription will "
-				"be confirmed.<BR>\n"
+				"be confirmed.<br />\n"
 				"<A HREF=\"/listsub\">Back...</A></CENTER>\n"
 			);
 		}
 		else {
 			wprintf("<FONT SIZE=+1><B>ERROR: %s</B>"
-				"</FONT><BR><BR>\n",
+				"</FONT><br /><br />\n",
 				&buf[4]);
 			goto FORM;
 		}
@@ -154,7 +154,7 @@ void do_listsub(void)
 				"The error returned by the server was: "
 			);
 		}
-		wprintf("%s</CENTER><BR>\n", &buf[4]);
+		wprintf("%s</CENTER><br />\n", &buf[4]);
 	}
 
 	/*
@@ -199,7 +199,7 @@ FORM:		wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
 			"VALUE=\"list\">One message at a time&nbsp; "
 			"<INPUT TYPE=\"radio\" NAME=\"subtype\""
 			"VALUE=\"digest\" CHECKED>Digest format&nbsp; "
-			"<BR>\n"
+			"<br />\n"
 			"<INPUT TYPE=\"submit\" NAME=\"cmd\""
 			" VALUE=\"subscribe\">\n"
 			"<INPUT TYPE=\"submit\" NAME=\"cmd\""
@@ -207,12 +207,12 @@ FORM:		wprintf("<FORM METHOD=\"GET\" ACTION=\"/listsub\">\n"
 			"</FORM>\n"
 		);
 
-		wprintf("<BR>When you attempt to subscribe or unsubscribe to "
+		wprintf("<br />When you attempt to subscribe or unsubscribe to "
 			"a mailing list, you will receive an e-mail containing"
 			" one additional web link to click on for final "
 			"confirmation.  This extra step is for your "
 			"protection, as it prevents others from being able to "
-			"subscribe or unsubscribe you to lists.<BR>\n"
+			"subscribe or unsubscribe you to lists.<br />\n"
 		);
 
 	}
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index f93b90b0a..5a9e0d74d 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -31,7 +31,7 @@
  */
 void display_main_menu(void)
 {
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	wprintf("<TABLE WIDTH=100%%>"
 		"<TR><TD COLSPAN=2>\n");
@@ -46,32 +46,32 @@ void display_main_menu(void)
 
 	wprintf("<A HREF=\"/knrooms\">"
 		"<span class=\"mainmenu\">"
-		"List known rooms</span></A><BR>"
+		"List known rooms</span></A><br />"
 		"<span class=\"menudesc\">"
-		"Where can I go from here?</span><BR>\n"
+		"Where can I go from here?</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/gotonext\">"
 		"<span class=\"mainmenu\">"
-		"Goto next room</span></A><BR>"
+		"Goto next room</span></A><br />"
 		"<span class=\"menudesc\">"
 		"...with <EM>unread</EM> messages"
-		"</span><BR>\n"
+		"</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/skip\">"
 		"<span class=\"mainmenu\">"
-		"Skip to next room</span></a><BR>"
+		"Skip to next room</span></a><br />"
 		"<span class=\"menudesc\">"
 		"(come back here later)"
 		"</span>\n"
 	);
 
 	if ((strlen(WC->ugname) > 0) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
-		wprintf("<BR>"
+		wprintf("<br />"
 			"<A HREF=\"/ungoto\">"
 			"<span class=\"mainmenu\">"
-			"Ungoto</span></A><BR>"
+			"Ungoto</span></A><br />"
 			"<span class=\"menudesc\">"
 			"(oops! Back to %s)"
 			"</span>\n", WC->ugname
@@ -82,21 +82,21 @@ void display_main_menu(void)
 
 	wprintf("<A HREF=\"/readnew\">"
 		"<span class=\"mainmenu\">"
-		"Read new messages</span></A><BR>"
+		"Read new messages</span></A><br />"
 		"<span class=\"menudesc\">"
-		"...in this room</span><BR>\n"
+		"...in this room</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/readfwd\">"
 		"<span class=\"mainmenu\">"
-		"Read all messages</span></A><BR>"
+		"Read all messages</span></A><br />"
 		"<span class=\"menudesc\">"
-		"...old <EM>and</EM> new</span><BR>\n"
+		"...old <EM>and</EM> new</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/display_enter\">"
 		"<span class=\"mainmenu\">"
-		"Enter a message</span></A><BR>"
+		"Enter a message</span></A><br />"
 		"<span class=\"menudesc\">"
 		"(post in this room)</span>\n"
 	);
@@ -105,21 +105,21 @@ void display_main_menu(void)
 
 	wprintf("<A HREF=\"/summary\">"
 		"<span class=\"mainmenu\">"
-		"Summary page</span></A><BR>"
+		"Summary page</span></A><br />"
 		"<span class=\"menudesc\">"
-		"Summary of my account</span><BR>\n"
+		"Summary of my account</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/userlist\">\n"
 		"<span class=\"mainmenu\">"
-		"User list</span></A><BR>"
+		"User list</span></A><br />"
 		"<span class=\"menudesc\">"
-		"(all registered users)</span><BR>\n"
+		"(all registered users)</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"/termquit\" TARGET=\"_top\">"
 		"<span class=\"mainmenu\">"
-		"Log off</span></A><BR>"
+		"Log off</span></A><br />"
 		"<span class=\"menudesc\">"
 		"Bye!</span>\n"
 	);
@@ -138,7 +138,7 @@ void display_main_menu(void)
 		"Who is online?</span></A>"
 		"<span class=\"menudesc\">"
 		" (users <EM>currently</EM> logged on)"
-		"</span><BR>\n"
+		"</span><br />\n"
 	);
 
 	wprintf("<A HREF=\"#\" onClick=\"window.open('/chat', "
@@ -150,7 +150,7 @@ void display_main_menu(void)
 		"Chat with other users in <i>"
 	);
 	escputs(WC->wc_roomname);
-	wprintf("</i></span></A><BR>\n");
+	wprintf("</i></span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_generic\">\n");
 	wprintf("<span class=\"menudesc\">"
@@ -167,18 +167,18 @@ void display_main_menu(void)
 		"<span class=\"mainmenu\">"
 		"Update your contact information "
 		"</span><span class=\"menudesc\">"
-		"(name, address, etc.)</span></A><BR>\n");
+		"(name, address, etc.)</span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_changepw\">"
 		"<span class=\"mainmenu\">"
-		"Change your password</span></A><BR>\n");
+		"Change your password</span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_editbio\">"
 		"<span class=\"mainmenu\">"
 		"Enter your 'bio' "
 		"</span><span class=\"menudesc\">"
 		"(a few words about yourself)"
-		"</span></A><BR>\n");
+		"</span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_editpic\">"
 		"<span class=\"mainmenu\">"
@@ -194,25 +194,25 @@ void display_main_menu(void)
 	if ((WC->axlevel >= 6) || (WC->is_room_aide)) {
 		wprintf("<A HREF=\"/display_editroom\">"
 			"<span class=\"mainmenu\">"
-			"Edit or delete this room</span></A><BR>\n");
+			"Edit or delete this room</span></A><br />\n");
 	}
 
 	wprintf("<A HREF=\"/display_private\">"
 		"<span class=\"mainmenu\">"
-		"Go to a &quot;hidden&quot; room</span></A><BR>\n");
+		"Go to a &quot;hidden&quot; room</span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_entroom\">"
 		"<span class=\"mainmenu\">"
-		"Create a new room</span></A><BR>\n");
+		"Create a new room</span></A><br />\n");
 
 	wprintf("<A HREF=\"/display_zap\">"
 		"<span class=\"mainmenu\">"
-		"Zap (forget) this room (%s)</span></A><BR>\n",
+		"Zap (forget) this room (%s)</span></A><br />\n",
 		WC->wc_roomname);
 
         wprintf("<A HREF=\"/display_whok\">\n"
 		"<span class=\"mainmenu\">"
-        	"Access controls for this room</span></A><BR>\n");
+        	"Access controls for this room</span></A><br />\n");
 
 	wprintf("<A HREF=\"/zapped_list\">"
 		"<span class=\"mainmenu\">"
@@ -231,31 +231,31 @@ void display_main_menu(void)
 			"Edit site-wide configuration</span></A>\n");
 
 		if (WC->axlevel >= 6) {
-			wprintf("<BR>"
+			wprintf("<br />"
 				"<A HREF=\"/select_user_to_edit\">"
 				"<span class=\"mainmenu\">"
 				"Add, change, delete user accounts"
-				"</span></A><BR>\n");
+				"</span></A><br />\n");
 
 			wprintf("<A HREF=\"/validate\">"
 				"<span class=\"mainmenu\">"
-				"Validate new users</span></A><BR>\n");
+				"Validate new users</span></A><br />\n");
 
 			wprintf("<A HREF=\"/display_floorconfig\">"
 				"<span class=\"mainmenu\">"
 				"Add, change, or delete floors"
-				"</span></A><BR>\n");
+				"</span></A><br />\n");
 
 			wprintf("<A HREF=\"/display_netconf\">"
 				"<span class=\"mainmenu\">"
 				"Configure networking with other systems"
-				"</span></A><BR>\n");
+				"</span></A><br />\n");
 
 			wprintf("<A HREF=\"/display_inetconf\">"
 				"<span class=\"mainmenu\">"
 				"Internet configuration "
 				"</span><span class=\"menudesc\">"
-				"(domain names, etc.)</span></A><BR>\n");
+				"(domain names, etc.)</span></A><br />\n");
 		}
 		do_template("endbox");
 	}
@@ -272,7 +272,7 @@ void display_main_menu(void)
  */
 void display_generic(void)
 {
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Enter a server command");
 	do_template("beginbox");
@@ -280,21 +280,21 @@ void display_generic(void)
 	wprintf("<CENTER>");
 	wprintf("This screen allows you to enter Citadel server commands which are\n");
 	wprintf("not supported by WebCit.  If you do not know what that means,\n");
-	wprintf("then this screen will not be of much use to you.<BR>\n");
+	wprintf("then this screen will not be of much use to you.<br />\n");
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_generic\">\n");
 
-	wprintf("Enter command:<BR>\n");
-	wprintf("<INPUT TYPE=\"text\" NAME=\"g_cmd\" SIZE=80 MAXLENGTH=\"250\"><BR>\n");
+	wprintf("Enter command:<br />\n");
+	wprintf("<INPUT TYPE=\"text\" NAME=\"g_cmd\" SIZE=80 MAXLENGTH=\"250\"><br />\n");
 
-	wprintf("Command input (if requesting SEND_LISTING transfer mode):<BR>\n");
-	wprintf("<TEXTAREA NAME=\"g_input\" ROWS=10 COLS=80 WIDTH=80></TEXTAREA><BR>\n");
+	wprintf("Command input (if requesting SEND_LISTING transfer mode):<br />\n");
+	wprintf("<TEXTAREA NAME=\"g_input\" ROWS=10 COLS=80 WIDTH=80></TEXTAREA><br />\n");
 
 	wprintf("<FONT SIZE=-2>Detected host header is http://%s</FONT>\n",
 		WC->http_host);
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send command\">");
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
 
 	wprintf("</FORM></CENTER>\n");
 	do_template("endbox");
@@ -313,7 +313,7 @@ void do_generic(void)
 		return;
 	}
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	serv_printf("%s", bstr("g_cmd"));
 	serv_gets(buf);
@@ -325,7 +325,7 @@ void do_generic(void)
 	escputs(bstr("g_cmd"));
 	wprintf("</TT></TD></TR><TR><TD>Result:</TD><TD><TT>");
 	escputs(buf);
-	wprintf("</TT></TD></TR></TABLE><BR>\n");
+	wprintf("</TT></TD></TR></TABLE><br />\n");
 
 	if (buf[0] == '8') {
 		serv_printf("\n\n000");
@@ -333,7 +333,7 @@ void do_generic(void)
 	if ((buf[0] == '1') || (buf[0] == '8')) {
 		while (serv_gets(gcontent), strcmp(gcontent, "000")) {
 			escputs(gcontent);
-			wprintf("<BR>\n");
+			wprintf("<br />\n");
 		}
 		wprintf("000");
 	}
@@ -354,8 +354,8 @@ void do_generic(void)
 		serv_write(junk, len);
 		free(junk);
 	}
-	wprintf("<HR>");
-	wprintf("<A HREF=\"/display_generic\">Enter another command</A><BR>\n");
+	wprintf("<hr />");
+	wprintf("<A HREF=\"/display_generic\">Enter another command</A><br />\n");
 	wprintf("<A HREF=\"/display_advanced\">Return to menu</A>\n");
 	do_template("endbox");
 	wDumpContent(1);
@@ -372,7 +372,7 @@ void do_generic(void)
 void display_menubar(int as_single_page) {
 
 	if (as_single_page) {
-		output_headers(0);
+		output_headers(0, 0, 0, 0, 0, 0, 0);
 		wprintf("<HTML>\n"
 			"<HEAD>\n"
 			"<TITLE>MenuBar</TITLE>\n"
diff --git a/webcit/messages.c b/webcit/messages.c
index ffe4a20f6..5030cb2fa 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -206,7 +206,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
 			}
 	
 			else if (!strcasecmp(firsttoken, "email")) {
-				if (strlen(mailto) > 0) strcat(mailto, "<BR>");
+				if (strlen(mailto) > 0) strcat(mailto, "<br />");
 				strcat(mailto,
 					"<A HREF=\"/display_enter"
 					"?force_room=_MAIL_&recp=");
@@ -216,7 +216,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
 				strcat(mailto, "</A>");
 			}
 			else if (!strcasecmp(firsttoken, "tel")) {
-				if (strlen(phone) > 0) strcat(phone, "<BR>");
+				if (strlen(phone) > 0) strcat(phone, "<br />");
 				strcat(phone, thisvalue);
 				for (j=0; j<num_tokens(thisname, ';'); ++j) {
 					extract_token(buf, thisname, j, ';');
@@ -242,7 +242,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
 						extract_token(buf, thisvalue, j, ';');
 						if (strlen(buf) > 0) {
 							escputs(buf);
-							wprintf("<BR>");
+							wprintf("<br />");
 						}
 					}
 					wprintf("</TD></TR>\n");
@@ -364,7 +364,7 @@ void read_message(long msgnum) {
 	serv_printf("MSG4 %ld", msgnum);
 	serv_gets(buf);
 	if (buf[0] != '1') {
-		wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
+		wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
 		return;
 	}
 
@@ -381,7 +381,7 @@ void read_message(long msgnum) {
 
 	while (serv_gets(buf), strcasecmp(buf, "text")) {
 		if (!strcmp(buf, "000")) {
-			wprintf("<I>unexpected end of message</I><BR><BR>\n");
+			wprintf("<I>unexpected end of message</I><br /><br />\n");
 			wprintf("</SPAN>\n");
 			return;
 		}
@@ -447,7 +447,7 @@ void read_message(long msgnum) {
 					"TARGET=\"wc.%ld.%s\">"
 					"<IMG SRC=\"/static/attachment.gif\" "
 					"BORDER=0 ALIGN=MIDDLE>\n"
-					"Part %s: %s (%s, %d bytes)</A><BR>\n",
+					"Part %s: %s (%s, %d bytes)</A><br />\n",
 					msgnum, mime_partnum,
 					msgnum, mime_partnum,
 					mime_partnum, mime_filename,
@@ -500,7 +500,7 @@ void read_message(long msgnum) {
 
 	wprintf("</SPAN>");
 	if (strlen(m_subject) > 0) {
-		wprintf("<BR>"
+		wprintf("<br />"
 			"<SPAN CLASS=\"message_subject\">"
 			"Subject: %s"
 			"</SPAN>", m_subject
@@ -549,7 +549,7 @@ void read_message(long msgnum) {
 	strcpy(mime_content_type, "text/plain");
 	while (serv_gets(buf), (strlen(buf) > 0)) {
 		if (!strcmp(buf, "000")) {
-			wprintf("<I>unexpected end of message</I><BR><BR>\n");
+			wprintf("<I>unexpected end of message</I><br /><br />\n");
 			goto ENDBODY;
 		}
 		if (!strncasecmp(buf, "Content-type: ", 14)) {
@@ -582,9 +582,9 @@ void read_message(long msgnum) {
 			wprintf("<TT>");
 			url(buf);
 			escputs(buf);
-			wprintf("</TT><BR>\n");
+			wprintf("</TT><br />\n");
 		}
-		wprintf("</I><BR>");
+		wprintf("</I><br />");
 	}
 
 	else /* HTML is fun, but we've got to strip it first */
@@ -594,7 +594,7 @@ void read_message(long msgnum) {
 
 	/* Unknown weirdness */
 	else {
-		wprintf("I don't know how to display %s<BR>\n",
+		wprintf("I don't know how to display %s<br />\n",
 			mime_content_type);
 		while (serv_gets(buf), strcmp(buf, "000")) { }
 	}
@@ -642,7 +642,7 @@ ENDBODY:
 	wprintf("</TD></TR></TABLE>\n");
 
 	/* end everythingamundo table */
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE><br />\n");
 }
 
 
@@ -950,7 +950,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 			wprintf("</B>\n");
 		}
 	}
-	wprintf("<BR>\n");
+	wprintf("<br />\n");
 
 	wprintf("<TABLE border=0 cellspacing=0 "
 		"cellpadding=3 width=100%%>\n"
@@ -1000,7 +1000,7 @@ int load_msg_ptrs(char *servcmd)
 	serv_puts(servcmd);
 	serv_gets(buf);
 	if (buf[0] != '1') {
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		return (nummsgs);
 	}
 	while (serv_gets(buf), strcmp(buf, "000")) {
@@ -1049,7 +1049,7 @@ void readloop(char *oper)
 	is_summary = atoi(bstr("summary"));
 	if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
 
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	/* When in summary mode, always show ALL messages instead of just
 	 * new or old.  Otherwise, show what the user asked for.
@@ -1544,7 +1544,7 @@ void display_enter(void)
 #endif
 
 	/* Otherwise proceed normally */
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 	sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
 	serv_puts(buf);
 	serv_gets(buf);
@@ -1552,7 +1552,7 @@ void display_enter(void)
 	if (!strncmp(buf, "570", 3)) {
 		if (strlen(bstr("recp")) > 0) {
 			svprintf("RECPERROR", WCS_STRING,
-				"<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+				"<SPAN CLASS=\"errormsg\">%s</SPAN><br />\n",
 				&buf[4]
 			);
 		}
@@ -1560,7 +1560,7 @@ void display_enter(void)
 		goto DONE;
 	}
 	if (buf[0] != '2') {
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		goto DONE;
 	}
 
@@ -1604,12 +1604,12 @@ void display_enter(void)
 	wprintf("<TD ALIGN=RIGHT>");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
 		"&nbsp;"
-		"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+		"<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
 	wprintf("</TD></TR></TABLE>\n");
 
-	wprintf("<SCRIPT language=\"JavaScript\" type=\"text/javascript\" "
-		"src=\"static/richtext_compressed.js\"></SCRIPT>\n"
-		"<SCRIPT language=\"JavaScript\" type=\"text/javascript\">\n"
+	wprintf("<script language=\"JavaScript\" type=\"text/javascript\" "
+		"src=\"static/richtext.js\"></script>\n"
+		"<script language=\"JavaScript\" type=\"text/javascript\">\n"
 		"function submitForm() { \n"
 		"  updateRTE('msgtext'); \n"
 		"  return true; \n"
@@ -1617,8 +1617,8 @@ void display_enter(void)
 		"  \n"
 		"initRTE(\"static/\", \"static/\", \"\"); \n"
 		"</script> \n"
-		"<noscript>JAVASCRIPT MUST BE ENABLED.</noscript> \n"
-		"<SCRIPT language=\"javascript\" type=\"text/javascript\"> \n"
+		"<noscript>JAVAscript MUST BE ENABLED.</noscript> \n"
+		"<script language=\"javascript\" type=\"text/javascript\"> \n"
 		"writeRichText('msgtext', '");
 	msgescputs(bstr("msgtext"));
 	wprintf("', '100%%', 200, true, false); \n"
@@ -1630,7 +1630,7 @@ void display_enter(void)
 	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
 		"WIDTH=80>");
 	escputs(bstr("msgtext"));
-	wprintf("</TEXTAREA><BR>\n");
+	wprintf("</TEXTAREA><br />\n");
  */
 
 	/* Enumerate any attachments which are already in place... */
@@ -1638,7 +1638,7 @@ void display_enter(void)
 		wprintf("<IMG SRC=\"/static/attachment.gif\" "
 			"BORDER=0 ALIGN=MIDDLE> Attachment: ");
 		escputs(att->filename);
-		wprintf(" (%s, %d bytes)<BR>\n",
+		wprintf(" (%s, %d bytes)<br />\n",
 			att->content_type, att->length);
 	}
 
@@ -1667,12 +1667,12 @@ void delete_msg(void)
 
 	msgid = atol(bstr("msgid"));
 
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	sprintf(buf, "DELE %ld", msgid);
 	serv_puts(buf);
 	serv_gets(buf);
-	wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+	wprintf("<EM>%s</EM><br />\n", &buf[4]);
 
 	wDumpContent(1);
 }
@@ -1691,7 +1691,7 @@ void confirm_move_msg(void)
 
 	msgid = atol(bstr("msgid"));
 
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<FONT SIZE=+1 COLOR=\"#FFFFFF\"");
@@ -1700,7 +1700,7 @@ void confirm_move_msg(void)
 
 	wprintf("<CENTER>");
 
-	wprintf("Move this message to:<BR>\n");
+	wprintf("Move this message to:<br />\n");
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\n");
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
@@ -1719,7 +1719,7 @@ void confirm_move_msg(void)
 		}
 	}
 	wprintf("</SELECT>\n");
-	wprintf("<BR>\n");
+	wprintf("<br />\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
 	wprintf("&nbsp;");
@@ -1739,15 +1739,15 @@ void move_msg(void)
 
 	msgid = atol(bstr("msgid"));
 
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	if (!strcasecmp(bstr("yesno"), "Move")) {
 		sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
 		serv_puts(buf);
 		serv_gets(buf);
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 	} else {
-		wprintf("<EM>Message not moved.</EM><BR>\n");
+		wprintf("<EM>Message not moved.</EM><br />\n");
 	}
 
 	wDumpContent(1);
diff --git a/webcit/netconf.c b/webcit/netconf.c
index 0f5e017e1..29274d622 100644
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -76,10 +76,12 @@ void edit_node(void) {
 
 void display_add_node(void)
 {
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Add new node</SPAN>");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_node\">\n");
 	wprintf("<CENTER><TABLE border=0>\n");
@@ -91,7 +93,7 @@ void display_add_node(void)
 	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"64\"></TD></TR>\n");
 	wprintf("<TR><TD>Port</TD>");
 	wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" MAXLENGTH=\"8\"></TD></TR>\n");
-	wprintf("</TABLE><BR>");
+	wprintf("</TABLE><br />");
        	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
 	wprintf("&nbsp;");
        	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -111,12 +113,14 @@ void display_edit_node(void)
 
 	strcpy(node, bstr("node"));
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Edit node configuration for ");
 	escputs(node);
 	wprintf("</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	serv_puts("CONF getsys|application/x-citadel-ignet-config");
 	serv_gets(buf);
@@ -138,7 +142,7 @@ void display_edit_node(void)
 				wprintf("<TD><INPUT TYPE=\"text\" NAME=\"host\" MAXLENGTH=\"64\" VALUE=\"%s\"></TD></TR>\n", chost);
 				wprintf("<TR><TD>Port</TD>");
 				wprintf("<TD><INPUT TYPE=\"text\" NAME=\"port\" MAXLENGTH=\"8\" VALUE=\"%s\"></TD></TR>\n", cport);
-				wprintf("</TABLE><BR>");
+				wprintf("</TABLE><br />");
         			wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
 				wprintf("&nbsp;");
         			wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -149,7 +153,7 @@ void display_edit_node(void)
 	}
 
 	else {		/* command error getting configuration */
-		wprintf("%s<BR>\n", &buf[4]);
+		wprintf("%s<br />\n", &buf[4]);
 	}
 
 	wDumpContent(1);
@@ -162,14 +166,16 @@ void display_netconf(void)
 	char buf[SIZ];
 	char node[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Network configuration</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	wprintf("<CENTER>");
 	wprintf("<A HREF=\"/display_add_node\">");
-	wprintf("Add a new node</A><BR>\n");
+	wprintf("Add a new node</A><br />\n");
 	wprintf("</CENTER>");
 
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
@@ -202,19 +208,21 @@ void display_confirm_delete_node(void)
 {
 	char node[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Confirm delete</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	strcpy(node, bstr("node"));
 	wprintf("<CENTER>Are you sure you want to delete <FONT SIZE=+1>");
 	escputs(node);
-	wprintf("</FONT>?<BR>\n");
+	wprintf("</FONT>?<br />\n");
 	wprintf("<A HREF=\"/delete_node&node=");
 	urlescputs(node);
 	wprintf("\">Yes</A>&nbsp;&nbsp;&nbsp;");
-	wprintf("<A HREF=\"/display_netconf\">No</A><BR>\n");
+	wprintf("<A HREF=\"/display_netconf\">No</A><br />\n");
 	wDumpContent(1);
 }
 
@@ -271,7 +279,7 @@ void add_node(void)
 		serv_puts(buf);
 		serv_gets(buf);
 		if (buf[0] == '1') {
-			output_headers(3);
+			output_headers(1, 1, 0, 0, 0, 0, 0);
 			server_to_text();
 			wprintf("<A HREF=\"/display_netconf\">Back to menu</A>\n");
 			wDumpContent(1);
diff --git a/webcit/notes.c b/webcit/notes.c
index 2e6d7ce09..295272114 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -35,7 +35,7 @@ void display_note(long msgnum) {
 	serv_printf("MSG0 %ld", msgnum);
 	serv_gets(buf);
 	if (buf[0] != '1') {
-		wprintf("%s<BR>\n", &buf[4]);
+		wprintf("%s<br />\n", &buf[4]);
 		return;
 	}
 
@@ -60,5 +60,5 @@ void display_note(long msgnum) {
 
 	/* Make it HTML-happy and print it. */
 	stresc(display_notetext, notetext, 1, 1);
-	wprintf("%s<BR>\n", display_notetext);
+	wprintf("%s<br />\n", display_notetext);
 }
diff --git a/webcit/paging.c b/webcit/paging.c
index 6730bab50..fe4a9141b 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -36,7 +36,7 @@ void display_page(void)
 
 	strcpy(recp, bstr("recp"));
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Page: %s", recp);
 	do_template("beginbox");
@@ -53,15 +53,15 @@ void display_page(void)
 	escputs(bstr("closewin"));
 	wprintf("\">\n");
 
-	wprintf("Enter message text:<BR>");
+	wprintf("Enter message text:<br />");
 
 	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=5 COLS=40 "
 		"WIDTH=40></TEXTAREA>\n");
 
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE><br />\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Send message\">");
-	wprintf("<BR><A HREF=\"javascript:window.close();\"Cancel</A>\n");
+	wprintf("<br /><A HREF=\"javascript:window.close();\"Cancel</A>\n");
 
 	wprintf("</FORM></CENTER>\n");
 	do_template("endbox");
@@ -78,14 +78,14 @@ void page_user(void)
 	char buf[SIZ];
 	char closewin[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	strcpy(recp, bstr("recp"));
 	strcpy(sc, bstr("sc"));
 	strcpy(closewin, bstr("closewin"));
 
 	if (strcmp(sc, "Send message")) {
-		wprintf("<EM>Message was not sent.</EM><BR>\n");
+		wprintf("<EM>Message was not sent.</EM><br />\n");
 	} else {
 		serv_printf("SEXP %s|-", recp);
 		serv_gets(buf);
@@ -95,10 +95,10 @@ void page_user(void)
 			serv_puts("000");
 			wprintf("<EM>Message has been sent to ");
 			escputs(recp);
-			wprintf(".</EM><BR>\n");
+			wprintf(".</EM><br />\n");
 		}
 		else {
-			wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+			wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		}
 	}
 	
@@ -151,8 +151,8 @@ void page_popup(void)
 	char buf[SIZ];
 	char pagefrom[SIZ];
 
-	/* suppress express message check, do headers but no frames */
-	output_headers(0x08 | 0x03);
+	/* suppress express message check, do headers but no banner */
+	output_headers(1, 1, 0, 0, 0, 1, 0);
 
 	while (serv_puts("GEXP"), serv_gets(buf), buf[0]=='1') {
 
@@ -260,16 +260,16 @@ void chat_recv(void) {
 	char cl_text[SIZ];
 	char *output_data = NULL;
 
-	output_headers(0);
+	output_headers(0, 0, 0, 0, 0, 0, 0);
 
 	wprintf("Content-type: text/html\n");
 	wprintf("\n");
-	wprintf("<HTML>\n"
-		"<HEAD>\n"
-		"<META HTTP-EQUIV=\"refresh\" CONTENT=\"3\">\n"
-		"</HEAD>\n"
+	wprintf("<html>\n"
+		"<head>\n"
+		"<meta http-equiv=\"refresh\" content=\"3\" />\n"
+		"</head>\n"
 
-		"<BODY BGCOLOR=\"#FFFFFF\">\n"
+		"<body bgcolor=\"#FFFFFF\">\n"
 	);
 
 	if (setup_chat_socket() != 0) {
@@ -406,7 +406,7 @@ void chat_send(void) {
 	char send_this[SIZ];
 	char buf[SIZ];
 
-	output_headers(0);
+	output_headers(0, 0, 0, 0, 0, 0, 0);
 	wprintf("Content-type: text/html\n");
 	wprintf("\n");
 	wprintf("<HTML>"
@@ -471,7 +471,7 @@ void chat_send(void) {
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/chat_send\" NAME=\"chatsendform\">\n");
 	wprintf("<INPUT TYPE=\"text\" SIZE=\"80\" MAXLENGTH=\"%d\" "
 		"NAME=\"send_this\">\n", SIZ-10);
-	wprintf("<BR>");
+	wprintf("<br />");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Send\">\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"Help\">\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sendbutton\" VALUE=\"List Users\">\n");
diff --git a/webcit/roomops.c b/webcit/roomops.c
index 385cece19..fe30c138c 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -221,14 +221,14 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
 	do_template("beginbox");
 
 	listrms("LZRM -1");
 
-	wprintf("<BR><BR>\n");
+	wprintf("<br /><br />\n");
 	wprintf("Click on any room to un-zap it and goto that room.\n");
 	do_template("endbox");
 	wDumpContent(1);
@@ -282,7 +282,7 @@ void embed_newmail_button(void) {
 			"<A HREF=\"/dotgoto?room=_MAIL_\">"
 			"<IMG SRC=\"/static/mail.gif\" border=0 "
 			"ALT=\"You have new mail\">"
-			"<BR><SPAN CLASS=\"youhavemail\">"
+			"<br /><SPAN CLASS=\"youhavemail\">"
 			"%d new mail</SPAN></A>", WC->new_mail);
 		WC->remember_new_mail = WC->new_mail;
 	}
@@ -357,7 +357,6 @@ void embed_room_banner(char *got) {
 	svcallback("YOUHAVEMAIL", embed_newmail_button);
 	svcallback("VIEWOMATIC", embed_view_o_matic);
 	svcallback("START", offer_start_page);
-
 	do_template("roombanner");
 }
 
@@ -533,7 +532,7 @@ void slrp_highest(void)
 	serv_puts("SLRP HIGHEST");
 	serv_gets(buf);
 	if (buf[0] != '2') {
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		return;
 	}
 }
@@ -674,10 +673,10 @@ void display_editroom(void)
 	er_flags = extract_int(&buf[4], 3);
 	er_floor = extract_int(&buf[4], 4);
 
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 
 	/* print the tabbed dialog */
-	wprintf("<BR><TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
+	wprintf("<br /><TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
 		"<TR ALIGN=CENTER>"
 		"<TD>&nbsp;</TD>\n");
 
@@ -965,7 +964,7 @@ void display_editroom(void)
 		}
 
 		/* Display the stuff */
-		wprintf("<CENTER><BR>"
+		wprintf("<CENTER><br />"
 			"<TABLE border=1 cellpadding=5><TR>"
 			"<TD><B><I>Shared with</I></B></TD>"
 			"<TD><B><I>Not shared with</I></B></TD></TR>\n"
@@ -1051,7 +1050,7 @@ void display_editroom(void)
 
 		wprintf("</TABLE>\n");
 		wprintf("</TD></TR>"
-			"</TABLE></CENTER><BR>\n"
+			"</TABLE></CENTER><br />\n"
 			"<I><B>Notes:</B><UL><LI>When sharing a room, "
 			"it must be shared from both ends.  Adding a node to "
 			"the 'shared' list sends messages out, but in order to"
@@ -1061,7 +1060,7 @@ void display_editroom(void)
 			"that the room name is identical on the remote node."
 			"<LI>If the remote room name is different, the remote "
 			"node must also configure the name of the room here."
-			"</UL></I><BR>\n"
+			"</UL></I><br />\n"
 		);
 
 	}
@@ -1069,14 +1068,14 @@ void display_editroom(void)
 	/* Mailing list management */
 	if (!strcmp(tab, "listserv")) {
 
-		wprintf("<BR><center>"
+		wprintf("<br /><center>"
 			"<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
 			"<TR><TD VALIGN=TOP>");
 
 		wprintf("<i>The contents of this room are being "
 			"mailed <b>as individual messages</b> "
 			"to the following list recipients:"
-			"</i><br><br>\n");
+			"</i><br /><br />\n");
 
 		serv_puts("GNET");
 		serv_gets(buf);
@@ -1089,11 +1088,11 @@ void display_editroom(void)
 				wprintf(" <A HREF=\"/netedit&cmd=remove&line="
 					"listrecp|");
 				urlescputs(recp);
-				wprintf("&tab=listserv\">(remove)</A><BR>");
+				wprintf("&tab=listserv\">(remove)</A><br />");
 
 			}
 		}
-		wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
+		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
 			"<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
 			"<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
@@ -1105,7 +1104,7 @@ void display_editroom(void)
 		wprintf("<i>The contents of this room are being "
 			"mailed <b>in digest form</b> "
 			"to the following list recipients:"
-			"</i><br><br>\n");
+			"</i><br /><br />\n");
 
 		serv_puts("GNET");
 		serv_gets(buf);
@@ -1118,27 +1117,27 @@ void display_editroom(void)
 				wprintf(" <A HREF=\"/netedit&cmd=remove&line="
 					"digestrecp|");
 				urlescputs(recp);
-				wprintf("&tab=listserv\">(remove)</A><BR>");
+				wprintf("&tab=listserv\">(remove)</A><br />");
 
 			}
 		}
-		wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
+		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
 			"<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
 			"<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
 		wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
 		wprintf("</FORM>\n");
 		
-		wprintf("</TD></TR></TABLE><HR>\n");
+		wprintf("</TD></TR></TABLE><hr />\n");
 
 		if (self_service(999) == 1) {
 			wprintf("This room is configured to allow "
 				"self-service subscribe/unsubscribe requests."
 				" <A HREF=\"/toggle_self_service?newval=0&"
 				"tab=listserv\">"
-				"Click to disable.</A><BR>\n"
+				"Click to disable.</A><br />\n"
 				"The URL for subscribe/unsubscribe is: "
-				"<TT>http://%s/listsub</TT><BR>\n",
+				"<TT>http://%s/listsub</TT><br />\n",
 				WC->http_host
 			);
 		}
@@ -1147,7 +1146,7 @@ void display_editroom(void)
 				"self-service subscribe/unsubscribe requests."
 				" <A HREF=\"/toggle_self_service?newval=1&"
 				"tab=listserv\">"
-				"Click to enable.</A><BR>\n"
+				"Click to enable.</A><br />\n"
 			);
 		}
 
@@ -1173,51 +1172,51 @@ void display_editroom(void)
 			floorvalue = extract_int(&buf[4], 1);
 		}
 		
-		wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/set_room_policy\">\n");
+		wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/set_room_policy\">\n");
 		wprintf("<TABLE border=0 cellspacing=5>\n");
-		wprintf("<TR><TD>Message expire policy for this room<BR>(");
+		wprintf("<TR><TD>Message expire policy for this room<br />(");
 		escputs(WC->wc_roomname);
 		wprintf(")</TD><TD>");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
 			((roompolicy == 0) ? "CHECKED" : "") );
-		wprintf("Use the default policy for this floor<BR>\n");
+		wprintf("Use the default policy for this floor<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
 			((roompolicy == 1) ? "CHECKED" : "") );
-		wprintf("Never automatically expire messages<BR>\n");
+		wprintf("Never automatically expire messages<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
 			((roompolicy == 2) ? "CHECKED" : "") );
-		wprintf("Expire by message count<BR>\n");
+		wprintf("Expire by message count<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
 			((roompolicy == 3) ? "CHECKED" : "") );
-		wprintf("Expire by message age<BR>");
+		wprintf("Expire by message age<br />");
 		wprintf("Number of messages or days: ");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
 		wprintf("</TD></TR>\n");
 
 		if (WC->axlevel >= 6) {
-			wprintf("<TR><TD COLSPAN=2><HR></TD></TR>\n");
-			wprintf("<TR><TD>Message expire policy for this floor<BR>(");
+			wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
+			wprintf("<TR><TD>Message expire policy for this floor<br />(");
 			escputs(floorlist[WC->wc_floor]);
 			wprintf(")</TD><TD>");
 			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
 				((floorpolicy == 0) ? "CHECKED" : "") );
-			wprintf("Use the system default<BR>\n");
+			wprintf("Use the system default<br />\n");
 			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
 				((floorpolicy == 1) ? "CHECKED" : "") );
-			wprintf("Never automatically expire messages<BR>\n");
+			wprintf("Never automatically expire messages<br />\n");
 			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
 				((floorpolicy == 2) ? "CHECKED" : "") );
-			wprintf("Expire by message count<BR>\n");
+			wprintf("Expire by message count<br />\n");
 			wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
 				((floorpolicy == 3) ? "CHECKED" : "") );
-			wprintf("Expire by message age<BR>");
+			wprintf("Expire by message age<br />");
 			wprintf("Number of messages or days: ");
 			wprintf("<INPUT TYPE=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
 				floorvalue);
 		}
 
 		wprintf("<CENTER>\n");
-		wprintf("<TR><TD COLSPAN=2><HR><CENTER>\n");
+		wprintf("<TR><TD COLSPAN=2><hr /><CENTER>\n");
 		wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
 		wprintf("&nbsp;");
 		wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -1456,7 +1455,7 @@ void display_whok(void)
                 }
         }
         
-        output_headers(1);
+        output_headers(1, 1, 1, 0, 0, 0, 0);
 	stresc(buf, WC->wc_roomname, 1, 1);
 	svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf);
 	do_template("beginbox");
@@ -1464,7 +1463,7 @@ void display_whok(void)
 	wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP>"
 		"<TD>The users listed below have access to this room.  "
 		"To remove a user from the access list, select the user "
-		"name from the list and click 'Kick'.<BR><BR>");
+		"name from the list and click 'Kick'.<br /><br />");
 	
         wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/display_whok\">\n");
         wprintf("<SELECT NAME=\"username\" SIZE=10>\n");
@@ -1478,18 +1477,18 @@ void display_whok(void)
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><BR>\n");
+        wprintf("</SELECT><br />\n");
 
         wprintf("<input type=submit name=sc value=\"Kick\">");
         wprintf("</FORM></CENTER>\n");
 
 	wprintf("</TD><TD>"
 		"To grant another user access to this room, enter the "
-		"user name in the box below and click 'Invite'.<BR><BR>");
+		"user name in the box below and click 'Invite'.<br /><br />");
 
         wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/display_whok\">\n");
         wprintf("Invite: ");
-        wprintf("<input type=text name=username><BR>\n"
+        wprintf("<input type=text name=username><br />\n"
         	"<input type=hidden name=sc value=\"Invite\">"
         	"<input type=submit value=\"Invite\">"
 		"</FORM></CENTER>\n");
@@ -1517,7 +1516,7 @@ void display_entroom(void)
 		display_main_menu();
 		return;
 	}
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 	svprintf("BOXTITLE", WCS_STRING, "Create a new room");
 	do_template("beginbox");
 
@@ -1572,7 +1571,7 @@ void display_entroom(void)
 	wprintf("&nbsp;");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
 	wprintf("</CENTER>\n");
-	wprintf("</FORM>\n<HR>");
+	wprintf("</FORM>\n<hr />");
 	serv_printf("MESG roomaccess");
 	serv_gets(buf);
 	if (buf[0] == '1') {
@@ -1676,18 +1675,18 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
 	do_template("beginbox");
 
 	wprintf("<CENTER>\n");
-	wprintf("<BR>If you know the name of a hidden (guess-name) or\n");
+	wprintf("<br />If you know the name of a hidden (guess-name) or\n");
 	wprintf("passworded room, you can enter that room by typing\n");
 	wprintf("its name below.  Once you gain access to a private\n");
 	wprintf("room, it will appear in your regular room listings\n");
 	wprintf("so you don't have to keep returning here.\n");
-	wprintf("<BR><BR>");
+	wprintf("<br /><br />");
 
 	wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
 
@@ -1703,7 +1702,7 @@ void display_private(char *rname, int req_pass)
 		wprintf("Enter room password:</TD><TD>");
 		wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
 	}
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE><br />\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
 		"&nbsp;"
@@ -1741,7 +1740,7 @@ void goto_private(void)
 		display_private(bstr("gr_name"), 1);
 		return;
 	}
-	output_headers(1);
+	output_headers(1, 1, 1, 0, 0, 0, 0);
 	wprintf("%s\n", &buf[4]);
 	wDumpContent(1);
 	return;
@@ -1753,15 +1752,17 @@ void goto_private(void)
  */
 void display_zap(void)
 {
-	output_headers(1);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
 
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">Zap (forget) the current room</SPAN>\n");
+	wprintf("<SPAN CLASS=\"titlebar\">Zap (forget/unsubscribe) the current room</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	wprintf("If you select this option, <em>%s</em> will ", WC->wc_roomname);
 	wprintf("disappear from your room list.  Is this what you wish ");
-	wprintf("to do?<BR>\n");
+	wprintf("to do?<br />\n");
 
 	wprintf("<FORM METHOD=\"GET\" ACTION=\"/zap\">\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
@@ -1820,17 +1821,19 @@ void confirm_delete_room(void)
 		display_main_menu();
 		return;
 	}
-	output_headers(1);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">Confirm deletion of room</SPAN>\n");
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	wprintf("<CENTER>");
 	wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
 
 	wprintf("Are you sure you want to delete <FONT SIZE=+1>");
 	escputs(WC->wc_roomname);
-	wprintf("</FONT>?<BR>\n");
+	wprintf("</FONT>?<br />\n");
 
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -2113,7 +2116,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
 	/* Outer table (for columnization) */
 	wprintf("<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
-		"<TR><TD VALIGN=TOP>");
+		"<tr><td valign=top width=33%%>");
 
 	levels = 0;
 	oldlevels = 0;
@@ -2130,7 +2133,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 			if ((num_boxes % boxes_per_column) == 0) {
 				++current_column;
 				if (current_column < columns) {
-					wprintf("</TD><TD VALIGN=TOP>\n");
+					wprintf("</td><td valign=top width=33%%>\n");
 				}
 			}
 		}
@@ -2176,7 +2179,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 			if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
 				wprintf(" (INBOX)");
 			}
-			wprintf("<BR>\n");
+			wprintf("<br />\n");
 		}
 	}
 	/* End the final inner box */
@@ -2278,6 +2281,14 @@ void list_all_rooms_by_floor(char *viewpref) {
 		}
 	}
 
+/* test only hackish view 
+	wprintf("<table><TR><TD>A Table</TD></TR></table>\n");
+	for (i=0; i<max_folders; ++i) {
+		escputs(fold[i].name);
+		wprintf("<br />\n");
+	}
+ */
+
 	if (!strcasecmp(viewpref, "folders")) {
 		do_folder_view(fold, max_folders, num_floors);
 	}
@@ -2296,7 +2307,7 @@ void list_all_rooms_by_floor(char *viewpref) {
 void knrooms() {
 	char listviewpref[SIZ];
 
-	output_headers(3);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
 	load_floorlist();
 
 	/* Determine whether the user is trying to change views */
@@ -2314,7 +2325,8 @@ void knrooms() {
 	}
 
 	/* title bar */
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+	wprintf("<div id=\"banner\">\n"
+		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
 		"<SPAN CLASS=\"titlebar\">"
 	);
 	if (!strcasecmp(listviewpref, "rooms")) {
@@ -2328,7 +2340,6 @@ void knrooms() {
 	}
 	wprintf("</SPAN></TD>\n");
 
-
 	/* offer the ability to switch views */
 	wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
 		"<SELECT NAME=\"newview\" SIZE=\"1\" "
@@ -2347,9 +2358,11 @@ void knrooms() {
 		( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
 	);
 
-	wprintf("</SELECT><BR>");
+	wprintf("</SELECT><br />");
 	offer_start_page();
 	wprintf("</FORM></TD></TR></TABLE>\n");
+	wprintf("</div>\n"
+		"<div id=\"text\">\n");
 
 	/* Display the room list in the user's preferred format */
 	list_all_rooms_by_floor(listviewpref);
@@ -2375,7 +2388,7 @@ void set_room_policy(void) {
 	strcpy(WC->ImportantMessage, &buf[4]);
 
 	if (WC->axlevel >= 6) {
-		strcat(WC->ImportantMessage, "<BR>\n");
+		strcat(WC->ImportantMessage, "<br />\n");
 		serv_printf("SPEX floor|%d|%d", atoi(bstr("floorpolicy")), atoi(bstr("floorvalue")));
 		serv_gets(buf);
 		strcat(WC->ImportantMessage, &buf[4]);
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 65a661434..055deb540 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -132,11 +132,11 @@ void fmout(FILE *fp, char *align)
 		if (!strcmp(buf, "000")) {
 			if (bq == 1)
 				wprintf("</I>");
-			wprintf("</DIV><BR>\n");
+			wprintf("</DIV><br />\n");
 			return;
 		}
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wprintf("<BR>");
+			wprintf("<br />");
 		}
 		intext = 1;
 
@@ -188,7 +188,7 @@ void text_to_server(char *ptr, int convert_to_html)
 			serv_puts(buf);
 			strcpy(buf, "");
 			if (convert_to_html) {
-				strcat(buf, "<BR>");
+				strcat(buf, "<br />");
 			}
 			else {
 				if (ptr[pos] != 0) strcat(buf, " ");
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index bd78bb120..3c8b000bf 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -41,12 +41,12 @@ void display_siteconfig(void)
 	int mboxpolicy = 0;
 	int mboxvalue = 0;
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	whichmenu = bstr("whichmenu");
 
 	svprintf("BOXTITLE", WCS_STRING, "Site configuration");
-	do_template("beginbox");
+	do_template("beginbox_nt");
 
 	if (!strcmp(whichmenu, "")) {
 		wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
@@ -57,7 +57,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=general\">"
-			"<B>General</B><BR>"
+			"<B>General</B><br />"
 			"General site configuration items"
 			"</A></TD></TR>\n"
 		);
@@ -68,7 +68,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=access\">"
-			"<B>Access</B><BR>"
+			"<B>Access</B><br />"
 			"Access controls and site policy settings"
 			"</A></TD></TR>\n"
 		);
@@ -79,7 +79,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=network\">"
-			"<B>Network</B><BR>"
+			"<B>Network</B><br />"
 			"Network services"
 			"</A></TD></TR>\n"
 		);
@@ -90,7 +90,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=tuning\">"
-			"<B>Tuning</B><BR>"
+			"<B>Tuning</B><br />"
 			"Advanced server fine-tuning controls"
 			"</A></TD></TR>\n"
 		);
@@ -101,7 +101,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=ldap\">"
-			"<B>Directory</B><BR>"
+			"<B>Directory</B><br />"
 			"Configure the LDAP connector for Citadel"
 			"</A></TD></TR>\n"
 		);
@@ -112,7 +112,7 @@ void display_siteconfig(void)
 			"SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
 			"</TD><TD>"
 			"<A HREF=\"/display_siteconfig?whichmenu=purger\">"
-			"<B>Auto-purger</B><BR>"
+			"<B>Auto-purger</B><br />"
 			"Configure automatic expiry of old messages"
 			"</A></TD></TR>\n"
 		);
@@ -159,8 +159,8 @@ void display_siteconfig(void)
 	if (buf[0] != '1') {
         	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
         	wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
-        	wprintf("</TD></TR></TABLE><BR>\n");
-        	wprintf("%s<BR>\n", &buf[4]);
+        	wprintf("</TD></TR></TABLE><br />\n");
+        	wprintf("%s<br />\n", &buf[4]);
 		do_template("endbox");
 		wDumpContent(1);
 		return;
@@ -577,42 +577,42 @@ void display_siteconfig(void)
 
 	if (!strcasecmp(whichmenu, "purger")) {
 
-		wprintf("<TR><TD COLSPAN=2><HR></TD></TR>\n");
+		wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
 
 		wprintf("<TR><TD>Default message expire policy for public rooms</TD><TD>");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"sitepolicy\" VALUE=\"1\" %s>",
 			((sitepolicy == 1) ? "CHECKED" : "") );
-		wprintf("Never automatically expire messages<BR>\n");
+		wprintf("Never automatically expire messages<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"sitepolicy\" VALUE=\"2\" %s>",
 			((sitepolicy == 2) ? "CHECKED" : "") );
-		wprintf("Expire by message count<BR>\n");
+		wprintf("Expire by message count<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"sitepolicy\" VALUE=\"3\" %s>",
 			((sitepolicy == 3) ? "CHECKED" : "") );
-		wprintf("Expire by message age<BR>");
+		wprintf("Expire by message age<br />");
 		wprintf("Number of messages or days: ");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"sitevalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", sitevalue);
 		wprintf("</TD></TR>\n");
 
-		wprintf("<TR><TD COLSPAN=2><HR></TD></TR>\n");
+		wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
 
 		wprintf("<TR><TD>Default message expire policy for private mailboxes</TD><TD>");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"mboxpolicy\" VALUE=\"0\" %s>",
 			((mboxpolicy == 0) ? "CHECKED" : "") );
-		wprintf("Same policy as public rooms<BR>\n");
+		wprintf("Same policy as public rooms<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"mboxpolicy\" VALUE=\"1\" %s>",
 			((mboxpolicy == 1) ? "CHECKED" : "") );
-		wprintf("Never automatically expire messages<BR>\n");
+		wprintf("Never automatically expire messages<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"mboxpolicy\" VALUE=\"2\" %s>",
 			((mboxpolicy == 2) ? "CHECKED" : "") );
-		wprintf("Expire by message count<BR>\n");
+		wprintf("Expire by message count<br />\n");
 		wprintf("<INPUT TYPE=\"radio\" NAME=\"mboxpolicy\" VALUE=\"3\" %s>",
 			((mboxpolicy == 3) ? "CHECKED" : "") );
-		wprintf("Expire by message age<BR>");
+		wprintf("Expire by message age<br />");
 		wprintf("Number of messages or days: ");
 		wprintf("<INPUT TYPE=\"text\" NAME=\"mboxvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", mboxvalue);
 		wprintf("</TD></TR>\n");
 
-		wprintf("<TR><TD COLSPAN=2><HR></TD></TR>\n");
+		wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
 
 	}
 	else {
diff --git a/webcit/static/background.html b/webcit/static/background.html
index e878ca51b..3d5c5e2bc 100644
--- a/webcit/static/background.html
+++ b/webcit/static/background.html
@@ -2,6 +2,6 @@
      dynamically generated pages
  -->
 
-<BODY
+<body
 <?EXTRABODYPARMS>
 >
diff --git a/webcit/static/beginbox.html b/webcit/static/beginbox.html
index b7c48626d..60cfba697 100644
--- a/webcit/static/beginbox.html
+++ b/webcit/static/beginbox.html
@@ -1,10 +1,4 @@
-<table cellpadding=0 cellspacing=0 border=0>
-<tr height=10>
-<td valign="top"><img src="static/upperleftcorner.gif"></td>
-<td bgcolor="#204b78" align=center width="100%">
-<SPAN CLASS="boxlabel"><?BOXTITLE></SPAN></td>
-<td valign="top"><img src="static/upperrightcorner.gif"></td>
-</tr>
-<tr>
-<td BGCOLOR="#FFFFFF"> </td>
-<td BGCOLOR="#FFFFFF">
+<table border=1 cellspacing=0 cellpadding=0 width=100%><tr><td>
+<table border=0 cellspacing=0 cellpadding=3 width=100%>
+<tr bgcolor="#000088"><td align=center><span class="boxlabel"><?BOXTITLE></span></td></tr>
+<tr bgcolor="#FFFFFF"><td>
diff --git a/webcit/static/beginbox_nt.html b/webcit/static/beginbox_nt.html
index 02366d4d2..3c1700520 100644
--- a/webcit/static/beginbox_nt.html
+++ b/webcit/static/beginbox_nt.html
@@ -1,10 +1,3 @@
-<table cellpadding=0 cellspacing=0 border=0>
-<tr height=10>
-<td valign="top"><img src="static/upperleftcorner_nt.gif"></td>
-<td height=10 width="100%" bgcolor="#FFFFFF"> </TD>
-</td>
-<td valign="top"><img src="static/upperrightcorner_nt.gif"></td>
-</tr>
-<tr>
-<td bgcolor="#FFFFFF"> </TD>
-<TD BGCOLOR="#FFFFFF">
+<table border=1 cellspacing=0 cellpadding=0 width=100%><tr><td>
+<table border=0 cellspacing=0 cellpadding=3 width=100%>
+<tr><td bgcolor="#FFFFFF">
diff --git a/webcit/static/blankpage.html b/webcit/static/blankpage.html
deleted file mode 100644
index fb541d8b8..000000000
--- a/webcit/static/blankpage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<LINK REL="StyleSheet" HREF="/static/style.css" TYPE="text/css" MEDIA="screen">
-</HEAD>
-<BODY>
-&nbsp;
-</BODY>
-</HTML>
diff --git a/webcit/static/buttons.html b/webcit/static/buttons.html
deleted file mode 100644
index efc8740c8..000000000
--- a/webcit/static/buttons.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-
-<head>
-<title>Buttons test</title>
-
-<!--button mouseover script-->
-<script language="JavaScript" type="text/javascript">
-<!--
-if (document.images) {
-	// Active Images
-	img2on = new Image(); 
-	img2on.src = "zippy.gif";  
-
-	// Inactive images
-	img2off = new Image(); 
-	img2off.src = "marcellas.gif";  
-}
-            
-// Function to 'activate' images.
-function imgOn(imgName) {
-        if (document.images) {
-        	document[imgName].src = eval(imgName + "on.src");
-        }
-}
-
-// Function to 'deactivate' images.
-function imgOff(imgName) {
-	if (document.images) {
-		document[imgName].src = eval(imgName + "off.src");
-	}
-}
-
-
-
-//-->
-</script>
-
-</head>
-<body>
-
-<TABLE border>
-<TR>
-<TD>Button mouseover demo</TD>
-</TR>
-
-<TR>
-
-<td>
-	<a href="about:mozilla"
-	onmouseover="imgOn('img2')"
-	onmouseout="imgOff('img2')">
-	<img name="img2" src="marcellas.gif" width=100 height=50 border=0>
-</TD>
-
-</TR>
-
-</TABLE>
-
-
-
-</body>
-
-</html>
-
diff --git a/webcit/static/chatframeset.html b/webcit/static/chatframeset.html
index 7a03044a5..3f64b1727 100644
--- a/webcit/static/chatframeset.html
+++ b/webcit/static/chatframeset.html
@@ -1,31 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE>Real-time chat: <?ROOMNAME></TITLE>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-</HEAD>
+<html>
+<head>
+	<title>Real-time chat: <?ROOMNAME></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Language" content="en" />
+</head>
 
-<FRAMESET ROWS="*, 1, 70" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
+<frameset rows="*, 1, 70" framespacing="0" border="false" frameborder="0">
 
-	<FRAME NAME="chat_transcript" SRC="about:blank" SCROLLING="yes">
-	</FRAME>
+	<frame name="chat_transcript" src="about:blank" scrolling="yes">
+	</frame>
 
-	<FRAME NAME="chat_recv" SRC="/chat_recv" SCROLLING="no">
-	</FRAME>
+	<frame name="chat_recv" src="/chat_recv" scrolling="no">
+	</frame>
 
-	<FRAME NAME="chat_send" SRC="/chat_send" SCROLLING="no">
-	</FRAME>
+	<frame name="chat_send" src="/chat_send" scrolling="no">
+	</frame>
 
-</FRAMESET>
+</frameset>
 
-<BODY BGCOLOR="#FFFFFF" LINK="#FF0000">
+<body bgcolor="#ffffff" link="#ff0000">
 
-<NOFRAMES>
+<noframes>
 Sorry, web-based access to Citadel requires a browser that supports frames,
-such as <A HREF="http://www.netscape.com/communicator">Netscape</A> or
-<A HREF="http://www.mozilla.org">Mozilla</A>.  If you are using an older
+such as <a href="http://www.mozilla.org/products/firefox/">Firefox</a> or
+<a href="http://www.mozilla.org">Mozilla</a>.  If you are using an older
 browser, please upgrade now.
-</NOFRAMES>
+</noframes>
 
-</HTML>
+</html>
diff --git a/webcit/static/empty.html b/webcit/static/empty.html
index 7383a6907..df87876a5 100644
--- a/webcit/static/empty.html
+++ b/webcit/static/empty.html
@@ -1,9 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE>Empty Page</TITLE>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-</BODY>
-</HTML>
+<html>
+<head>
+	<title>Empty Page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+<body>
+</body>
+</html>
diff --git a/webcit/static/endbox.html b/webcit/static/endbox.html
index 796f18425..d6f4f83f3 100644
--- a/webcit/static/endbox.html
+++ b/webcit/static/endbox.html
@@ -1,10 +1,3 @@
-</td>
-<td bgcolor="#FFFFFF"> </td>
-</tr>
-<tr height=10>
-<td height=10 valign="bottom"><img src="static/lowerleftcorner.gif"></td>
-<td height=10 width="100%" BGCOLOR="#FFFFFF">
-<img src="static/blank.gif"></td>
-<td height=10 valign="bottom"><img src="static/lowerrightcorner.gif"></td>
-</tr></table>
-<font size=-3><BR></font>
+</td><tr></table>
+</td><tr></table>
+<br />
diff --git a/webcit/static/head.html b/webcit/static/head.html
index 7fbffbea1..a7565b15b 100644
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -1,13 +1,401 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE><?SERV_HUMANNODE> - Citadel</TITLE>
-	<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-	<META HTTP-EQUIV="expired" CONTENT="28-May-1971 18:10:00 GMT">
-	<META NAME="MSSmartTagsPreventParsing" CONTENT="TRUE">
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-	<LINK REL="StyleSheet" HREF="/static/style.css" TYPE="text/css" MEDIA="screen">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
 <?REFRESHTAG>
-</HEAD>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<title>Citadel: <?SERV_HUMANNODE></title>
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="expired" content="28-May-1971 18:10:00 GMT" />
+<meta name="MSSmartTagsPreventParsing" content="TRUE" />
+<style type="text/css">
+
+* html {
+	overflow:hidden;
+}
+
+body {
+	margin:0;
+	margin-right: 1px;
+	padding:0 10px 0 10px;
+	height:100%;
+	overflow:auto;
+	background: #aaaaaa;
+	color: #000000;
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-weight: normal;
+	font-size: 10pt;
+}
+
+#iconbar {
+	position:fixed;
+	display:block;
+	top:0px;
+	left:0px;
+	width:75px;
+	height:100%;
+	background:transparent;
+}
+
+* html #iconbar {
+	position:absolute;
+	display:block;
+	top:0px;
+	left:0px;
+	width:75px;
+	height:100%;
+	background:transparent;
+}
+
+#banner {
+	position:fixed;
+	display:block;
+	top:0px;
+	left:78px;
+	width:90%;
+	height:75px;
+	background: #444455;
+}
+
+* html #banner {
+	position:absolute;
+	display:block;
+	top:0px;
+	left:78px;
+	width: 90%;
+	height:75px;
+	background: #444455;
+}
+
+#text {
+	display:block;
+	margin-top: 78px;
+	margin-left:75px;
+	width:90%;
+}
+
+a:link {
+	color: #0000FF;
+	text-decoration: none;
+}
+
+a:visited {
+	color: #0000FF;
+	text-decoration: none;
+}
+
+a:active {
+	color: #0000FF;
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+.menubar_link {
+	font-family: "Bitstream Vera Sans",Tahoma,Arial,Helvetica,sans-serif;
+	font-size: 9pt;
+}
+
+.navbar_link {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 7pt;
+}
+
+.titlebar {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 12pt;
+	color: #FFFFEE;
+}
+
+.mainmenu {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	font-weight: bold;
+	color: #880000;
+}
+
+.menudesc {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 8pt;
+	color: #000088;
+}
+
+.message_header {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #000000;
+}
+
+.message_subject {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #000000;
+	font-style: italic;
+}
+
+.tablabel {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	font-weight: bold;
+	color: #000000;
+}
+
+.boxlabel {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 7pt;
+	font-weight: bold;
+	color: #FFFFEE;
+}
+
+.youhavemail {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 6pt;
+	font-style: italic;
+	color: #000044;
+}
+
+.customize {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 8pt;
+	font-style: italic;
+	color: #000044;
+	background-color: #DDDDCC;
+}
+
+.room_banner_room_name {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 14pt;
+	font-weight: bold;
+	color: #FFFFEE;
+}
+
+.room_banner_room_info {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #FFFFEE;
+}
+
+.room_banner_new_messages {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #DDDDCC;
+}
+
+.room_banner_start_page {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 7pt;
+	color: #DDDDCC;
+}
+
+.menubar_bg {
+	background-color: #FF0000;
+}
+
+.iconbar_link {
+	font-family: "Bitstream Vera Sans",Tahoma,Arial,Helvetica,sans-serif;
+	font-size: 7pt;
+}
+
+.powered_by {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 6pt;
+}
+
+.roomlist_floor {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 12pt;
+	font-weight: bold;
+	color: #000000;
+}
+
+.roomlist_new {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #880000;
+	font-weight: bold;
+}
+
+.roomlist_old {
+	font-family: "Bitstream Vera Sans",Arial,Helvetica,sans-serif;
+	font-size: 10pt;
+	color: #000088;
+}
+
+blockquote {
+  margin-left: 8%;
+  margin-right: 8%;
+  border: thin ridge #dc143c;
+}
+
+blockquote pre {
+  margin-left: 1%;
+  margin-right: 1%;
+}
+
+var sub {
+	font-style: normal;
+}
+
+.note {
+	font-size: 85%;
+	margin-left: 10%;
+}
+
+.toolbar {
+	text-align: center;
+}
+
+.toolbar IMG {
+	float: right;
+}
+
+.errormsg {
+	color: #AA0000;
+	background: none;
+	font-style: italic;
+}
+
+.warning {
+	color: #FF4500;
+	background: none;
+	text-decoration: none;
+}
+
+.error strong {
+	color: #DC143C;
+	background: #FFD700;
+	text-decoration: none;
+}
+
+.warning strong {
+	color: #FF4500;
+	background: #FFD700;
+	text-decoration: none;
+}
+
+.warning a:link, .warning a:visited, .warning a:active {
+	color: #FF4500;
+	background: none;
+	text-decoration: underline;
+}
+
+.error a:link, .error a:visited, .error a:active {
+	color: #DC143C;
+	background: none;
+	text-decoration: underline;
+}
+
+.error strong a:link, .error strong a:visited, .error strong a:active {
+	color: #DC143C;
+	background: #FFD700;
+}
+
+.warning strong a:link, .warning strong a:visited, .warning strong a:active {
+	color: #FF4500;
+	background: #FFD700;
+}
+
+colgroup.entity {
+	text-align: center;
+}
+
+.default {
+	text-decoration: underline;
+	font-style: normal;
+}
+
+.required {
+	font-weight: bold;
+}
+
+td li.transitional, .elements li.transitional {
+	font-weight: lighter;
+	color: #696969;
+	background: none;
+}
+
+td li.frameset, .elements li.frameset {
+	font-weight: lighter;
+	color: #808080;
+	background: none;
+}
+
+.footer, .checkedDocument {
+	margin-top: 2em;
+	padding-top: 1em;
+	border-top: solid thin black;
+}
+
+@media print {
+  input#toggler, .toolbar { display: none }
+}
+
+<!-- begin tree view styles -->
+
+#mainMenu {
+  background-color: #EEE;
+  border: 1px solid #CCC;
+  color: #000;
+  width: 203px;
+}
+
+#menuList {
+  margin: 0px;
+  padding: 10px 0px 10px 15px;
+}
+
+li.menubar {
+  background: url(/static/plus.gif) no-repeat 0em 0.3em;
+  font-size: 12px;
+  line-height: 1.5em;
+  list-style: none outside;
+}
+
+.menu, .submenu {
+  display: none;
+  margin-left: 15px;
+  padding: 0px;
+}
+
+.menu li, .submenu li {
+  background: url(/static/square.gif) no-repeat 0em 0.3em;
+  list-style: none outside;
+}
+
+a.actuator {
+  background-color: transparent;
+  color: #000;
+  font-size: 12px;
+  padding-left: 15px;
+  text-decoration: none;
+}
+
+a.actuator:hover {
+  text-decoration: underline;
+}
+
+.menu li a, .submenu li a {
+  background-color: transparent;
+  color: #000;
+  font-size: 12px;
+  padding-left: 15px;
+  text-decoration: none;
+}
+
+.menu li a:hover, submenu li a:hover {
+  /*border-bottom: 1px dashed #000;*/
+  text-decoration: underline;
+}
+
+span.key {
+  text-decoration: underline;
+}
+
+<!-- end tree view styles -->
+
+</style>
 <?PAGERSCRIPT>
+</head>
diff --git a/webcit/static/login.html b/webcit/static/login.html
index 7fc2a9aae..2a811a4b1 100644
--- a/webcit/static/login.html
+++ b/webcit/static/login.html
@@ -1,29 +1,29 @@
 <?=beginbox>
-<CENTER>
-<FONT COLOR="#FF0000"><?MESG></FONT>
-<TABLE border=0>
-<TR>
+<center>
+<font color="#FF0000"><?MESG></font>
+<table border=0>
+<tr>
 <td align=center>
 	<?HELLO>
 	<form action="/login" method="POST">
 
-	<table border="0" cellspacing="5" cellpadding="5" BGCOLOR="#EEEEEE">
-		<TR><TD>User name:</TD>
-		<TD><input type="text" name="name" maxlength="25"></TD></TR>
-		<TR><TD>Password:</TD>
-		<TD><input type="password" name="pass" maxlength="20"></TD></TR>
+	<table border="0" cellspacing="5" cellpadding="5" bgcolor="#EEEEEE">
+		<tr><td>User name:</td>
+		<td><input type="text" name="name" maxlength="25"></td></tr>
+		<tr><td>Password:</td>
+		<td><input type="password" name="pass" maxlength="20"></td></tr>
 
-	<TR><TD align=center COLSPAN=2>
+	<tr><td align=center colspan=2>
 	<input type="submit" name="action" value="Login">
 	<input type="submit" name="action" value="New User">
 	<input type="submit" name="action" value="Exit">
-	</TD></TR>
+	</td></tr>
 
-	</TABLE>
+	</table>
 	</form>
 
 	</td>
-	<td align="center"><P><IMG SRC="/image&name=hello"></p></TD>
+	<td align="center"><p><img src="/image&name=hello"></p></td>
 	</tr>
 	<tr>
 		<td colspan="2">
@@ -38,10 +38,10 @@
 		<i>cookies</i>.
 		<li>Also keep in mind that if your browser is
 		configured to block pop-up windows, you will not be able
-		to receive any instant messages.<br>
+		to receive any instant messages.<br />
 		</ul>
 		</td>
 </tr>
 </table>
-</CENTER>
+</center>
 <?=endbox>
diff --git a/webcit/static/lowerleftcorner.gif b/webcit/static/lowerleftcorner.gif
deleted file mode 100644
index 9438eb9cf..000000000
Binary files a/webcit/static/lowerleftcorner.gif and /dev/null differ
diff --git a/webcit/static/lowerrightcorner.gif b/webcit/static/lowerrightcorner.gif
deleted file mode 100644
index f84ac372a..000000000
Binary files a/webcit/static/lowerrightcorner.gif and /dev/null differ
diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
deleted file mode 100644
index d54b04c44..000000000
--- a/webcit/static/mainframeset.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE>Citadel</TITLE>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-</HEAD>
-
-<FRAMESET COLS="100, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
-	<FRAME NAME="iconbarframe" SRC="/iconbar" SCROLLING="no">
-	<FRAMESET ROWS="*, 45" FRAMESPACING=0 BORDER="FALSE" FRAMEBORDER="0">
-		<FRAME NAME="workspace" SRC="<?STARTPAGE>">
-		<FRAMESET COLS="*, 1" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">
-			<FRAME NAME="bottom" SRC="do_template?template=navbar" SCROLLING="no">
-			<FRAME NAME="ka" SRC="/blank" SCROLLING="no">
-		</FRAMESET>
-	</FRAMESET>
-</FRAMESET>
-
-<BODY BGCOLOR="#FFFFFF" LINK="#FF0000">
-
-<NOFRAMES>
-Sorry, web-based access to Citadel requires a browser that supports frames,
-such as <A HREF="http://www.netscape.com/communicator">Netscape</A> or
-<A HREF="http://www.mozilla.org">Mozilla</A>.  If you are using an older
-browser, please upgrade now.
-</NOFRAMES>
-
-</HTML>
diff --git a/webcit/static/menubar.html b/webcit/static/menubar.html
index 9b573ac63..1bce4f539 100644
--- a/webcit/static/menubar.html
+++ b/webcit/static/menubar.html
@@ -1,90 +1,90 @@
-<SCRIPT language="JavaScript">
+<script language="JavaScript">
 <!--hide
 	function OpenWholist() {
 		window.open('/whobbs', 'whobbs', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,height=200,width=600');
 	}
 //-->
-</SCRIPT>
+</script>
 
-<CENTER>
-<IMG SRC="/image&name=hello"><BR><BR>
+<center>
+<img src="/image&name=hello"><br /><br />
 
-<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2">
-<TR>
-	<TD CLASS="menubar_bg">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/knrooms"><FONT COLOR="#FFFFFF">List known rooms</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#3333CC">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/gotonext"><FONT COLOR="#FFFFFF">Goto next room</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#3333CC">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/skip"><FONT COLOR="#FFFFFF">Skip this room</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#3333CC">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/ungoto"><FONT COLOR="#FFFFFF">Ungoto</SPAN></A>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#003399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/readnew"><FONT COLOR="#FFFFFF">Read&nbsp;new&nbsp;messages</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#003399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/readfwd"><FONT COLOR="#FFFFFF">Read&nbsp;all&nbsp;messages</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#003399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/display_enter"><FONT COLOR="#FFFFFF">Enter&nbsp;a&nbsp;message</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#663399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="javascript:OpenWholist()">
-		<FONT COLOR="#FFFFFF">Who&nbsp;is&nbsp;online?</SPAN>
-		</A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#663399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/display_page"><FONT COLOR="#FFFFFF">Page&nbsp;another&nbsp;user</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#663399">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/advanced"><FONT COLOR="#FFFFFF">Advanced&nbsp;options</SPAN></A>
-		</SPAN>
-	</TD>
-</TR><TR>
-	<TD BGCOLOR="#CC0000">
-		<SPAN CLASS="menubar_link">
-		<A HREF="/termquit" TARGET="_top" onClick="return confirm('Do you really want to log off?');"><FONT COLOR="#FFFFFF">Log&nbsp;off</SPAN></A><BR>
-	</TD>
-</TR>
-</TABLE>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr>
+	<td class="menubar_bg">
+		<span class="menubar_link">
+		<a href="/knrooms"><font color="#FFFFFF">List known rooms</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#3333CC">
+		<span class="menubar_link">
+		<a href="/gotonext"><font coloR="#FFFFFF">Goto next room</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#3333CC">
+		<span class="menubar_link">
+		<a href="/skip"><font color="#FFFFFF">Skip this room</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#3333CC">
+		<span class="menubar_link">
+		<a href="/ungoto"><font color="#FFFFFF">Ungoto</span></a>
+	</td>
+</tr><tr>
+	<td bgcolor="#003399">
+		<span class="menubar_link">
+		<a href="/readnew"><font color="#FFFFFF">Read&nbsp;new&nbsp;messages</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#003399">
+		<span class="menubar_link">
+		<a href="/readfwd"><font color="#FFFFFF">Read&nbsp;all&nbsp;messages</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#003399">
+		<span class="menubar_link">
+		<a href="/display_enter"><font color="#FFFFFF">Enter&nbsp;a&nbsp;message</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#663399">
+		<span class="menubar_link">
+		<a href="javascript:OpenWholist()">
+		<font color="#FFFFFF">Who&nbsp;is&nbsp;online?</span>
+		</a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#663399">
+		<span class="menubar_link">
+		<a href="/display_page"><font color="#FFFFFF">Page&nbsp;another&nbsp;user</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#663399">
+		<span class="menubar_link">
+		<a href="/advanced"><font color="#FFFFFF">Advanced&nbsp;options</span></a>
+		</span>
+	</td>
+</tr><tr>
+	<td bgcolor="#CC0000">
+		<span class="menubar_link">
+		<a href="/termquit" target="_top" onClick="return confirm('Do you really want to log off?');"><font color="#FFFFFF">Log&nbsp;off</span></a><br />
+	</td>
+</tr>
+</table>
 
-<BR><BR>
+<br /><br />
 
-<A HREF="http://www.citadel.org" TARGET="aboutcit"
-	onMouseOver="window.status='Find out more about Citadel'; return true;"><FONT 
-SIZE=-1 COLOR="#000000">
-POWERED BY<BR></FONT>
-<IMG SRC="/static/citadel-logo.gif" WIDTH=75 HEIGHT=76 BORDER=0 ALT="CITADEL"></A>
+<a href="http://www.citadel.org" target="aboutcit"
+	onMouseOver="window.status='Find out more about Citadel'; return true;"><font 
+size=-1 color="#000000">
+POWERED BY<br /></font>
+<img src="/static/citadel-logo.gif" width=75 height=76 border=0 ALT="CITADEL"></a>
 
-</CENTER>
+</center>
diff --git a/webcit/static/navbar.html b/webcit/static/navbar.html
index f0ef9aa66..020197ae6 100644
--- a/webcit/static/navbar.html
+++ b/webcit/static/navbar.html
@@ -1,42 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-	<LINK REL="StyleSheet" HREF="/static/style.css" TYPE="text/css" MEDIA="screen">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Language" content="en" />
+	<link rel="StyleSheet" href="/static/style.css" type="text/css" media="screen">
+</head>
+<body bgcolor="#FFFFFF">
 
-<TABLE BGCOLOR="#FFFFFF" BORDER="0"
- CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-<TR>
-	<TD>
-		<A HREF="/ungoto" TARGET="workspace">
-		<IMG ALIGN="MIDDLE" SRC="/static/back.gif" BORDER="0">
-		<SPAN CLASS="navbar_link">Ungoto</SPAN></A>
-	</TD><TD>
-		<A HREF="/readnew" TARGET="workspace">
-		<IMG ALIGN="MIDDLE" SRC="/static/readmsgs.gif" BORDER="0">
-		<SPAN CLASS="navbar_link">New messages</SPAN></A>
-	</TD><TD>
-		<A HREF="/readfwd" TARGET="workspace">
-		<IMG ALIGN="MIDDLE" SRC="/static/readmsgs.gif" BORDER="0">
-		<SPAN CLASS="navbar_link">All messages</SPAN></A>
-	</TD><TD>
-		<A HREF="/display_enter" TARGET="workspace">
-		<IMG ALIGN="MIDDLE" SRC="/static/enter.gif" BORDER="0">
-		<SPAN CLASS="navbar_link">Enter a message</SPAN></A>
-	</TD><TD>
-		<A HREF="/skip" TARGET="workspace">
-		<SPAN CLASS="navbar_link">Skip this room</SPAN>
-		<IMG ALIGN="MIDDLE" SRC="/static/forward.gif" BORDER="0"></A>
-	</TD><TD>
-		<A HREF="/gotonext" TARGET="workspace">
-		<SPAN CLASS="navbar_link">Goto next room</SPAN>
-		<IMG ALIGN="MIDDLE" SRC="/static/forward.gif" BORDER="0"></A>
-	</TD>
-</TR>
-</TABLE>
+<table bgcolor="#FFFFFF" border="0"
+ cellspacing="0" cellpadding="0" width="100%">
+<tr>
+	<td>
+		<a href="/ungoto" target="workspace">
+		<img align="middle" src="/static/back.gif" border="0">
+		<span class="navbar_link">Ungoto</span></A>
+	</td><td>
+		<A HREF="/readnew" target="workspace">
+		<img align="middle" src="/static/readmsgs.gif" border="0">
+		<span class="navbar_link">New messages</span></A>
+	</td><td>
+		<A HREF="/readfwd" target="workspace">
+		<img align="middle" src="/static/readmsgs.gif" border="0">
+		<span class="navbar_link">All messages</span></A>
+	</td><td>
+		<A HREF="/display_enter" target="workspace">
+		<img align="middle" src="/static/enter.gif" border="0">
+		<span class="navbar_link">Enter a message</span></A>
+	</td><td>
+		<A HREF="/skip" target="workspace">
+		<span class="navbar_link">Skip this room</span>
+		<img align="middle" src="/static/forward.gif" border="0"></A>
+	</td><td>
+		<A HREF="/gotonext" target="workspace">
+		<span class="navbar_link">Goto next room</span>
+		<img align="middle" src="/static/forward.gif" border="0"></A>
+	</td>
+</tr>
+</table>
 
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/webcit/static/newstartpage.html b/webcit/static/newstartpage.html
index 75573cf4f..fec7e4d23 100644
--- a/webcit/static/newstartpage.html
+++ b/webcit/static/newstartpage.html
@@ -1,20 +1,20 @@
-<TABLE WIDTH="100%" BORDER="0" BGCOLOR="#444455">
-<TR>
-	<TD>
-		<FONT SIZE=+1 COLOR="#FFFFFF"
-		<B>New start page</B>
-		</FONT>
-	</TD>
-</TR>
-</TABLE>
+<table width="100%" border="0" bgcolor="#444455">
+<tr>
+	<td>
+		<font size=+1 color="#FFFFFF"
+		<b>New start page</b>
+		</font>
+	</td>
+</tr>
+</table>
 
-<CENTER>
+<center>
 <font size=+2>Your start page has been changed.</font>
-<BR><BR>
+<br /><br />
 
-<I>(Note: this does not change your browser's home page.
-It changes the page you begin on when you log on to <?SERV_HUMANNODE>).</I>
-<BR><BR>
+<i>(Note: this does not change your browser's home page.
+It changes the page you begin on when you log on to <?SERV_HUMANNODE>).</i>
+<br /><br />
 
 <a href="javascript:history.back()">Back...</a>
-</CENTER>
+</center>
diff --git a/webcit/static/nocookies.html b/webcit/static/nocookies.html
index 3b256da6f..e42e995e4 100644
--- a/webcit/static/nocookies.html
+++ b/webcit/static/nocookies.html
@@ -1,21 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE>Error</TITLE>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-</HEAD>
-<BODY>
+<html>
+<head>
+	<title>Error</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta http-equiv="Content-Language" content="en" />
+</head>
+<body>
 
-<CENTER>
-<H2>Sorry!</H2>
-<BR>
+<center>
+<h2>Sorry!</h2>
+<br />
 In order to access this system, you must use a web browser which supports
-&quot;cookies&quot; and have them turned on.<BR><BR>
+&quot;cookies&quot; and have them turned on.<br /><br />
 This software sends a cookie that is only used during your login session,
-and will not be saved to your disk.<BR><BR>
+and will not be saved to your disk.<br /><br />
 Please enable cookies and log in again.  We are sorry for the inconvenience.
-</CENTER>
+</center>
 
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/webcit/static/palette.htm b/webcit/static/palette.htm
index 14f5db738..835008bc2 100644
--- a/webcit/static/palette.htm
+++ b/webcit/static/palette.htm
@@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
 	<title>Text Color</title>
diff --git a/webcit/static/prompt_for_recipient.html b/webcit/static/prompt_for_recipient.html
index 79948daab..7ae834afd 100644
--- a/webcit/static/prompt_for_recipient.html
+++ b/webcit/static/prompt_for_recipient.html
@@ -1,21 +1,21 @@
-<TABLE WIDTH=100% BORDER=0 BGCOLOR="#444455">
-<TR><TD><SPAN CLASS="titlebar">
+<table width=100% border=0 bgcolor="#444455">
+<tr><td><span class="titlebar">
 Send private e-mail
-</SPAN></TD></TR></TABLE>
+</span></td></tr></table>
 
 <?=beginbox_nt>
 <?RECPERROR>
-<CENTER>
-<table border="0" cellspacing="5" cellpadding="5" BGCOLOR="#EEEEEE">
-<TR><TD>
-<FORM METHOD="POST" ACTION="/display_enter">
+<center>
+<table border="0" cellspacing="5" cellpadding="5" bgcolor="#EEEEEE">
+<tr><td>
+<form method="POST" action="/display_enter">
 Enter recipient(s):&nbsp;
-<INPUT TYPE="text" NAME="recp" MAXLENGTH="64"><BR><BR>
-<INPUT TYPE="submit" NAME="sc" VALUE="Enter message">
+<input type="text" name="recp" maxlength="64"><br /><br />
+<input type="submit" name="sc" value="Enter message">
 &nbsp;
-<INPUT TYPE="submit" NAME="sc" VALUE="Cancel">
-</FORM>
-<BR>
-</TD></TR></TABLE>
-</CENTER>
+<input type="submit" name="sc" value="Cancel">
+</form>
+<br />
+</td></tr></table>
+</center>
 <?=endbox>
diff --git a/webcit/static/roombanner.html b/webcit/static/roombanner.html
index 562d60f9e..89922ce6e 100644
--- a/webcit/static/roombanner.html
+++ b/webcit/static/roombanner.html
@@ -1,26 +1,26 @@
-<CENTER>
+<center>
 
-<TABLE WIDTH="100%" BORDER="0" CELLPADDING="3" CELLSPACING="0">
-<TR>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
 	<?ROOMPIC>
-	<TD ALIGN="LEFT" VALIGN="MIDDLE" BGCOLOR="#444455">
-		<SPAN CLASS="room_banner_room_name"><?ROOMNAME></SPAN>
-	</TD>
-	<TD ALIGN="LEFT" BGCOLOR="#444455">
-		<SPAN CLASS="room_banner_room_info"><?ROOMINFO></SPAN>
-	</TD>
-	<TD ALIGN="LEFT" VALIGN="TOP" BGCOLOR="#444455">
+	<td align="left" valign="middle" bgcolor="#444455">
+		<span class="room_banner_room_name"><?ROOMNAME></span>
+	</td>
+	<td align="left" bgcolor="#444455">
+		<span class="room_banner_room_info"><?ROOMINFO></span>
+	</td>
+	<td align="left" valign="top" bgcolor="#444455">
 		<?YOUHAVEMAIL>
-	</TD>
-	<TD ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#444455">
+	</td>
+	<td align="right" valign="top" bgcolor="#444455">
 		<?VIEWOMATIC>
-	</TD>
-	<TD ALIGN="RIGHT" VALIGN="TOP" BGCOLOR="#444455">
-		<SPAN CLASS="room_banner_new_messages"><?NEWMSGS> new of <?TOTALMSGS> messages</SPAN>
-		<BR>
-		<SPAN CLASS="room_banner_start_page"><?START></SPAN>
-	</TD>
-</TR>
-</TABLE>
+	</td>
+	<td align="right" valign="top" bgcolor="#444455">
+		<span class="room_banner_new_messages"><?NEWMSGS> new of <?TOTALMSGS> messages</span>
+		<br />
+		<span class="room_banner_start_page"><?START></span>
+	</td>
+</tr>
+</table>
 
-</CENTER>
+</center>
diff --git a/webcit/static/style.css b/webcit/static/style.css
deleted file mode 100644
index 12631e068..000000000
--- a/webcit/static/style.css
+++ /dev/null
@@ -1,404 +0,0 @@
-a:link {
-  color: #0000FF;
-  text-decoration: none;
-}
-
-a:visited {
-  color: #0000FF;
-  text-decoration: none;
-}
-
-a:active {
-  color: #0000FF;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-.menubar_link {
-	font-family: Bitstream Vera Sans,Tahoma,Arial,Helvetica,sans-serif;
-	font-size: 9pt;
-}
-
-.navbar_link {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 7pt;
-}
-
-.titlebar {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 12pt;
-	color: #FFFFEE;
-}
-
-.mainmenu {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	font-weight: bold;
-	color: #880000;
-}
-
-.menudesc {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 8pt;
-	color: #000088;
-}
-
-.message_header {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #000000;
-}
-
-.message_subject {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #000000;
-	font-style: italic;
-}
-
-.tablabel {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	font-weight: bold;
-	color: #000000;
-}
-
-.boxlabel {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 9pt;
-	font-weight: bold;
-	color: #FFFFEE;
-}
-
-.youhavemail {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 6pt;
-	font-style: italic;
-	color: #000044;
-}
-
-.customize {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 8pt;
-	font-style: italic;
-	color: #000044;
-	background-color: #DDDDCC;
-}
-
-.room_banner_room_name {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 14pt;
-	font-weight: bold;
-	color: #FFFFEE;
-}
-
-.room_banner_room_info {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #FFFFEE;
-}
-
-.room_banner_new_messages {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #DDDDCC;
-}
-
-.room_banner_start_page {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 7pt;
-	color: #DDDDCC;
-}
-
-
-.menubar_bg {
-	background-color: #FF0000;
-}
-
-.iconbar_link {
-	font-family: Bitstream Vera Sans,Tahoma,Arial,Helvetica,sans-serif;
-	font-size: 7pt;
-}
-
-.powered_by {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 6pt;
-}
-
-.roomlist_floor {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 12pt;
-	font-weight: bold;
-	color: #000000;
-}
-
-.roomlist_new {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #880000;
-	font-weight: bold;
-}
-
-.roomlist_old {
-	font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-	font-size: 10pt;
-	color: #000088;
-}
-
-
-body {
-  background: #aaaaaa;
-  color: #000000;
-  font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;
-  font-weight: normal;
-  font-size: 10pt;
-}
-
-h1 {
-  font-weight: bold;
-  text-align: center
-}
-
-h2 {
-  font-weight: bold
-}
-
-h3 {
-  font-weight: bold
-}
-
-h4 {
-  font-weight: bold
-}
-
-h5 {
-  margin-left: 6%;
-  margin-right: 6%;
-  font-weight: bold
-}
-
-ul, ol, dl, p {
-  margin-left: 6%;
-  margin-right: 6%
-}
-
-ul ul, table ol, table ul, dl ol, dl ul {
-  margin-left: 1.2em;
-  margin-right: 1%;
-  padding-left: 0
-}
-
-pre {
-  margin-left: 10%;
-  white-space: pre
-}
-
-table caption {
-  font-size: larger;
-  font-weight: bolder
-}
-
-table p, table dl, ol p, ul p, dl p, blockquote p, .note p, .note ul, .note ol, .note dl, li pre, dd pre {
-  margin-left: 0;
-  margin-right: 0
-}
-
-p.top {
-  margin-left: 1%;
-  margin-right: 1%
-}
-
-blockquote {
-  margin-left: 8%;
-  margin-right: 8%;
-  border: thin ridge #dc143c
-}
-
-blockquote pre {
-  margin-left: 1%;
-  margin-right: 1%
-}
-
-dt a {
-  font-weight: bold;
-  margin-top: .8em
-}
-
-
-.html {
-  color: #000080;
-  background: none
-}
-
-.css {
-  color: #800000;
-  background: none
-}
-
-.javascript {
-  color: #008000;
-  background: none
-}
-
-dfn {
-  font-style: normal;
-  font-weight: bolder
-}
-
-var sub { font-style: normal }
-
-.note {
-  font-size: 85%;
-  margin-left: 10%
-}
-
-.toolbar {
-  text-align: center
-}
-
-.toolbar IMG {
-  float: right
-}
-
-.errormsg {
-  color: #AA0000;
-  background: none;
-  font-style: italic;
-}
-
-.warning {
-  color: #FF4500;
-  background: none;
-  text-decoration: none
-}
-
-.error strong {
-  color: #DC143C;
-  background: #FFD700;
-  text-decoration: none
-}
-
-.warning strong {
-  color: #FF4500;
-  background: #FFD700;
-  text-decoration: none
-}
-
-.warning a:link, .warning a:visited, .warning a:active {
-  color: #FF4500;
-  background: none;
-  text-decoration: underline
-}
-
-.error a:link, .error a:visited, .error a:active {
-  color: #DC143C;
-  background: none;
-  text-decoration: underline
-}
-
-.error strong a:link, .error strong a:visited, .error strong a:active {
-  color: #DC143C;
-  background: #FFD700
-}
-
-.warning strong a:link, .warning strong a:visited, .warning strong a:active {
-  color: #FF4500;
-  background: #FFD700
-}
-
-colgroup.entity { text-align: center }
-
-.default { text-decoration: underline; font-style: normal }
-.required { font-weight: bold }
-td li.transitional, .elements li.transitional {
-  font-weight: lighter;
-  color: #696969;
-  background: none
-}
-
-td li.frameset, .elements li.frameset {
-  font-weight: lighter;
-  color: #808080;
-  background: none
-}
-
-.footer, .checkedDocument {
-  margin-top: 2em;
-  padding-top: 1em;
-  border-top: solid thin black
-}
-
-strong.legal {
-  font-weight: normal;
-  text-transform: uppercase
-}
-
-@media print {
-  input#toggler, .toolbar { display: none }
-}
-
-<!-- begin tree view styles -->
-
-#mainMenu {
-  background-color: #EEE;
-  border: 1px solid #CCC;
-  color: #000;
-  width: 203px;
-}
-
-#menuList {
-  margin: 0px;
-  padding: 10px 0px 10px 15px;
-}
-
-li.menubar {
-  background: url(/static/plus.gif) no-repeat 0em 0.3em;
-  font-size: 12px;
-  line-height: 1.5em;
-  list-style: none outside;
-}
-
-.menu, .submenu {
-  display: none;
-  margin-left: 15px;
-  padding: 0px;
-}
-
-.menu li, .submenu li {
-  background: url(/static/square.gif) no-repeat 0em 0.3em;
-  list-style: none outside;
-}
-
-a.actuator {
-  background-color: transparent;
-  color: #000;
-  font-size: 12px;
-  padding-left: 15px;
-  text-decoration: none;
-}
-
-a.actuator:hover {
-  text-decoration: underline;
-}
-
-.menu li a, .submenu li a {
-  background-color: transparent;
-  color: #000;
-  font-size: 12px;
-  padding-left: 15px;
-  text-decoration: none;
-}
-
-.menu li a:hover, submenu li a:hover {
-  /*border-bottom: 1px dashed #000;*/
-  text-decoration: underline;
-}
-
-span.key {
-  text-decoration: underline;
-}
-
-<!-- end tree view styles -->
diff --git a/webcit/static/trailing.html b/webcit/static/trailing.html
index e04310fdd..308b1d01b 100644
--- a/webcit/static/trailing.html
+++ b/webcit/static/trailing.html
@@ -1,2 +1,2 @@
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/webcit/static/upload.html b/webcit/static/upload.html
deleted file mode 100644
index 9cb169a7b..000000000
--- a/webcit/static/upload.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head><title>Uploading test</title></head>
-
-   <FORM ENCTYPE="multipart/form-data" ACTION="/the-url" METHOD="POST">
-        <TABLE BORDER=0 WIDTH="460">
-        <TR>
-            <TD ALIGN=RIGHT>
-                File 1:
-            </TD>
-            <TD>
-                <INPUT TYPE="FILE" NAME="file-to-upload-01" SIZE="35">
-            </TD>
-        </TR>
-        <TR>
-            <TD COLSPAN=2>&nbsp;<BR></TD>
-        </TR>
-        <TR>
-            <TD>
-                <INPUT TYPE="SUBMIT" VALUE="Upload File(s)!">
-            </TD>
-            <TD ALIGN=RIGHT>
-                <INPUT TYPE="RESET" VALUE="Reset Form">
-            </TD>
-        </TR>
-        </TABLE>
-        </FORM>
-
-</body></html>
-
-
diff --git a/webcit/static/upperleftcorner.gif b/webcit/static/upperleftcorner.gif
deleted file mode 100644
index e8ac24b25..000000000
Binary files a/webcit/static/upperleftcorner.gif and /dev/null differ
diff --git a/webcit/static/upperleftcorner_nt.gif b/webcit/static/upperleftcorner_nt.gif
deleted file mode 100644
index 389e8d858..000000000
Binary files a/webcit/static/upperleftcorner_nt.gif and /dev/null differ
diff --git a/webcit/static/upperrightcorner.gif b/webcit/static/upperrightcorner.gif
deleted file mode 100644
index edd9d79b7..000000000
Binary files a/webcit/static/upperrightcorner.gif and /dev/null differ
diff --git a/webcit/static/upperrightcorner_nt.gif b/webcit/static/upperrightcorner_nt.gif
deleted file mode 100644
index 9da6b54af..000000000
Binary files a/webcit/static/upperrightcorner_nt.gif and /dev/null differ
diff --git a/webcit/static/whoframeset.html b/webcit/static/whoframeset.html
deleted file mode 100644
index 3166b914e..000000000
--- a/webcit/static/whoframeset.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-	<TITLE>WebCit</TITLE>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en">
-</HEAD>
-
-<FRAMESET ROWS="*, 15%" FRAMESPACING="0">
-	<FRAME NAME="top"    SRC="/mainmenu">
-	<FRAME NAME="bottom" SRC="/whobbs">
-</FRAMESET>
-
-<BODY>
-<NOFRAMES>
-You can't do this because you're using a browser that doesn't support frames.
-</NOFRAMES>
-
-</BODY>
-</HTML>
diff --git a/webcit/subst.c b/webcit/subst.c
index 38f147b67..9392cffee 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -223,7 +223,7 @@ void do_template(void *templatename) {
 	fp = fopen(filename, "r");
 	if (fp == NULL) {
 		wprintf("<BLINK>ERROR</BLINK> - could not open template ");
-		wprintf("'%s' - %s<BR>\n",
+		wprintf("'%s' - %s<br />\n",
 			templatename, strerror(errno));
 		return;
 	}
diff --git a/webcit/summary.c b/webcit/summary.c
index f287534a7..7141e72f4 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -117,7 +117,7 @@ void wholist_section(void) {
 	if (buf[0] == '1') while(serv_gets(buf), strcmp(buf, "000")) {
 		extract(user, buf, 1);
 		escputs(user);
-		wprintf("<BR>\n");
+		wprintf("<br />\n");
 	}
 	do_template("endbox");
 }
@@ -144,7 +144,7 @@ void tasks_section(void) {
 	}
 
 	if (num_msgs < 1) {
-		wprintf("<i>(None)</i><BR>\n");
+		wprintf("<i>(None)</i><br />\n");
 	}
 	else {
 		for (i=0; i<num_msgs; ++i) {
@@ -180,7 +180,7 @@ void calendar_section(void) {
 	}
 
 	if (num_msgs < 1) {
-		wprintf("<i>(Nothing)</i><BR>\n");
+		wprintf("<i>(Nothing)</i><br />\n");
 	}
 	else {
 		for (i=0; i<num_msgs; ++i) {
@@ -208,7 +208,7 @@ void server_info_section(void) {
 	escputs(serv_info.serv_software);
 	wprintf(", and located in ");
 	escputs(serv_info.serv_bbs_city);
-	wprintf(".<BR>\nYour system administrator is ");
+	wprintf(".<br />\nYour system administrator is ");
 	escputs(serv_info.serv_sysadm);
 	wprintf(".\n");
 	do_template("endbox");
@@ -219,8 +219,9 @@ void server_info_section(void) {
  * Display this user's summary page
  */
 void summary(void) {
-	output_headers(7);
 
+	output_headers(1, 1, 2, 0, 1, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=#444455><TR>"
 		"<TD><IMG SRC=\"/static/summary.gif\"></TD><TD>"
 		"<SPAN CLASS=\"titlebar\">"
@@ -229,9 +230,10 @@ void summary(void) {
 	wprintf("</SPAN></TD><TD>\n");
 	wprintf("</TD><TD ALIGN=RIGHT><SPAN CLASS=\"titlebar\">");
 	output_date();
-	wprintf("</SPAN><BR>");
+	wprintf("</SPAN><br />");
 	offer_start_page();
 	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	/*
 	 * Now let's do three columns of crap.  All portals and all groupware
@@ -254,7 +256,7 @@ void summary(void) {
 	 */
 	wprintf("</TD><TD WIDTH=33%%>");
 	server_info_section();
-	wprintf("<BR>");
+	wprintf("<br />");
 	tasks_section();
 
 	/*
@@ -262,7 +264,7 @@ void summary(void) {
 	 */
 	wprintf("</TD><TD WIDTH=33%%>");
 	new_messages_section();
-	wprintf("<BR>");
+	wprintf("<br />");
 	calendar_section();
 
 	/*
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 0aa9e75f9..00b3ff1fa 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -32,7 +32,7 @@
  * display the form for editing something (room info, bio, etc)
  */
 void display_edit(char *description, char *check_cmd,
-		  char *read_cmd, char *save_cmd, int headers_type)
+		  char *read_cmd, char *save_cmd, int with_room_banner)
 {
 	char buf[SIZ];
 
@@ -44,7 +44,12 @@ void display_edit(char *description, char *check_cmd,
 		display_main_menu();
 		return;
 	}
-	output_headers(headers_type);
+	if (with_room_banner) {
+		output_headers(1, 1, 1, 0, 0, 0, 0);
+	}
+	else {
+		output_headers(1, 1, 0, 0, 0, 0, 0);
+	}
 
 	svprintf("BOXTITLE", WCS_STRING, "Edit %s", description);
 	do_template("beginbox");
@@ -52,7 +57,7 @@ void display_edit(char *description, char *check_cmd,
 	wprintf("<CENTER>Enter %s below.  Text is formatted to\n", description);
 	wprintf("the <EM>reader's</EM> screen width.  To defeat the\n");
 	wprintf("formatting, indent a line at least one space.  \n");
-	wprintf("<BR>");
+	wprintf("<br />");
 
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"%s\">\n", save_cmd);
 	wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft "
@@ -61,10 +66,10 @@ void display_edit(char *description, char *check_cmd,
 	serv_gets(buf);
 	if (buf[0] == '1')
 		server_to_text();
-	wprintf("</TEXTAREA><BR><BR>\n");
+	wprintf("</TEXTAREA><br /><br />\n");
 	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">");
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
 
 	wprintf("</FORM></CENTER>\n");
 	do_template("endbox");
diff --git a/webcit/useredit.c b/webcit/useredit.c
index a4f55ef0a..8aa73c19d 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -35,7 +35,7 @@ void select_user_to_edit(char *message, char *preselect)
 	char buf[SIZ];
 	char username[SIZ];
 
-	output_headers(3);	/* No room banner on this screen */
+	output_headers(1, 1, 0, 0, 0, 0, 0);	/* No room banner on this screen */
 
 	if (message != NULL) wprintf(message);
 
@@ -45,7 +45,7 @@ void select_user_to_edit(char *message, char *preselect)
 	do_template("beginbox");
 
 	wprintf("To edit an existing user account, select the user "
-		"name from the list and click 'Edit'.<BR><BR>");
+		"name from the list and click 'Edit'.<br /><br />");
 	
         wprintf("<CENTER>"
 		"<FORM METHOD=\"POST\" ACTION=\"/display_edituser\">\n");
@@ -64,7 +64,7 @@ void select_user_to_edit(char *message, char *preselect)
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><BR>\n");
+        wprintf("</SELECT><br />\n");
 
         wprintf("<input type=submit name=sc value=\"Edit configuration\">");
         wprintf("<input type=submit name=sc value=\"Edit address book entry\">");
@@ -77,11 +77,11 @@ void select_user_to_edit(char *message, char *preselect)
 	do_template("beginbox");
 
 	wprintf("To create a new user account, enter the desired "
-		"user name in the box below and click 'Create'.<BR><BR>");
+		"user name in the box below and click 'Create'.<br /><br />");
 
         wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/create_user\">\n");
         wprintf("New user: ");
-        wprintf("<input type=text name=username><BR>\n"
+        wprintf("<input type=text name=username><br />\n"
         	"<input type=submit value=\"Create\">"
 		"</FORM></CENTER>\n");
 
@@ -184,7 +184,7 @@ void display_edit_address_book_entry(char *username, long usernum) {
 		if (buf[0] != '2') {
 			sprintf(error_message,
 				"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-				"%s<BR><BR>\n", &buf[4]);
+				"%s<br /><br />\n", &buf[4]);
 			select_user_to_edit(error_message, username);
 			return;
 		}
@@ -196,7 +196,7 @@ void display_edit_address_book_entry(char *username, long usernum) {
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
 			"Could not create/edit vCard"
-			"<BR><BR>\n"
+			"<br /><br />\n"
 		);
 		select_user_to_edit(error_message, username);
 		return;
@@ -243,7 +243,7 @@ void display_edituser(char *supplied_username, int is_new) {
 	if (buf[0] != '2') {
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"%s<BR><BR>\n", &buf[4]);
+			"%s<br /><br />\n", &buf[4]);
 		select_user_to_edit(error_message, username);
 		return;
 	}
@@ -263,12 +263,14 @@ void display_edituser(char *supplied_username, int is_new) {
 		return;
 	}
 
-	output_headers(3);	/* No room banner on this screen */
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<SPAN CLASS=\"titlebar\">"
 		"Edit user account: ");
 	escputs(username);
 	wprintf("</SPAN></TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 
 	do_template("beginbox_nt");
 	wprintf("<FORM METHOD=\"POST\" ACTION=\"/edituser\">\n"
@@ -339,7 +341,7 @@ void display_edituser(char *supplied_username, int is_new) {
 	wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"OK\">\n"
 		"&nbsp;"
 		"<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n"
-		"<BR><BR></FORM>\n");
+		"<br /><br /></FORM>\n");
 
 	wprintf("</CENTER>\n");
 	do_template("endbox");
@@ -378,7 +380,7 @@ void edituser(void) {
 		if (buf[0] != '2') {
 			sprintf(message,
 				"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-				"%s<BR><BR>\n", &buf[4]);
+				"%s<br /><br />\n", &buf[4]);
 		}
 		else {
 			strcpy(message, "");
@@ -417,7 +419,7 @@ void create_user(void) {
 	else {
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"%s<BR><BR>\n", &buf[4]);
+			"%s<br /><br />\n", &buf[4]);
 		select_user_to_edit(error_message, NULL);
 	}
 
diff --git a/webcit/userlist.c b/webcit/userlist.c
index d05e635a4..f291247eb 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -50,12 +50,12 @@ void userlist(void)
 			strcpy(bptr->name, buf);
 			bio = bptr;
 		}
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	serv_puts("LIST");
 	serv_gets(buf);
 	if (buf[0] != '1') {
-		wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 		goto DONE;
 	}
 
@@ -119,7 +119,7 @@ void showuser(void)
 	char buf[SIZ];
 	int have_pic;
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	svprintf("BOXTITLE", WCS_STRING, "User profile");
 	do_template("beginbox");
@@ -147,7 +147,7 @@ void showuser(void)
 	if (buf[0] == '1') {
 		fmout(NULL, "JUSTIFY");
 	}
-	wprintf("<BR><A HREF=\"/display_page&recp=");
+	wprintf("<br /><A HREF=\"/display_page&recp=");
 	urlescputs(who);
 	wprintf("\">"
 		"<IMG SRC=\"/static/page.gif\" ALIGN=MIDDLE BORDER=0>"
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index e20d29673..ee51e4b75 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -78,7 +78,7 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 	other_inetemail[0] = 0;
 	extrafields[0] = 0;
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 
 	strcpy(whatuser, "");
 
@@ -243,17 +243,17 @@ void do_edit_vcard(long msgnum, char *partnum, char *return_to) {
 		"VALUE=\"%s\" MAXLENGTH=\"29\"></TD></TR></TABLE>\n",
 		worktel);
 
-	wprintf("<BR><TABLE border=0><TR>"
-		"<TD VALIGN=TOP>Primary Internet e-mail address<BR>"
+	wprintf("<br /><TABLE border=0><TR>"
+		"<TD VALIGN=TOP>Primary Internet e-mail address<br />"
 		"<INPUT TYPE=\"text\" NAME=\"primary_inetemail\" "
 		"SIZE=40 MAXLENGTH=40 VALUE=\"");
 	escputs(primary_inetemail);
-	wprintf("\"><BR>"
+	wprintf("\"><br />"
 		"</TD><TD VALIGN=TOP>"
-		"Other Internet e-mail addresses<BR>"
+		"Other Internet e-mail addresses<br />"
 		"<TEXTAREA NAME=\"other_inetemail\" ROWS=5 COLS=40 WIDTH=40>");
 	escputs(other_inetemail);
-	wprintf("</TEXTAREA></TD></TR></TABLE><BR>\n");
+	wprintf("</TEXTAREA></TD></TR></TABLE><br />\n");
 
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"extrafields\" VALUE=\"");
 	escputs(extrafields);
diff --git a/webcit/webcit.c b/webcit/webcit.c
index fd6398f59..7148144ee 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -175,10 +175,17 @@ void wprintf(const char *format,...)
 void wDumpContent(int print_standard_html_footer)
 {
 	if (print_standard_html_footer) {
+		wprintf("</DIV>\n");	/* end of "text" div */
+	
+		/* NAVBAR 
+		wprintf("<div id=\"navbar\">");
+		wprintf("FIXME the navbar should go here, dude...\n");
+		wprintf("</div>\n");
+		 */
+
 		do_template("trailing");
 	}
 
-
 }
 
 
@@ -338,41 +345,28 @@ void msgescputs(char *strbuf) {
 
 /*
  * Output all that important stuff that the browser will want to see
- *
- * control codes:
- * 
- * Bits 0 and 1:
- * 0 = Nothing.  Do not display any leading HTTP or HTML.
- * 1 = HTTP headers plus the room banner
- * 2 = HTTP headers required to terminate the session (unset cookies)
- * 3 = HTTP and HTML headers, but no room banner
- *
- * Bit 2: Set to 1 to auto-refresh page every 30 seconds
- * Bit 3: suppress check for express messages
- * Bit 4: Allow browser to cache this document
- *
  */
-void output_headers(int controlcode)
-{
+void output_headers(	int do_httpheaders,	/* 1 = output HTTP headers                          */
+			int do_htmlhead,	/* 1 = output HTML <head> section and <body> opener */
+
+			int do_room_banner,	/* 0=no, 1=yes,                                     */
+						/* 2 = I'm going to embed my own, so don't open the */
+						/*     <div id="text"> either.                      */
+
+			int unset_cookies,	/* 1 = session is terminating, so unset the cookies */
+			int refresh30,		/* 1 = automatically refresh page every 30 seconds  */
+			int suppress_check,	/* 1 = suppress check for instant messages          */
+			int cache		/* 1 = allow browser to cache this page             */
+) {
 	char cookie[SIZ];
-	int print_standard_html_head = 0;
-	int refresh30 = 0;
-	int suppress_check = 0;
-	int cache = 0;
 	char httpnow[SIZ];
 	char onload_fcn[SIZ];
 	static int pageseq = 0;
-	print_standard_html_head	=	controlcode & 0x03;
-	refresh30			=	((controlcode & 0x04) >> 2);
-	suppress_check			=	((controlcode & 0x08) >> 3);
-	cache				=	((controlcode & 0x10) >> 4);
-
 
 	wprintf("HTTP/1.0 200 OK\n");
-
 	httpdate(httpnow, time(NULL));
 
-	if (print_standard_html_head > 0) {
+	if (do_httpheaders) {
 		wprintf("Content-type: text/html\n"
 			"Server: %s\n", SERVER
 		);
@@ -386,7 +380,7 @@ void output_headers(int controlcode)
 	stuff_to_cookie(cookie, WC->wc_session, WC->wc_username,
 			WC->wc_password, WC->wc_roomname);
 
-	if (print_standard_html_head == 2) {
+	if (unset_cookies) {
 		wprintf("Set-cookie: webcit=%s; path=/\n", unset);
 	} else {
 		wprintf("Set-cookie: webcit=%s; path=/\n", cookie);
@@ -395,44 +389,37 @@ void output_headers(int controlcode)
 		}
 	}
 
-	if (print_standard_html_head > 0) {
+	if (do_htmlhead) {
 		wprintf("\n");
 
 		if (refresh30) {
 			svprintf("REFRESHTAG", WCS_STRING, "%s",
-				"<META HTTP-EQUIV=\"refresh\" CONTENT=\"30\">\n");
+				"<meta http-equiv=\"refresh\" content=\"30\" />\n");
 		}
 		else {
 			svprintf("REFRESHTAG", WCS_STRING, "%s",
-				"<META HTTP-EQUIV=\"refresh\" CONTENT=\"500363689;\">\n");
+				"<meta http-equiv=\"refresh\" content=\"500363689;\" />\n");
 		}
 
 		/* script for checking for pages (not always launched) */
 
 		sprintf(onload_fcn, "function onload_fcn() { \n");
-		if (!WC->outside_frameset_allowed) {
-			strcat(onload_fcn, "  force_frameset();  \n");
-		}
 		if (!suppress_check) if (WC->HaveExpressMessages) {
 			strcat(onload_fcn, "  launch_page_popup();  \n");
 			WC->HaveExpressMessages = 0;
 		}
 		strcat(onload_fcn, "} \n");
 
-		svprintf("PAGERSCRIPT", WCS_STRING,
-			"<SCRIPT LANGUAGE=\"JavaScript\">\n"
+		svprintf("PAGERscript", WCS_STRING,
+			"<script language=\"JavaScript\">\n"
 			"function launch_page_popup() {\n"
 			"pwin = window.open('/page_popup', 'CitaPage%d', "
 			"'toolbar=no,location=no,copyhistory=no,status=no,"
 			"scrollbars=yes,resizable=no,height=250,width=400');\n"
 			"}\n"
-			"function force_frameset() { \n"
-			" if (top.frames.length == 0) { \n"
-			"  top.location.replace('/do_welcome'); \n"
-			" } \n"
-			"} \n"
+
 			"%s\n"
-			"</SCRIPT>\n",
+			"</script>\n",
 			++pageseq,
 			onload_fcn
 		);
@@ -446,18 +433,31 @@ void output_headers(int controlcode)
 		do_template("background");
 	}
 
-	if (print_standard_html_head == 1) {
-		wprintf("<A NAME=\"TheTop\"></A>");
-		embed_room_banner(NULL);
+	/* ICONBAR */
+	if (do_htmlhead) {
+		if ( (WC->logged_in) && (!unset_cookies) ) {
+			wprintf("<div id=\"iconbar\">");
+			do_iconbar();
+			wprintf("</div>\n");
+		}
+		if (do_room_banner == 1) {
+			wprintf("<div id=\"banner\">\n");
+			embed_room_banner(NULL);
+			wprintf("</div>\n");
+		}
+	}
+
+	if (do_room_banner != 2) {
+		wprintf("<div id=\"text\">\n");
 	}
 
 	if (strlen(WC->ImportantMessage) > 0) {
 		do_template("beginbox_nt");
 		wprintf("<SPAN CLASS=\"errormsg\">"
-			"%s</SPAN><BR>\n", WC->ImportantMessage);
+			"%s</SPAN><br />\n", WC->ImportantMessage);
 		do_template("endbox");
 		strcpy(WC->ImportantMessage, "");
-	}	
+	}
 }
 
 
@@ -494,7 +494,12 @@ void check_for_express_messages()
  */
 void http_transmit_thing(char *thing, size_t length, char *content_type,
 			 int is_static) {
-	output_headers(is_static ? 0x10 : 0x00);
+	if (is_static) {
+		output_headers(0, 0, 0, 0, 0, 0, 1);
+	}
+	else {
+		output_headers(0, 0, 0, 0, 0, 0, 0);
+	}
 	wprintf("Content-type: %s\n"
 		"Content-length: %ld\n"
 		"Server: %s\n"
@@ -608,7 +613,7 @@ void output_image()
 
 		/*
 		wprintf("HTTP/1.0 404 %s\n", &buf[4]);
-		output_headers(0);
+		output_headers(0, 0, 0, 0, 0, 0, 0);
 		wprintf("Content-Type: text/plain\n"
 			"\n"
 			"Error retrieving image: %s\n",
@@ -637,7 +642,7 @@ void output_mimepart()
 		bytes = extract_long(&buf[4], 0);
 		content = malloc(bytes + 2);
 		extract(content_type, &buf[4], 3);
-		output_headers(0);
+		output_headers(0, 0, 0, 0, 0, 0, 0);
 		read_server_binary(content, bytes);
 		serv_puts("CLOS");
 		serv_gets(buf);
@@ -645,7 +650,7 @@ void output_mimepart()
 		free(content);
 	} else {
 		wprintf("HTTP/1.0 404 %s\n", &buf[4]);
-		output_headers(0);
+		output_headers(0, 0, 0, 0, 0, 0, 0);
 		wprintf("Content-Type: text/plain\n");
 		wprintf("\n");
 		wprintf("Error retrieving part: %s\n", &buf[4]);
@@ -690,13 +695,15 @@ char *load_mimepart(long msgnum, char *partnum)
 void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
 {
 	wprintf("HTTP/1.0 200 OK\n");
-	output_headers(1);
+	output_headers(1, 1, 2, 0, 0, 0, 0);
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#%s\"><TR><TD>", titlebarcolor);
 	wprintf("<SPAN CLASS=\"titlebar\">%s</SPAN>\n", titlebarmsg);
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div><div id=\"text\">\n");
 	escputs(messagetext);
 
-	wprintf("<HR>\n");
+	wprintf("<hr />\n");
 	wDumpContent(1);
 }
 
@@ -705,7 +712,7 @@ void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
  * Display a blank page.
  */
 void blank_page(void) {
-	output_headers(7);
+	output_headers(1, 1, 0, 0, 1, 0, 0);
 	wDumpContent(2);
 }
 
@@ -746,7 +753,7 @@ void change_start_page(void) {
 
 	set_preference("startpage", bstr("startpage"));
 
-	output_headers(3);
+	output_headers(1, 1, 0, 0, 0, 0, 0);
 	do_template("newstartpage");
 	wDumpContent(1);
 }
@@ -1274,15 +1281,15 @@ void session_loop(struct httprequest *req)
 	} else if (!strcasecmp(action, "save_inetconf")) {
 		save_inetconf();
 	} else if (!strcasecmp(action, "diagnostics")) {
-		output_headers(1);
+		output_headers(1, 1, 1, 0, 0, 0, 0);
 
-		wprintf("You're in session %d<HR>\n", WC->wc_session);
-		wprintf("Command: <BR><PRE>\n");
+		wprintf("You're in session %d<hr />\n", WC->wc_session);
+		wprintf("Command: <br /><PRE>\n");
 		escputs(cmd);
-		wprintf("</PRE><HR>\n");
-		wprintf("Variables: <BR><PRE>\n");
+		wprintf("</PRE><hr />\n");
+		wprintf("Variables: <br /><PRE>\n");
 		dump_vars();
-		wprintf("</PRE><HR>\n");
+		wprintf("</PRE><hr />\n");
 		wDumpContent(1);
 	}
 	/* When all else fais, display the main menu. */
diff --git a/webcit/webcit.h b/webcit/webcit.h
index f3a1e1a85..5584880af 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -57,18 +57,18 @@
  *
  * bucket one...
  */
-#define QR_PERMANENT	1		/* Room does not purge              */
+#define QR_PERMANENT	1		/* Room does not purge	      */
 #define QR_INUSE	2		/* Set if in use, clear if avail    */
 #define QR_PRIVATE	4		/* Set for any type of private room */
 #define QR_PASSWORDED	8		/* Set if there's a password too    */
 #define QR_GUESSNAME	16		/* Set if it's a guessname room     */
-#define QR_DIRECTORY	32		/* Directory room                   */
-#define QR_UPLOAD	64		/* Allowed to upload                */
-#define QR_DOWNLOAD	128		/* Allowed to download              */
-#define QR_VISDIR	256		/* Visible directory                */
-#define QR_ANONONLY	512		/* Anonymous-Only room              */
-#define QR_ANONOPT	1024		/* Anonymous-Option room            */
-#define QR_NETWORK	2048		/* Shared network room              */
+#define QR_DIRECTORY	32		/* Directory room		   */
+#define QR_UPLOAD	64		/* Allowed to upload		*/
+#define QR_DOWNLOAD	128		/* Allowed to download	      */
+#define QR_VISDIR	256		/* Visible directory		*/
+#define QR_ANONONLY	512		/* Anonymous-Only room	      */
+#define QR_ANONOPT	1024		/* Anonymous-Option room	    */
+#define QR_NETWORK	2048		/* Shared network room	      */
 #define QR_PREFONLY	4096		/* Preferred status needed to enter */
 #define QR_READONLY	8192		/* Aide status required to post     */
 #define QR_MAILBOX	16384		/* Set if this is a private mailbox */
@@ -80,10 +80,10 @@
 #define QR2_SELFLIST	2		/* Self-service mailing list mgmt   */
 
 
-#define UA_KNOWN                2
-#define UA_GOTOALLOWED          4
-#define UA_HASNEWMSGS           8
-#define UA_ZAPPED               16
+#define UA_KNOWN		2
+#define UA_GOTOALLOWED	  4
+#define UA_HASNEWMSGS	   8
+#define UA_ZAPPED	       16
 
 
 
@@ -176,7 +176,7 @@ struct wc_attachment {
  * HTTP transactions are bound to one at a time.
  */
 struct wcsession {
-        struct wcsession *next;		/* Linked list */
+	struct wcsession *next;		/* Linked list */
 	int wc_session;			/* WebCit session ID */
 	char wc_username[SIZ];
 	char wc_password[SIZ];
@@ -204,13 +204,12 @@ struct wcsession {
 	int need_regi;			/* This user needs to register. */
 	int need_vali;			/* New users require validation. */
 	char cs_inet_email[SIZ];	/* User's preferred Internet addr. */
-        pthread_mutex_t SessionMutex;	/* mutex for exclusive access */
-        time_t lastreq;			/* Timestamp of most recent HTTP */
+	pthread_mutex_t SessionMutex;	/* mutex for exclusive access */
+	time_t lastreq;			/* Timestamp of most recent HTTP */
 	int killthis;			/* Nonzero == purge this session */
 	struct march *march;		/* march mode room list */
 	char reply_to[SIZ];		/* reply-to address */
 	long msgarr[4096];		/* for read operations */
-	int fake_frames;
 	int is_wap;			/* Client is a WAP gateway */
 	struct urlcontent *urlstrings;
 	int HaveExpressMessages;	/* Nonzero if incoming msgs exist */
@@ -227,8 +226,6 @@ struct wcsession {
 #endif
 	struct wc_attachment *first_attachment;
 	char ImportantMessage[SIZ];
-	int outside_frameset_allowed;	/* nonzero if current req is allowed
-					 * outside of the main frameset */
 	char last_chat_user[SIZ];
 	int ctdl_pid;			/* Session ID on the Citadel server */
 };
@@ -283,7 +280,13 @@ void urlesc(char *, char *);
 void urlescputs(char *);
 void jsesc(char *, char *);
 void jsescputs(char *);
-void output_headers(int);
+void output_headers(    int do_httpheaders,
+			int do_htmlhead,
+			int do_room_banner,
+			int unset_cookies,
+			int refresh30,
+			int suppress_check,
+			int cache);
 void wprintf(const char *format,...);
 void output_static(char *what);
 void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks);
@@ -328,7 +331,7 @@ void display_whok(void);
 void server_to_text(void);
 void save_edit(char *description, char *enter_cmd, int regoto);
 void display_edit(char *description, char *check_cmd,
-		  char *read_cmd, char *save_cmd, int headers_type);
+		  char *read_cmd, char *save_cmd, int with_room_banner);
 void gotoroom(char *gname);
 void confirm_delete_room(void);
 void delete_room(void);
diff --git a/webcit/who.c b/webcit/who.c
index 0ccad321f..2bd73bc7f 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -37,22 +37,25 @@ void whobbs(void)
 	time_t now;
 	int bg = 0;
 
-	output_headers(7);
+	output_headers(1, 1, 2, 0, 1, 0, 0);
 
-	wprintf("<SCRIPT LANGUAGE=\"JavaScript\">\n"
+	wprintf("<script language=\"JavaScript\">\n"
 		"function ConfirmKill() { \n"
 		"return confirm('Do you really want to kill this session?');\n"
 		"}\n"
-		"</SCRIPT>\n"
+		"</script>\n"
 	);
 
+	wprintf("<div id=\"banner\">\n");
 	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 	wprintf("<IMG SRC=\"/static/users-icon.gif\" ALT=\" \" ALIGN=MIDDLE>");
 	wprintf("<SPAN CLASS=\"titlebar\">&nbsp;Users currently on ");
 	escputs(serv_info.serv_humannode);
 	wprintf("</SPAN></TD><TD ALIGN=RIGHT>");
 	offer_start_page();
-	wprintf("</TD></TR></TABLE><BR>\n");
+	wprintf("</TD></TR></TABLE>\n");
+	wprintf("</div>\n"
+		"<div id=\"text\">\n");
 
 	do_template("beginbox_nt");
 	wprintf("<CENTER>"
@@ -136,7 +139,7 @@ void whobbs(void)
 			wprintf("</TD>\n\t<TD>");
 			escputs(room);
 			if (strlen(realroom) > 0) {
-				wprintf("<BR><I>");
+				wprintf("<br /><I>");
 				escputs(realroom);
 				wprintf("</I>");
 			}
@@ -145,7 +148,7 @@ void whobbs(void)
 			/* hostname */
 			escputs(host);
 			if (strlen(realhost) > 0) {
-				wprintf("<BR><I>");
+				wprintf("<br /><I>");
 				escputs(realhost);
 				wprintf("</I>");
 			}
@@ -156,7 +159,7 @@ void whobbs(void)
 		"Click on a name to read user info.  Click on "
 		"<IMG ALIGN=MIDDLE SRC=\"/static/page.gif\" ALT=\"(p)\" "
 		"BORDER=0> to send "
-		"a page (instant message) to that user.<BR></CENTER>\n");
+		"a page (instant message) to that user.<br /></CENTER>\n");
 	do_template("endbox");
 	wDumpContent(1);
 }
@@ -195,18 +198,21 @@ void edit_me(void)
 		http_redirect("/whobbs");
 	} else {
 
-		output_headers(3);
+		output_headers(1, 1, 0, 0, 0, 0, 0);
 
+		wprintf("<div id=\"banner\">\n");
 		wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
 		wprintf("<SPAN CLASS=\"titlebar\">");
 		wprintf("Edit your session display");
 		wprintf("</SPAN></TD></TR></TABLE>\n");
+		wprintf("</div>\n<div id=\"text\">\n");
+
 		wprintf("This screen allows you to change the way your\n");
 		wprintf("session appears in the 'Who is online' listing.\n");
 		wprintf("To turn off any 'fake' name you've previously\n");
 		wprintf("set, simply click the appropriate 'change' button\n");
 		wprintf("without typing anything in the corresponding box.\n");
-		wprintf("<BR>\n");
+		wprintf("<br />\n");
 
 		wprintf("<FORM METHOD=\"POST\" ACTION=\"/edit_me\">\n");