diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 8b0ff87c7..81e96e558 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -15788,12 +15788,12 @@
         }
         g.TYPE = sfw ? 'sfw' : 'nsfw';
         if (Conf["NSFW/SFW Mascots"]) {
-          g.MASCOTSTRING = "Enabled Mascots " + g.TYPE;
+          Main.setMascotString();
           MascotTools.toggle();
         }
         if (Conf["NSFW/SFW Themes"]) {
-          Conf["theme"] = Conf["theme_" + g.TYPE] || (sfw ? 'Yotsuba B' : 'Yotsuba');
-          theme = Themes[Conf['theme']] || Themes[sfw ? 'Yotsuba B' : 'Yotsuba'];
+          Main.setThemeString();
+          theme = Themes[Conf[g.STYLESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.STYLESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
           Style.setTheme(theme);
         }
         Favicon.SFW = sfw;
@@ -17024,16 +17024,11 @@
       },
       theme: {
         select: function() {
-          var currentTheme;
-          if (currentTheme = $.id(Conf['theme'])) {
-            $.rmClass(currentTheme, 'selectedtheme');
+          var current;
+          if (current = $.id(Conf[g.STYLESTRING])) {
+            $.rmClass(current, 'selectedtheme');
           }
-          if (Conf["NSFW/SFW Themes"]) {
-            $.set("theme_" + g.TYPE, this.id);
-          } else {
-            $.set("theme", this.id);
-          }
-          Conf['theme'] = this.id;
+          $.set(g.STYLESTRING, Conf[g.STYLESTRING] = this.id);
           $.addClass(this, 'selectedtheme');
           return Style.setTheme(Themes[this.id]);
         },
@@ -17173,17 +17168,11 @@
       g.TYPE = Favicon.SFW ? 'sfw' : 'nsfw';
       $.extend(Themes, Conf["userThemes"]);
       $.extend(Mascots, Conf["userMascots"]);
-      if (Conf["NSFW/SFW Mascots"]) {
-        g.MASCOTSTRING = "Enabled Mascots " + g.TYPE;
-      } else {
-        g.MASCOTSTRING = "Enabled Mascots";
-      }
-      if (Conf["NSFW/SFW Themes"]) {
-        Conf["theme"] = Conf["theme_" + g.TYPE];
-      }
       if ((_ref = g.BOARD.ID) === 'z' || _ref === 'fk') {
         return Style.init();
       }
+      Main.setThemeString();
+      Main.setMascotString();
       switch (location.hostname) {
         case '4chan.org':
         case 'www.4chan.org':
@@ -17406,7 +17395,23 @@
       }
       return Main.thisPageIsLegit;
     },
-    features: [['Polyfill', Polyfill], ['Emoji', Emoji], ['Style', Style], ['Mascots', MascotTools], ['Rice', Rice], ['Banner', Banner], ['Announcements', GlobalMessage], ['Archive Redirection', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Updater', ThreadUpdater], ['Thread Stats', ThreadStats], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Show Dice Roll', Dice], ['Navigate', Navigate]]
+    features: [['Polyfill', Polyfill], ['Emoji', Emoji], ['Style', Style], ['Mascots', MascotTools], ['Rice', Rice], ['Banner', Banner], ['Announcements', GlobalMessage], ['Archive Redirection', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Updater', ThreadUpdater], ['Thread Stats', ThreadStats], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Show Dice Roll', Dice], ['Navigate', Navigate]],
+    setMascotString: function() {
+      var type;
+      type = "Enabled Mascots";
+      if (Conf["NSFW/SFW Mascots"]) {
+        type += " " + g.TYPE;
+      }
+      return g.MASCOTSTRING = type;
+    },
+    setThemeString: function() {
+      var type;
+      type = "theme";
+      if (Conf["NSFW/SFW Themes"]) {
+        type += "_" + g.TYPE;
+      }
+      return g.STYLESTRING = type;
+    }
   };
 
   Main.init();
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 4f6f90975..ae3a4dd7f 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -15784,12 +15784,12 @@
         }
         g.TYPE = sfw ? 'sfw' : 'nsfw';
         if (Conf["NSFW/SFW Mascots"]) {
-          g.MASCOTSTRING = "Enabled Mascots " + g.TYPE;
+          Main.setMascotString();
           MascotTools.toggle();
         }
         if (Conf["NSFW/SFW Themes"]) {
-          Conf["theme"] = Conf["theme_" + g.TYPE] || (sfw ? 'Yotsuba B' : 'Yotsuba');
-          theme = Themes[Conf['theme']] || Themes[sfw ? 'Yotsuba B' : 'Yotsuba'];
+          Main.setThemeString();
+          theme = Themes[Conf[g.STYLESTRING] || (sfw ? 'Yotsuba B' : 'Yotsuba')] || Themes[Conf[g.STYLESTRING] = sfw ? 'Yotsuba B' : 'Yotsuba'];
           Style.setTheme(theme);
         }
         Favicon.SFW = sfw;
