diff --git a/modules/data/certauth/tmpl/index.tmpl b/modules/data/certauth/tmpl/index.tmpl
index c042597b..e98a1eed 100644
--- a/modules/data/certauth/tmpl/index.tmpl
+++ b/modules/data/certauth/tmpl/index.tmpl
@@ -25,8 +25,8 @@
 <table class="data">
 	<thead>
 		<tr>
-			<td></td>
-			<td>Key</td>
+			<th></th>
+			<th>Key</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/modules/data/lastseen/tmpl/index.tmpl b/modules/data/lastseen/tmpl/index.tmpl
index 3fb5dc19..950b4fe6 100644
--- a/modules/data/lastseen/tmpl/index.tmpl
+++ b/modules/data/lastseen/tmpl/index.tmpl
@@ -4,9 +4,9 @@
 	<table class="data">
 		<thead>
 			<tr>
-				<td>User</td>
-				<td>Last Seen</td>
-				<td>Info</td>
+				<th>User</th>
+				<th>Last Seen</th>
+				<th>Info</th>
 				<? IF WebAdminLoaded ?><td>Action</td><? ENDIF ?>
 			</tr>
 		</thead>
diff --git a/modules/data/listsockets/tmpl/index.tmpl b/modules/data/listsockets/tmpl/index.tmpl
index 12a030fc..e33316c2 100644
--- a/modules/data/listsockets/tmpl/index.tmpl
+++ b/modules/data/listsockets/tmpl/index.tmpl
@@ -3,14 +3,14 @@
 <table class="data">
 	<thead>
 		<tr>
-			<td>Name</td>
-			<td>Created</td>
-			<td>State</td>
-			<td>SSL</td>
-			<td>Local</td>
-			<td>Remote</td>
-			<td>Data In</td>
-			<td>Data Out</td>
+			<th>Name</th>
+			<th>Created</th>
+			<th>State</th>
+			<th>SSL</th>
+			<th>Local</th>
+			<th>Remote</th>
+			<th>Data In</th>
+			<th>Data Out</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/modules/data/notes/tmpl/index.tmpl b/modules/data/notes/tmpl/index.tmpl
index eed791c6..1ab0cc41 100644
--- a/modules/data/notes/tmpl/index.tmpl
+++ b/modules/data/notes/tmpl/index.tmpl
@@ -29,9 +29,9 @@
 <table class="data">
 	<thead>
 		<tr>
-			<td style="width: 10px;"></td>
-			<td>Key</td>
-			<td>Note</td>
+			<th style="width: 10px;"></th>
+			<th>Key</th>
+			<th>Note</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/modules/data/sasl/tmpl/index.tmpl b/modules/data/sasl/tmpl/index.tmpl
index 99b766cb..266db347 100644
--- a/modules/data/sasl/tmpl/index.tmpl
+++ b/modules/data/sasl/tmpl/index.tmpl
@@ -38,8 +38,8 @@
 					<table class="data">
 						<thead>
 							<tr>
-								<td>Name</td>
-								<td>Description</td>
+								<th>Name</th>
+								<th>Description</th>
 							</tr>
 						</thead>
 						<tbody>
diff --git a/modules/data/stickychan/tmpl/index.tmpl b/modules/data/stickychan/tmpl/index.tmpl
index 581cc31d..d34b79c8 100644
--- a/modules/data/stickychan/tmpl/index.tmpl
+++ b/modules/data/stickychan/tmpl/index.tmpl
@@ -5,8 +5,8 @@
 	<table class="data">
 		<thead>
 			<tr>
-				<td>Name</td>
-				<td>Sticky</td>
+				<th>Name</th>
+				<th>Sticky</th>
 			</tr>
 		</thead>
 		<tbody>
diff --git a/modules/data/webadmin/files/webadmin.js b/modules/data/webadmin/files/webadmin.js
index 4ec6b0a1..ba2ff687 100644
--- a/modules/data/webadmin/files/webadmin.js
+++ b/modules/data/webadmin/files/webadmin.js
@@ -13,7 +13,7 @@ function floodprotection_change() {
 
 function make_sortable_table(table) {
 	if (table.rows.length >= 1) { // Ensure that the table at least contains a row for the headings
-		var headings = table.rows[0].getElementsByTagName("td");
+		var headings = table.rows[0].getElementsByTagName("th");
 		for (var i = 0; i < headings.length; i++) {
 			// This function acts to scope the i variable, so we can pass it off
 			// as the column_index, otherwise column_index would just be the max
diff --git a/webskins/dark-clouds/pub/dark-clouds.css b/webskins/dark-clouds/pub/dark-clouds.css
index 1db6e90b..0c5feb25 100644
--- a/webskins/dark-clouds/pub/dark-clouds.css
+++ b/webskins/dark-clouds/pub/dark-clouds.css
@@ -39,11 +39,12 @@ table {
 	border-top: 1px solid black;
 }
 
-table thead td {
+table thead th {
 	background-color: #EC8E00;
 	color: #000;
 	font-weight: bold;
 	padding: 6px;
+	text-align: left;
 }
 
 table td, table th {
@@ -51,10 +52,6 @@ table td, table th {
 	border: 1px solid #000;
 }
 
-table th {
-	text-align: left;
-}
-
 td.mod_name {
 	white-space: nowrap;
 }
@@ -205,12 +202,12 @@ a:hover {
 	text-decoration: underline;
 }
 
-table thead td a {
+table thead th a {
 	color: #000;
 	text-decoration: underline;
 }
 
-table thead td a:hover {
+table thead th a:hover {
 	color: #000;
 	text-decoration: none;
 }
diff --git a/webskins/forest/pub/forest.css b/webskins/forest/pub/forest.css
index ffde52aa..7fd4984c 100644
--- a/webskins/forest/pub/forest.css
+++ b/webskins/forest/pub/forest.css
@@ -2,7 +2,7 @@ h3 {
 	background-color: #049712;
 }
 
-table thead td {
+table thead th {
 	background-color: #007700;
 }
 
diff --git a/webskins/ice/pub/ice.css b/webskins/ice/pub/ice.css
index 11e598d7..1daf57bf 100644
--- a/webskins/ice/pub/ice.css
+++ b/webskins/ice/pub/ice.css
@@ -89,26 +89,18 @@ table thead {
 	font-weight: bold;
 }
 
-thead td {
+thead th {
 	font-size: 13px;
 	border-bottom: 1px solid #000;
 	min-width: 35px;
-}
-
-th {
 	text-align: left;
 	padding: 4px;
-	border-top: 1px solid #000;
 }
 
 tr td:first-child {
 	border-left: none;
 }
 
-tr:first-child th {
-	border-top: none;
-}
-
 table tr:first-child td {
 	border-top: none;
 }