diff --git a/lib/controllers.js b/lib/controllers.js
index 3b121bd..379ec06 100644
--- a/lib/controllers.js
+++ b/lib/controllers.js
@@ -6,7 +6,9 @@ const accountHelpers = require.main.require('./src/controllers/accounts/helpers'
 const helpers = require.main.require('./src/controllers/helpers');
 
 Controllers.renderAdminPage = (req, res) => {
-	res.render('admin/plugins/harmony', {});
+	res.render('admin/plugins/harmony', {
+		title: '[[themes/harmony:theme-name]]',
+	});
 };
 
 Controllers.renderThemeSettings = async (req, res, next) => {
diff --git a/library.js b/library.js
index 13d3e96..87e7a2e 100644
--- a/library.js
+++ b/library.js
@@ -55,7 +55,7 @@ library.addAdminNavigation = async function (header) {
 	header.plugins.push({
 		route: '/plugins/harmony',
 		icon: 'fa-paint-brush',
-		name: 'Harmony Theme',
+		name: '[[themes/harmony:theme-name]]',
 	});
 	return header;
 };
diff --git a/templates/admin/plugins/harmony.tpl b/templates/admin/plugins/harmony.tpl
index 8fb640d..8f67b72 100644
--- a/templates/admin/plugins/harmony.tpl
+++ b/templates/admin/plugins/harmony.tpl
@@ -1,45 +1,48 @@
-<div class="row">
-	<div class="col-sm-2 col-12 settings-header">Settings</div>
-	<div class="col-sm-10 col-12">
-		<form role="form" class="harmony-settings">
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="enableQuickReply" name="enableQuickReply" />
-				<label for="enableQuickReply" class="form-check-label">[[themes/harmony:settings.enableQuickReply]]</label>
-			</div>
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="centerHeaderElements" name="centerHeaderElements" />
-				<label for="centerHeaderElements" class="form-check-label">[[themes/harmony:settings.centerHeaderElements]]</label>
-			</div>
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="mobileTopicTeasers" name="mobileTopicTeasers" />
-				<label for="mobileTopicTeasers" class="form-check-label">[[themes/harmony:settings.mobileTopicTeasers]]</label>
-			</div>
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="stickyToolbar" name="stickyToolbar" />
-				<div for="stickyToolbar" class="form-check-label">
-					[[themes/harmony:settings.stickyToolbar]]
-					<p class="form-text">
-						[[themes/harmony:settings.stickyToolbar.help]]
-					</p>
+<div class="acp-page-container">
+	<!-- IMPORT admin/partials/settings/header.tpl -->
+
+	<div class="row m-0">
+		<div id="spy-container" class="col-12 col-md-8 px-0 mb-4" tabindex="0">
+			<form role="form" class="harmony-settings">
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="enableQuickReply" name="enableQuickReply" />
+					<label for="enableQuickReply" class="form-check-label">[[themes/harmony:settings.enableQuickReply]]</label>
 				</div>
-			</div>
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="autohideBottombar" name="autohideBottombar" />
-				<div for="autohideBottombar" class="form-check-label">
-					[[themes/harmony:settings.autohideBottombar]]
-					<p class="form-text">
-						[[themes/harmony:settings.autohideBottombar.help]]
-					</p>
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="centerHeaderElements" name="centerHeaderElements" />
+					<label for="centerHeaderElements" class="form-check-label">[[themes/harmony:settings.centerHeaderElements]]</label>
 				</div>
-			</div>
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="chatModals" name="chatModals" />
-				<div for="chatModals" class="form-check-label">
-					[[themes/harmony:settings.chatModals]]
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="mobileTopicTeasers" name="mobileTopicTeasers" />
+					<label for="mobileTopicTeasers" class="form-check-label">[[themes/harmony:settings.mobileTopicTeasers]]</label>
 				</div>
-			</div>
-		</form>
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="stickyToolbar" name="stickyToolbar" />
+					<div for="stickyToolbar" class="form-check-label">
+						[[themes/harmony:settings.stickyToolbar]]
+						<p class="form-text">
+							[[themes/harmony:settings.stickyToolbar.help]]
+						</p>
+					</div>
+				</div>
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="autohideBottombar" name="autohideBottombar" />
+					<div for="autohideBottombar" class="form-check-label">
+						[[themes/harmony:settings.autohideBottombar]]
+						<p class="form-text">
+							[[themes/harmony:settings.autohideBottombar.help]]
+						</p>
+					</div>
+				</div>
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="chatModals" name="chatModals" />
+					<div for="chatModals" class="form-check-label">
+						[[themes/harmony:settings.chatModals]]
+					</div>
+				</div>
+			</form>
+		</div>
+
+		<!-- IMPORT admin/partials/settings/toc.tpl -->
 	</div>
 </div>
-
-<!-- IMPORT admin/partials/save_button.tpl -->