diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index 1a651af71b..637f46c567 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -318,7 +318,7 @@
 		}
 	}
 
-	.themes {
+	.themes, .skins {
 		ul.directory {
 			margin: 0;
 			padding: 0;
diff --git a/src/views/admin/appearance/customise.tpl b/src/views/admin/appearance/customise.tpl
index d23d8ec6ec..ea4518d05b 100644
--- a/src/views/admin/appearance/customise.tpl
+++ b/src/views/admin/appearance/customise.tpl
@@ -1,6 +1,6 @@
 <!-- IMPORT admin/appearance/header.tpl -->
 
-<div id="customise">
+<div id="customise" class="customise">
 	<div class="panel panel-default">
 		<div class="panel-heading">Custom CSS</div>
 		<div class="panel-body">
@@ -45,6 +45,4 @@
 	</div>
 
 	<button class="btn btn-primary" id="save">Save</button>
-</div>
-
-<!-- IMPORT admin/appearance/footer.tpl -->
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/views/admin/appearance/footer.tpl b/src/views/admin/appearance/footer.tpl
deleted file mode 100644
index f199f3de74..0000000000
--- a/src/views/admin/appearance/footer.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-</div>
-
-<script>
-	var bootswatchListener = function(data) {
-		require(['forum/admin/appearance/skins'], function(t) {
-			t.render(data);
-		});
-	};
-</script>
\ No newline at end of file
diff --git a/src/views/admin/appearance/header.tpl b/src/views/admin/appearance/header.tpl
deleted file mode 100644
index fb071550ee..0000000000
--- a/src/views/admin/appearance/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="themes">
\ No newline at end of file
diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl
index 34f72a2068..2b74899879 100644
--- a/src/views/admin/appearance/skins.tpl
+++ b/src/views/admin/appearance/skins.tpl
@@ -1,6 +1,4 @@
-<!-- IMPORT admin/appearance/header.tpl -->
-
-<div id="skins" class="row">
+<div id="skins" class="row skins">
 	<div class="col-lg-9">
 		<div class="panel panel-default">
 			<div class="panel-heading">Bootswatch Themes</div>
@@ -25,4 +23,10 @@
 	</div>
 </div>
 
-<!-- IMPORT admin/appearance/footer.tpl -->
\ No newline at end of file
+<script>
+	var bootswatchListener = function(data) {
+		require(['forum/admin/appearance/skins'], function(t) {
+			t.render(data);
+		});
+	};
+</script>
\ No newline at end of file
diff --git a/src/views/admin/appearance/themes.tpl b/src/views/admin/appearance/themes.tpl
index fea9547b7f..9e543052f9 100644
--- a/src/views/admin/appearance/themes.tpl
+++ b/src/views/admin/appearance/themes.tpl
@@ -1,6 +1,4 @@
-<!-- IMPORT admin/appearance/header.tpl -->
-
-<div id="themes">
+<div id="themes" class="themes">
 	<div class="panel panel-default">
 		<div class="panel-heading">Installed Themes</div>
 		<div class="panel-body">
@@ -13,6 +11,4 @@
 			</ul>
 		</div>
 	</div>
-</div>
-
-<!-- IMPORT admin/appearance/footer.tpl -->
\ No newline at end of file
+</div>
\ No newline at end of file