diff --git a/edit-page.php b/edit-page.php
index 8efa7c0..d791b65 100644
--- a/edit-page.php
+++ b/edit-page.php
@@ -166,9 +166,6 @@ tinyMCE.init({
 <script type="text/javascript">
 mce_config.selector = '#content';
 mce_config.content_css = 'styles/megatokyo.css';
-mce_config.style_formats = [
-	{title: 'Spoiler', inline: 'span', classes: 'spoiler'}
-];
 
 tinymce.init(mce_config);
 </script>
diff --git a/include/mce_config.js b/include/mce_config.js
index ec2cef9..62065dc 100644
--- a/include/mce_config.js
+++ b/include/mce_config.js
@@ -1,4 +1,17 @@
 var mce_config = {
-	plugins: 'charmap code image link paste preview',
-	style_formats_merge: true
+	menubar: false,
+	plugins: 'charmap code image link lists paste preview',
+	style_formats: [
+		{title: 'Headings', items: [
+			{title: 'Heading 3', format: 'h3'},
+			{title: 'Heading 4', format: 'h4'},
+			{title: 'Heading 5', format: 'h5'},
+			{title: 'Heading 6', format: 'h6'},
+		]},
+		{title: 'Inline', items: [
+			{title: 'Code', icon: 'code', format: 'code'},
+			{title: 'Spoiler', inline: 'span', classes: 'spoiler'}
+		]}
+	],
+	toolbar: 'undo redo | bold italic underline strikethrough | styleselect | bullist numlist | link unlink image code'
 };
diff --git a/post-page.php b/post-page.php
index 7da77ea..f431431 100644
--- a/post-page.php
+++ b/post-page.php
@@ -108,9 +108,6 @@ tinyMCE.init({
 <script type="text/javascript">
 mce_config.selector = '#content';
 mce_config.content_css = 'styles/megatokyo.css';
-mce_config.style_formats = [
-	{title: 'Spoiler', inline: 'span', classes: 'spoiler'}
-];
 
 tinymce.init(mce_config);
 </script>