diff --git a/contrib/artists/theme.php b/contrib/artists/theme.php
index 1bb9e2ed..b1acd803 100644
--- a/contrib/artists/theme.php
+++ b/contrib/artists/theme.php
@@ -5,7 +5,7 @@ class ArtistsTheme extends Themelet {
 		$h_author = html_escape($author);
 		return "
 			<tr>
-				<td>Author</td>
+				<th>Author</th>
 				<td>
 					<span class='view'>$h_author</span>
 					<input class='edit' type='text' name='tag_edit__author' value='$h_author'>
diff --git a/contrib/rating/theme.php b/contrib/rating/theme.php
index 11667a96..54773d67 100644
--- a/contrib/rating/theme.php
+++ b/contrib/rating/theme.php
@@ -8,7 +8,7 @@ class RatingsTheme extends Themelet {
 		$e_checked = $rating == 'e' ? " checked" : "";
 		$html = "
 			<tr>
-				<td>Rating</td>
+				<th>Rating</th>
 				<td>
 					<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
 					<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 5ad429e4..ae11b67a 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -23,7 +23,7 @@ class TagEditTheme extends Themelet {
 		$h_tags = html_escape($image->get_tag_list());
 		return "
 			<tr>
-				<td width='50px'>Tags</td>
+				<th width='50px'>Tags</th>
 				<td>
 					<span class='view'>$h_tags</span>
 					<input class='edit' type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor'>
@@ -40,7 +40,7 @@ class TagEditTheme extends Themelet {
 		$h_ip = $user->can("view_ip") ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : "";
 		return "
 			<tr>
-				<td>Uploader</td>
+				<th>Uploader</th>
 				<td>
 					<span class='view'><a class='username' href='".make_link("user/$h_owner")."'>$h_owner</a>$h_ip, $h_date</span>
 					<input class='edit' type='text' name='tag_edit__owner' value='$h_owner'>
@@ -55,7 +55,7 @@ class TagEditTheme extends Themelet {
 		$f_source = $this->format_source($image->get_source());
 		return "
 			<tr>
-				<td>Source</td>
+				<th>Source</th>
 				<td>
 					<span class='view' style='overflow: hidden; white-space: nowrap;'>$f_source</span>
 					<input class='edit' type='text' name='tag_edit__source' value='$h_source'>
@@ -82,7 +82,7 @@ class TagEditTheme extends Themelet {
 		$h_locked = $image->is_locked() ? " checked" : "";
 		return "
 			<tr>
-				<td>Locked</td>
+				<th>Locked</th>
 				<td>
 					<span class='view'>$b_locked</span>
 					<input class='edit' type='checkbox' name='tag_edit__locked'$h_locked>
diff --git a/ext/user/theme.php b/ext/user/theme.php
index b27ec946..6b48fc8e 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -54,13 +54,17 @@ class UserPageTheme extends Themelet {
 
 		$html .= '
 		'.make_form(make_link("user_admin/create"))."
-			<table style='width: 300px;'>
-				<tr><td>Name</td><td><input type='text' name='name'></td></tr>
-				<tr><td>Password</td><td><input type='password' name='pass1'></td></tr>
-				<tr><td>Repeat Password</td><td><input type='password' name='pass2'></td></tr>
-				<tr><td>Email (Optional)</td><td><input type='text' name='email'></td></tr>
-				$h_reca
-				<tr><td colspan='2'><input type='Submit' value='Create Account'></td></tr>
+			<table style='width: 300px;' class='form'>
+				<tbody>
+					<tr><td>Name</td><td><input type='text' name='name'></td></tr>
+					<tr><td>Password</td><td><input type='password' name='pass1'></td></tr>
+					<tr><td>Repeat Password</td><td><input type='password' name='pass2'></td></tr>
+					<tr><td>Email (Optional)</td><td><input type='text' name='email'></td></tr>
+					$h_reca
+				</tbody>
+				<tfoot>
+					<tr><td colspan='2'><input type='Submit' value='Create Account'></td></tr>
+				</tfoot>
 			</table>
 		</form>
 		";
@@ -83,16 +87,20 @@ class UserPageTheme extends Themelet {
 		global $config;
 		$html = '
 			'.make_form(make_link("user_admin/login"))."
-				<table summary='Login Form' class='login'>
-					<tr>
-						<td><label for='user'>Name</label></td>
-						<td><input id='user' type='text' name='user'></td>
-					</tr>
-					<tr>
-						<td><label for='pass'>Password</label></td>
-						<td><input id='pass' type='password' name='pass'></td>
-					</tr>
-					<tr><td colspan='2'><input type='submit' value='Log In'></td></tr>
+				<table class='form'>
+					<tbody>
+						<tr>
+							<th><label for='user'>Name</label></th>
+							<td><input id='user' type='text' name='user'></td>
+						</tr>
+						<tr>
+							<th><label for='pass'>Password</label></th>
+							<td><input id='pass' type='password' name='pass'></td>
+						</tr>
+					</tbody>
+					<tfoot>
+						<tr><td colspan='2'><input type='submit' value='Log In'></td></tr>
+					</tfoot>
 				</table>
 			</form>
 		";
@@ -155,20 +163,26 @@ class UserPageTheme extends Themelet {
 			$html .= "
 			".make_form(make_link("user_admin/change_pass"))."
 				<input type='hidden' name='id' value='{$duser->id}'>
-				<table style='width: 300px;'>
-					<tr><th colspan='2'>Change Password</th></tr>
-					<tr><td>Password</td><td><input type='password' name='pass1'></td></tr>
-					<tr><td>Repeat Password</td><td><input type='password' name='pass2'></td></tr>
-					<tr><td colspan='2'><input type='Submit' value='Change Password'></td></tr>
+				<table style='width: 300px;' class='form'>
+					<thead>
+						<tr><th colspan='2'>Change Password</th></tr>
+					</thead>
+					<tbody>
+						<tr><th>Password</th><td><input type='password' name='pass1'></td></tr>
+						<tr><th>Repeat Password</th><td><input type='password' name='pass2'></td></tr>
+					</tbody>
+					<tfoot>
+						<tr><td colspan='2'><input type='Submit' value='Change Password'></td></tr>
+					</tfoot>
 				</table>
 			</form>
 
 			<p>".make_form(make_link("user_admin/change_email"))."
 				<input type='hidden' name='id' value='{$duser->id}'>
-				<table style='width: 300px;'>
-					<tr><th colspan='2'>Change Email</th></tr>
-					<tr><td>Address</td><td><input type='text' name='address' value='".html_escape($duser->email)."'></td></tr>
-					<tr><td colspan='2'><input type='Submit' value='Set'></td></tr>
+				<table style='width: 300px;' class='form'>
+					<thead><tr><th colspan='2'>Change Email</th></tr></thead>
+					<tbody><tr><th>Address</th><td><input type='text' name='address' value='".html_escape($duser->email)."'></td></tr></tbody>
+					<tfoot><tr><td colspan='2'><input type='Submit' value='Set'></td></tr></tfoot>
 				</table>
 			</form>
 			";
diff --git a/ext/view/style.css b/ext/view/style.css
index dbcc0bf7..d7d7c2c0 100644
--- a/ext/view/style.css
+++ b/ext/view/style.css
@@ -1,12 +1,4 @@
 
-.image_info TD {
-	text-align: left;
-}
-.image_info TD:first-child {
-	text-align: right;
-	padding-right: 4px;
-}
-
 .js .image_info .edit {
 	display: none;
 }
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 4bce845d..f6017d70 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -67,7 +67,7 @@ class ViewImageTheme extends Themelet {
 
 		$html = make_form(make_link("post/set"))."
 					<input type='hidden' name='image_id' value='{$image->id}'>
-					<table style='width: 500px;' class='image_info'>
+					<table style='width: 500px;' class='image_info form'>
 		";
 		foreach($editor_parts as $part) {
 			$html .= $part;
diff --git a/themes/default/style.css b/themes/default/style.css
index 6b69431c..0e23659a 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -63,6 +63,10 @@ TABLE.zebra TR TD {border-bottom: 1px solid #DDD;}
 TABLE.zebra TR:nth-child(odd) {background: #EFEFEF;}
 TABLE.zebra TR:nth-child(even) {background: #E0E0E0;}
 
+TABLE.form TD, TABLE.form TH {vertical-align: center;}
+TABLE.form TBODY TD {text-align: left;}
+TABLE.form TBODY TH {text-align: right; padding-right: 4px;}
+
 #footer {
 	clear: both;
 	font-size: 0.7em;