diff --git a/contrib/bulk_add/theme.php b/contrib/bulk_add/theme.php
index d83f8ba8..3df8a40b 100644
--- a/contrib/bulk_add/theme.php
+++ b/contrib/bulk_add/theme.php
@@ -29,8 +29,10 @@ class BulkAddTheme extends Themelet {
 			upload via FTP or something first.
 
 			<p>".make_form(make_link("bulk_add"))."
-				Directory to add: <input type='text' name='dir' size='40'>
-				<input type='submit' value='Add'>
+				<table class='form'>
+					<tr><th>Folder</th><td><input type='text' name='dir' size='40'></td></tr>
+					<tr><td colspan='2'><input type='submit' value='Add'></td></tr>
+				</table>
 			</form>
 		";
 		$page->add_block(new Block("Bulk Add", $html));
diff --git a/contrib/rating/theme.php b/contrib/rating/theme.php
index 54773d67..ca8a553f 100644
--- a/contrib/rating/theme.php
+++ b/contrib/rating/theme.php
@@ -23,15 +23,15 @@ class RatingsTheme extends Themelet {
 		global $page;
 		$html = "
 			".make_form(make_link("admin/bulk_rate"))."
-				<table style='width: 300px'>
+				<table class='form'>
 					<tr>
-						<td>Search</td>
+						<th>Search</th>
 						<td>
 							<input type='text' name='query'>
 						</td>
 					</tr>
 					<tr>
-						<td>Rating</td>
+						<th>Rating</th>
 						<td>
 							<select name='rating'>
 								<option value='s'>Safe</option>
diff --git a/contrib/tag_history/theme.php b/contrib/tag_history/theme.php
index 3c255899..1445ffd2 100644
--- a/contrib/tag_history/theme.php
+++ b/contrib/tag_history/theme.php
@@ -114,10 +114,12 @@ class Tag_HistoryTheme extends Themelet {
 			'.$validation_msg.'
 
 			<br><br>'.make_form(make_link("admin/bulk_revert"),'POST',false,'revert_ip_form')."
-				Username:   <input type='text' name='revert_name' size='15'><br>
-				IP Address: <input type='text' name='revert_ip' size='15'><br>
-				Date range: <input type='text' name='revert_date' size='15'><br><br>
-				<input type='submit' value='Revert' onclick='return confirm(\"Revert all edits by this IP?\");'>
+				<table class='form'>
+					<tr><th>Username</th>   <td><input type='text' name='revert_name' size='15'></td></tr>
+					<tr><th>IP&nbsp;Address</th> <td><input type='text' name='revert_ip' size='15'></td></tr>
+					<tr><th>Date&nbsp;range</th> <td><input type='text' name='revert_date' size='15'></td></tr>
+					<tr><td colspan='2'><input type='submit' value='Revert' onclick='return confirm(\"Revert all edits by this IP?\");'></td></tr>
+				</table>
 			</form>
 		";
 		$page->add_block(new Block("Revert By IP", $html));
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index ae11b67a..11c0cb90 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -9,9 +9,9 @@ class TagEditTheme extends Themelet {
 		global $page;
 		$html = "
 		".make_form(make_link("tag_edit/replace"))."
-			<table style='width: 400px;'>
-				<tr><td>Search</td><td><input type='text' name='search'></tr>
-				<tr><td>Replace</td><td><input type='text' name='replace'></td></tr>
+			<table class='form'>
+				<tr><th>Search</th><td><input type='text' name='search'></tr>
+				<tr><th>Replace</th><td><input type='text' name='replace'></td></tr>
 				<tr><td colspan='2'><input type='submit' value='Replace'></td></tr>
 			</table>
 		</form>
diff --git a/ext/user/theme.php b/ext/user/theme.php
index d9f0e366..a9617e87 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -54,7 +54,7 @@ class UserPageTheme extends Themelet {
 
 		$html .= '
 		'.make_form(make_link("user_admin/create"))."
-			<table style='width: 300px;' class='form'>
+			<table class='form'>
 				<tbody>
 					<tr><th>Name</th><td><input type='text' name='name'></td></tr>
 					<tr><th>Password</th><td><input type='password' name='pass1'></td></tr>
@@ -87,7 +87,7 @@ class UserPageTheme extends Themelet {
 		global $config;
 		$html = '
 			'.make_form(make_link("user_admin/login"))."
-				<table class='form'>
+				<table width='100%' class='form'>
 					<tbody>
 						<tr>
 							<th><label for='user'>Name</label></th>
@@ -163,7 +163,7 @@ 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;' class='form'>
+				<table class='form'>
 					<thead>
 						<tr><th colspan='2'>Change Password</th></tr>
 					</thead>
@@ -179,7 +179,7 @@ class UserPageTheme extends Themelet {
 
 			<p>".make_form(make_link("user_admin/change_email"))."
 				<input type='hidden' name='id' value='{$duser->id}'>
-				<table style='width: 300px;' class='form'>
+				<table 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>
diff --git a/lib/shimmie.css b/lib/shimmie.css
index 82294482..3d9ead7c 100644
--- a/lib/shimmie.css
+++ b/lib/shimmie.css
@@ -7,6 +7,7 @@ TD>INPUT[type="text"] {width: 100%;}
 TD>INPUT[type="password"] {width: 100%;}
 TD>SELECT {width: 100%;}
 
+TABLE.form {width: 300px;}
 TABLE.form TD, TABLE.form TH {vertical-align: middle;}
 TABLE.form TBODY TD {text-align: left;}
 TABLE.form TBODY TH {text-align: right; padding-right: 4px; width: 1%;}