diff --git a/src/views/admin/appearance/header.tpl b/src/views/admin/appearance/header.tpl
index 2089fa86e0..fb071550ee 100644
--- a/src/views/admin/appearance/header.tpl
+++ b/src/views/admin/appearance/header.tpl
@@ -1,2 +1 @@
-<div class="themes">
-	<br />
\ No newline at end of file
+<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 564159c026..e30bace825 100644
--- a/src/views/admin/appearance/skins.tpl
+++ b/src/views/admin/appearance/skins.tpl
@@ -1,19 +1,28 @@
 <!-- IMPORT admin/appearance/header.tpl -->
 
-<div id="skins">
-	<h3>Bootswatch Themes</h3>
-	<p>
-		NodeBB's skins are powered by Bootswatch, a repository containing themes built
-		with Bootstrap as a base theme. Currently, the Vanilla base theme is best optimized for use with Bootswatch.
-	</p>
-	<ul class="directory" id="bootstrap_themes">
-		<li><i class="fa fa-refresh fa-spin"></i> Loading Themes</li>
-	</ul>
-
-	<h3>Revert to Default</h3>
-	<p class="alert">
-		<button class="btn btn-warning" id="revert_theme">Revert</button> This will remove any custom theme applied to your NodeBB, and restore the base theme.
-	</p>
+<div id="skins" class="row">
+	<div class="col-md-9">
+		<div class="panel panel-default">
+			<div class="panel-heading">Bootswatch Themes</div>
+			<div class="panel-body">
+				<p>
+					NodeBB's skins are powered by Bootswatch, a repository containing themes built with Bootstrap as a base theme. Currently, the Vanilla theme is best optimized for use with Bootswatch.
+				</p>
+				<ul class="directory" id="bootstrap_themes">
+					<li><i class="fa fa-refresh fa-spin"></i> Loading Themes</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-3">
+		<div class="panel panel-default">
+			<div class="panel-heading">Revert to Default</div>
+			<div class="panel-body">
+				<p>This will remove any custom Bootswatch skin applied to your NodeBB, and restore the base theme.</p>
+				<button class="btn btn-warning btn-md" id="revert_theme">Revert to Default</button>
+			</div>
+		</div>
+	</div>
 </div>
 
 <!-- IMPORT admin/appearance/footer.tpl -->
\ No newline at end of file
diff --git a/src/views/admin/appearance/themes.tpl b/src/views/admin/appearance/themes.tpl
index 6592487acd..fea9547b7f 100644
--- a/src/views/admin/appearance/themes.tpl
+++ b/src/views/admin/appearance/themes.tpl
@@ -1,13 +1,18 @@
 <!-- IMPORT admin/appearance/header.tpl -->
 
 <div id="themes">
-	<h3>Installed Themes</h3>
-	<p>
-		The following themes are currently installed in this NodeBB instance.
-	</p>
-	<ul class="directory" id="installed_themes">
-		<li><i class="fa fa-refresh fa-spin"></i> Checking for installed themes...</li>
-	</ul>
+	<div class="panel panel-default">
+		<div class="panel-heading">Installed Themes</div>
+		<div class="panel-body">
+			<p>
+				The following themes are currently installed on your forum.
+			</p>
+
+			<ul class="directory" id="installed_themes">
+				<li><i class="fa fa-refresh fa-spin"></i> Checking for installed themes...</li>
+			</ul>
+		</div>
+	</div>
 </div>
 
 <!-- IMPORT admin/appearance/footer.tpl -->
\ No newline at end of file