@@ -17015,16 +17015,11 @@
       },
       theme: {
         select: function() {
-          var currentTheme;
-          if (currentTheme = $.id(Conf['theme'])) {
-            $.rmClass(currentTheme, 'selectedtheme');
+          var current;
+          if (current = $.id(Conf[g.STYLESTRING])) {
+            $.rmClass(current, 'selectedtheme');
           }
-          if (Conf["NSFW/SFW Themes"]) {
-            $.set("theme_" + g.TYPE, this.id);
-          } else {
-            $.set("theme", this.id);
-          }
-          Conf['theme'] = this.id;
+          $.set(g.STYLESTRING, Conf[g.STYLESTRING] = this.id);
           $.addClass(this, 'selectedtheme');
           return Style.setTheme(Themes[this.id]);
         },
@@ -17161,17 +17156,11 @@
       g.TYPE = Favicon.SFW ? 'sfw' : 'nsfw';
       $.extend(Themes, Conf["userThemes"]);
       $.extend(Mascots, Conf["userMascots"]);
-      if (Conf["NSFW/SFW Mascots"]) {
-        g.MASCOTSTRING = "Enabled Mascots " + g.TYPE;
-      } else {
-        g.MASCOTSTRING = "Enabled Mascots";
-      }
-      if (Conf["NSFW/SFW Themes"]) {
-        Conf["theme"] = Conf["theme_" + g.TYPE];
-      }
       if ((_ref = g.BOARD.ID) === 'z' || _ref === 'fk') {
         return Style.init();
       }
+      Main.setThemeString();
+      Main.setMascotString();
       switch (location.hostname) {
         case '4chan.org':
         case 'www.4chan.org':
@@ -17384,7 +17373,23 @@
       }
       return Main.thisPageIsLegit;
     },
-    features: [['Polyfill', Polyfill], ['Emoji', Emoji], ['Style', Style], ['Mascots', MascotTools], ['Rice', Rice], ['Banner', Banner], ['Announcements', GlobalMessage], ['Archive Redirection', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Updater', ThreadUpdater], ['Thread Stats', ThreadStats], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Show Dice Roll', Dice], ['Navigate', Navigate]]
+    features: [['Polyfill', Polyfill], ['Emoji', Emoji], ['Style', Style], ['Mascots', MascotTools], ['Rice', Rice], ['Banner', Banner], ['Announcements', GlobalMessage], ['Archive Redirection', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Updater', ThreadUpdater], ['Thread Stats', ThreadStats], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Show Dice Roll', Dice], ['Navigate', Navigate]],
+    setMascotString: function() {
+      var type;
+      type = "Enabled Mascots";
+      if (Conf["NSFW/SFW Mascots"]) {
+        type += " " + g.TYPE;
+      }
+      return g.MASCOTSTRING = type;
+    },
+    setThemeString: function() {
+      var type;
+      type = "theme";
+      if (Conf["NSFW/SFW Themes"]) {
+        type += "_" + g.TYPE;
+      }
+      return g.STYLESTRING = type;
+    }
   };
 
   Main.init();
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 7b94f3073..ae0be1537 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -58,15 +58,10 @@ Main =
     $.extend Themes,  Conf["userThemes"]
     $.extend Mascots, Conf["userMascots"]
 
-    if Conf["NSFW/SFW Mascots"]
-      g.MASCOTSTRING = "Enabled Mascots #{g.TYPE}"
-    else
-      g.MASCOTSTRING = "Enabled Mascots"
-
-    if Conf["NSFW/SFW Themes"]
-      Conf["theme"] = Conf["theme_#{g.TYPE}"]
-
     return if g.BOARD.ID in ['z', 'fk'] then Style.init()
+    
+    Main.setThemeString()
+    Main.setMascotString()
 
     switch location.hostname
       when '4chan.org', 'www.4chan.org'
@@ -311,4 +306,16 @@ Main =
     ['Navigate',                  Navigate]
   ]
 
+  setMascotString: ->
+    type = "Enabled Mascots"
+    if Conf["NSFW/SFW Mascots"]
+      type += " #{g.TYPE}"
+    g.MASCOTSTRING = type
+
+  setThemeString: ->
+    type = "theme"
+    if Conf["NSFW/SFW Themes"]
+      type += "_#{g.TYPE}"
+    g.STYLESTRING = type
+
 Main.init()
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 03ed15e8e..8aeaa8840 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -141,12 +141,12 @@ Navigate =
 
       g.TYPE = if sfw then 'sfw' else 'nsfw'
       if Conf["NSFW/SFW Mascots"]
-        g.MASCOTSTRING = "Enabled Mascots #{g.TYPE}"
+        Main.setMascotString()
         MascotTools.toggle()
 
       if Conf["NSFW/SFW Themes"]
-        Conf["theme"] = Conf["theme_#{g.TYPE}"] or if sfw then 'Yotsuba B' else 'Yotsuba'
-        theme = Themes[Conf['theme']] or Themes[if sfw then 'Yotsuba B' else 'Yotsuba']
+        Main.setThemeString()
+        theme = Themes[Conf[g.STYLESTRING] or if sfw then 'Yotsuba B' else 'Yotsuba'] or Themes[Conf[g.STYLESTRING] = if sfw then 'Yotsuba B' else 'Yotsuba']
         Style.setTheme theme
 
       Favicon.SFW = sfw
diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index ae59873b2..886ff81a7 100755
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -880,14 +880,10 @@ Settings =
 
     theme:
       select: ->
-        if currentTheme = $.id(Conf['theme'])
-          $.rmClass currentTheme, 'selectedtheme'
+        if current = $.id(Conf[g.STYLESTRING])
+          $.rmClass current, 'selectedtheme'
 
-        if Conf["NSFW/SFW Themes"]
-          $.set "theme_#{g.TYPE}", @id
-        else
-          $.set "theme", @id
-        Conf['theme'] = @id
+        $.set g.STYLESTRING, Conf[g.STYLESTRING] = @id
         $.addClass @, 'selectedtheme'
         Style.setTheme Themes[@id]