diff --git a/ext/admin/theme.php b/ext/admin/theme.php
index d1090b6f..b070b101 100644
--- a/ext/admin/theme.php
+++ b/ext/admin/theme.php
@@ -53,7 +53,7 @@ class AdminPageTheme extends Themelet {
 		$page->add_block(new Block("Misc Admin Tools", $html));
 
 		$html = make_form(make_link("admin/set_tag_case"), "POST");
-		$html .= "<input type='text' name='tag' placeholder='Enter tag with correct case'>";
+		$html .= "<input type='text' name='tag' placeholder='Enter tag with correct case' class='autocomplete_tags' autocomplete='off'>";
 		$html .= "<input type='submit' value='Set Tag Case'>";
 		$html .= "</form>\n";
 		$page->add_block(new Block("Set Tag Case", $html));
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 45ab0674..02b7a3a1 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -19,8 +19,8 @@ class AliasEditorTheme extends Themelet {
 			$h_add = "
 				<tr>
 					".make_form(make_link("alias/add"))."
-						<td><input type='text' name='oldtag'></td>
-						<td><input type='text' name='newtag'></td>
+						<td><input type='text' name='oldtag' class='autocomplete_tags' autocomplete='off'></td>
+						<td><input type='text' name='newtag' class='autocomplete_tags' autocomplete='off'></td>
 						<td><input type='submit' value='Add'></td>
 					</form>
 				</tr>
diff --git a/ext/home/theme.php b/ext/home/theme.php
index 8cf95d8f..f01e7ebe 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -38,7 +38,7 @@ EOD
 		$search_html = "
 			<div class='space' id='search'>
 				<form action='".make_link("post/list")."' method='GET'>
-				<input name='search' size='30' type='text' value='' class='autocomplete_tags' autofocus='autofocus' autocomplete='off' />
+				<input name='search' size='30' type='search' value='' class='autocomplete_tags' autofocus='autofocus' autocomplete='off' />
 				<input type='hidden' name='q' value='/post/list'>
 				<input type='submit' value='Search'/>
 				</form>
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 438bc1f2..05e62ab1 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -63,7 +63,7 @@ and of course start organising your images :-)
 		$h_search_link = make_link();
 		$h_search = "
 			<p><form action='$h_search_link' method='GET'>
-				<input class='autocomplete_tags' name='search' type='search' placeholder='Search' value='$h_search_string' autocomplete='off' />
+				<input type='search' name='search' value='$h_search_string' placeholder='Search' class='autocomplete_tags' autocomplete='off' />
 				<input type='hidden' name='q' value='/post/list'>
 				<input type='submit' value='Find' style='display: none;' />
 			</form>
diff --git a/ext/log_db/theme.php b/ext/log_db/theme.php
index 1b0ba8b0..0f7ce961 100644
--- a/ext/log_db/theme.php
+++ b/ext/log_db/theme.php
@@ -23,7 +23,7 @@ class LogDatabaseTheme extends Themelet {
 		<tr><th>Time</th><th>Module</th><th>User</th><th colspan='2'>Message</th></tr>
 		<form action='".make_link("log/view")."' method='GET'>
 			<tr class='sizedinputs'>
-				<td><input type='text' name='time' value='".$this->heie("time")."'></td>
+				<td><input type='time' name='time' value='".$this->heie("time")."'></td>
 				<td><input type='text' name='module' value='".$this->heie("module")."'></td>
 				<td><input type='text' name='user' value='".$this->heie("user")."'></td>
 				<td>
diff --git a/ext/mass_tagger/theme.php b/ext/mass_tagger/theme.php
index 56a2273a..abce598b 100644
--- a/ext/mass_tagger/theme.php
+++ b/ext/mass_tagger/theme.php
@@ -14,7 +14,7 @@ class MassTaggerTheme extends Themelet {
 					<br />
 					<input type='hidden' name='ids' id='mass_tagger_ids' />
 					Set instead of add? <input type='checkbox' name='setadd' value='set' />
-					<label>Tags: <input type='text' name='tag' /></label>
+					<label>Tags: <input type='text' name='tag' class='autocomplete_tags' autocomplete='off' /></label>
 
 					<input type='submit' value='Tag Marked Images' />
 				</div>
diff --git a/ext/not_a_tag/theme.php b/ext/not_a_tag/theme.php
index d5b39cf0..d3730456 100644
--- a/ext/not_a_tag/theme.php
+++ b/ext/not_a_tag/theme.php
@@ -22,7 +22,7 @@ class NotATagTheme extends Themelet {
 					<th>Tag</th><th>Redirect</th><th>Action</th>
 					<tr>
 						<form action='".make_link("untag/list/1")."' method='GET'>
-							<td><input type='text' name='tag'></td>
+							<td><input type='text' name='tag' class='autocomplete_tags' autocomplete='off'></td>
 							<td><input type='text' name='redirect'></td>
 							<td><input type='submit' value='Search'></td>
 						</form>
@@ -31,7 +31,7 @@ class NotATagTheme extends Themelet {
 				$h_bans
 				<tfoot><tr>
 					".make_form(make_link("untag/add"))."
-						<td><input type='text' name='tag'></td>
+						<td><input type='text' name='tag' class='autocomplete_tags' autocomplete='off'></td>
 						<td><input type='text' name='redirect'></td>
 						<td><input type='submit' value='Ban'></td>
 					</form>
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index fd8bf756..9d43a070 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -304,7 +304,7 @@ class PoolsTheme extends Themelet {
 			$image = $pair[0];
 			$thumb_html = $this->build_thumb_html($image);
 			$pool_images .= '<span class="thumb">'."\n".$thumb_html."\n".
-				'<br><input name="imgs['.$i.'][]" type="text" style="max-width:50px;" value="'.$image->image_order.'" />'.
+				'<br><input name="imgs['.$i.'][]" type="number" style="max-width:50px;" value="'.$image->image_order.'" />'.
 				'<input name="imgs['.$i.'][]" type="hidden" value="'.$image->id.'" />'.
 				'</span>';
 			$i++;
diff --git a/ext/relatationships/theme.php b/ext/relatationships/theme.php
index 7656facf..39018ae3 100644
--- a/ext/relatationships/theme.php
+++ b/ext/relatationships/theme.php
@@ -37,7 +37,7 @@ class RelationshipsTheme extends Themelet {
 		        "	<td>\n".
 		        (!$user->is_anonymous() ?
 		            "		<span class='view' style='overflow: hidden; white-space: nowrap;'>{$s_parent_id}</span>\n".
-		            "		<input class='edit' type='text' name='tag_edit__parent' type='number' value='{$h_parent_id}'>\n"
+		            "		<input class='edit' type='number' name='tag_edit__parent' type='number' value='{$h_parent_id}'>\n"
 		        :
 		            $s_parent_id
 		        ).
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index a9ddeaa0..813efebe 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -11,7 +11,7 @@ class RotateImageTheme extends Themelet {
 		$html = "
 			".make_form(make_link('rotate/'.$image_id), 'POST')."
 				<input type='hidden' name='image_id' value='$image_id'>
-				<input id='rotate_deg' name='rotate_deg' type='text' placeholder='Rotation degrees'>
+				<input id='rotate_deg' name='rotate_deg' type='number' placeholder='Rotation degrees'>
 				<input id='rotatebutton' type='submit' value='Rotate'>
 			</form>
 		";
diff --git a/ext/source_history/theme.php b/ext/source_history/theme.php
index ce4b8065..8b0475c1 100644
--- a/ext/source_history/theme.php
+++ b/ext/source_history/theme.php
@@ -124,7 +124,7 @@ class Source_HistoryTheme extends Themelet {
 				<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><th>Date&nbsp;range</th> <td><input type='date' name='revert_date' size='15'></td></tr>
 					<tr><td colspan='2'><input type='submit' value='Revert'></td></tr>
 				</table>
 			</form>
diff --git a/ext/tag_categories/theme.php b/ext/tag_categories/theme.php
index 2856570c..e40b3dfa 100644
--- a/ext/tag_categories/theme.php
+++ b/ext/tag_categories/theme.php
@@ -87,7 +87,7 @@ class TagCategoriesTheme extends Themelet {
             <tr>
                 <td>Color</td>
                 <td>
-                    <input type="text" name="tc_color" value="'.$tag_color.'">
+                    <input type="color" name="tc_color" value="'.$tag_color.'">
                 </td>
             </tr>
             </table>
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index b8922052..0332273b 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -10,8 +10,8 @@ class TagEditTheme extends Themelet {
 		$html = "
 		".make_form(make_link("tag_edit/replace"))."
 			<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><th>Search</th><td><input type='text' name='search' class='autocomplete_tags' autocomplete='off'></tr>
+				<tr><th>Replace</th><td><input type='text' name='replace' class='autocomplete_tags' autocomplete='off'></td></tr>
 				<tr><td colspan='2'><input type='submit' value='Replace'></td></tr>
 			</table>
 		</form>
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index fd0940d6..abb48b26 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -137,7 +137,7 @@ class Tag_HistoryTheme extends Themelet {
 				<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><th>Date&nbsp;range</th> <td><input type='date' name='revert_date' size='15'></td></tr>
 					<tr><td colspan='2'><input type='submit' value='Revert'></td></tr>
 				</table>
 			</form>
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 157a9e0c..8195723a 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -60,7 +60,7 @@ class UploadTheme extends Themelet {
 					<tr>
 						<td colspan='2'><input type='file' name='data$i'></td>
 						<td colspan='2'><input type='text' name='url$i'</td>
-						<td colspan='2'><input type='text' name='tags$i'></td>
+						<td colspan='2'><input type='text' name='tags$i' class='autocomplete_tags' autocomplete='off'></td>
 					</tr>
 				";
 			}
@@ -77,7 +77,7 @@ class UploadTheme extends Themelet {
 				$upload_list .= "
 					<tr>
 						<td colspan='4'><input type='file' name='data$i'></td>
-						<td colspan='2'><input type='text' name='tags$i'></td>
+						<td colspan='2'><input type='text' name='tags$i' class='autocomplete_tags' autocomplete='off'></td>
 					</tr>
 				";
 			}
diff --git a/ext/user/theme.php b/ext/user/theme.php
index 2f4255db..bdf55a13 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -56,10 +56,10 @@ class UserPageTheme extends Themelet {
 		'.make_form(make_link("user_admin/create"))."
 			<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>
-					<tr><th>Repeat&nbsp;Password</th><td><input type='password' name='pass2'></td></tr>
-					<tr><th>Email&nbsp;(Optional)</th><td><input type='text' name='email'></td></tr>
+					<tr><th>Name</th><td><input type='text' name='name' required></td></tr>
+					<tr><th>Password</th><td><input type='password' name='pass1' required></td></tr>
+					<tr><th>Repeat&nbsp;Password</th><td><input type='password' name='pass2' required></td></tr>
+					<tr><th>Email&nbsp;(Optional)</th><td><input type='email' name='email'></td></tr>
 					$h_reca
 				</tbody>
 				<tfoot>
diff --git a/ext/view/theme.php b/ext/view/theme.php
index a2775c8b..7df95215 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -52,7 +52,7 @@ class ViewImageTheme extends Themelet {
 		$h_search = "
 			<p><form action='".make_link()."' method='GET'>
 				<input type='hidden' name='q' value='/post/list'>
-				<input placeholder='Search' name='search' type='text'>
+				<input type='search' name='search' placeholder='Search' class='autocomplete_tags' autocomplete='off'>
 				<input type='submit' value='Find' style='display: none;'>
 			</form>
 		";