diff --git a/js/main.js b/js/main.js
index bb7b5b3d..7ef6aa04 100644
--- a/js/main.js
+++ b/js/main.js
@@ -21,25 +21,26 @@ var bttvEmoteUrlEnd = "/1x";
 var mainCore;
 
 var settings = {
-    "Save logs locally":          { "id": "bda-gs-0",  "info": "Saves chat logs locally",                           "implemented": false, "hidden": false},
-    "Public Servers":             { "id": "bda-gs-1",  "info": "Display public servers button",                     "implemented": true,  "hidden": false},
-    "Minimal Mode":               { "id": "bda-gs-2",  "info": "Hide elements and reduce the size of elements.",    "implemented": true,  "hidden": false},
-    "Voice Mode":                 { "id": "bda-gs-4",  "info": "Only show voice chat",                              "implemented": true,  "hidden": false},
-    "Hide Channels":              { "id": "bda-gs-3",  "info": "Hide channels in minimal mode",                     "implemented": true,  "hidden": false},
-    "Dark Mode":                  { "id": "bda-gs-5",  "info": "Make certain elements dark by default(wip)",        "implemented": true,  "hidden": false},
-    "Emote Menu":                 { "id": "bda-es-0",  "info": "Show Twitch/Favourite emotes in emote menu",        "implemented": true,  "hidden": false},
-    "Emoji Menu":                 { "id": "bda-es-9",  "info": "Show/Hide Discord emoji menu",                      "implemented": true,  "hidden": false},
-    "Show Emotes":                { "id": "bda-es-7",  "info": "Show any emotes",                                   "implemented": true,  "hidden": false},
-    "FrankerFaceZ Emotes":        { "id": "bda-es-1",  "info": "Show FrankerFaceZ Emotes",                          "implemented": true,  "hidden": false},
-    "BetterTTV Emotes":           { "id": "bda-es-2",  "info": "Show BetterTTV Emotes",                             "implemented": true,  "hidden": false},
-    "Emote Autocomplete":         { "id": "bda-es-3",  "info": "Autocomplete emote commands",                       "implemented": false, "hidden": false},
-    "Emote Auto Capitalization":  { "id": "bda-es-4",  "info": "Autocapitalize emote commands",                     "implemented": true,  "hidden": false},
-    "Override Default Emotes":    { "id": "bda-es-5",  "info": "Override default emotes",                           "implemented": false, "hidden": false},
-    "Show Names":                 { "id": "bda-es-6",  "info": "Show emote names on hover",                         "implemented": true,  "hidden": false},
-    "Show emote modifiers":       { "id": "bda-es-8",  "info": "Enable/Disable emote mods",                         "implemented": true,  "hidden": false},
-    "Voice Disconnect":           { "id": "bda-dc-0",  "info": "Disconnect from voice server when closing Discord", "implemented": true,  "hidden": false},
-    "Custom css live update":     { "id": "bda-css-0", "info": "",                                                  "implemented": true,  "hidden": true },
-    "Custom css auto udpate":     { "id": "bda-css-1", "info": "",                                                  "implemented": true,  "hidden": true },
+    "Save logs locally":          { "id": "bda-gs-0",  "info": "Saves chat logs locally",                           "implemented": false, "hidden": false, "cat": "core"},
+    "Public Servers":             { "id": "bda-gs-1",  "info": "Display public servers button",                     "implemented": true,  "hidden": false, "cat": "core"},
+    "Minimal Mode":               { "id": "bda-gs-2",  "info": "Hide elements and reduce the size of elements.",    "implemented": true,  "hidden": false, "cat": "core"},
+    "Voice Mode":                 { "id": "bda-gs-4",  "info": "Only show voice chat",                              "implemented": true,  "hidden": false, "cat": "core"},
+    "Hide Channels":              { "id": "bda-gs-3",  "info": "Hide channels in minimal mode",                     "implemented": true,  "hidden": false, "cat": "core"},
+    "Dark Mode":                  { "id": "bda-gs-5",  "info": "Make certain elements dark by default(wip)",        "implemented": true,  "hidden": false, "cat": "core"},
+    "Override Default Emotes":    { "id": "bda-es-5",  "info": "Override default emotes",                           "implemented": false, "hidden": false, "cat": "core"},
+    "Voice Disconnect":           { "id": "bda-dc-0",  "info": "Disconnect from voice server when closing Discord", "implemented": true,  "hidden": false, "cat": "core"},
+    "Custom css live update":     { "id": "bda-css-0", "info": "",                                                  "implemented": true,  "hidden": true , "cat": "core"},
+    "Custom css auto udpate":     { "id": "bda-css-1", "info": "",                                                  "implemented": true,  "hidden": true , "cat": "core"},
+
+    "Show Emotes":                { "id": "bda-es-7",  "info": "Show any emotes",                                   "implemented": true,  "hidden": false, "cat": "emote"},
+    "FrankerFaceZ Emotes":        { "id": "bda-es-1",  "info": "Show FrankerFaceZ Emotes",                          "implemented": true,  "hidden": false, "cat": "emote"},
+    "BetterTTV Emotes":           { "id": "bda-es-2",  "info": "Show BetterTTV Emotes",                             "implemented": true,  "hidden": false, "cat": "emote"},
+    "Emote Menu":                 { "id": "bda-es-0",  "info": "Show Twitch/Favourite emotes in emote menu",        "implemented": true,  "hidden": false, "cat": "emote"},
+    "Emoji Menu":                 { "id": "bda-es-9",  "info": "Show Discord emoji menu",                           "implemented": true,  "hidden": false, "cat": "emote"},
+    "Emote Autocomplete":         { "id": "bda-es-3",  "info": "Autocomplete emote commands",                       "implemented": false, "hidden": false, "cat": "emote"},
+    "Emote Auto Capitalization":  { "id": "bda-es-4",  "info": "Autocapitalize emote commands",                     "implemented": true,  "hidden": false, "cat": "emote"},
+    "Show Names":                 { "id": "bda-es-6",  "info": "Show emote names on hover",                         "implemented": true,  "hidden": false, "cat": "emote"},
+    "Show emote modifiers":       { "id": "bda-es-8",  "info": "Enable emote mods",                                 "implemented": true,  "hidden": false, "cat": "emote"},
 };
 
 var links = {
@@ -1258,12 +1259,6 @@ SettingsPanel.prototype.changeTab = function (tab) {
             customCssInitialized = true;
         }
         break;
-    case "bd-plugins-tab":
-
-        break;
-    case "bd-themes-tab":
-        controlGroups.html("<span>Coming soon</span>");
-        break;
     }
 };
 
@@ -1329,7 +1324,7 @@ SettingsPanel.prototype.updateSetting = function (checkbox) {
         });
     } else {
         $(document).off('mouseover', '.emote');
-    }
+    } 
 
     mainCore.saveSettings();
 };
@@ -1349,7 +1344,8 @@ SettingsPanel.prototype.construct = function () {
         '<div class="scroller-wrap">' +
         '   <div class="scroller settings-wrapper settings-panel">' +
         '       <div class="tab-bar TOP">' +
-        '           <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Settings</div>' +
+        '           <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Core</div>' +
+        '           <div class="tab-bar-item bd-tab" id="bd-emotes-tab" onclick="settingsPanel.changeTab(\'bd-emotes-tab\');">Emotes</div>' +
         '           <div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(\'bd-customcss-tab\');">Custom CSS</div>' +
         '           <div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(\'bd-plugins-tab\');">Plugins</div>' +
         '           <div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(\'bd-themes-tab\');">Themes</div>' +
@@ -1358,12 +1354,11 @@ SettingsPanel.prototype.construct = function () {
         '               <div class="bd-pane control-group" id="bd-settings-pane" style="display:none;">' +
         '                   <ul class="checkbox-group">';
 
-
-
     for (var setting in settings) {
 
         var sett = settings[setting];
         var id = sett["id"];
+        if(sett["cat"] != "core") continue;
 
         if (sett["implemented"] && !sett["hidden"]) {
 
@@ -1381,12 +1376,43 @@ SettingsPanel.prototype.construct = function () {
         }
     }
 
+    settingsInner += '  </ul>' +
+        '           </div>';
+
+
+    settingsInner += '<div class="bd-pane control-group" id="bd-emotes-pane" style="display:none;">' +
+        '                   <ul class="checkbox-group">';
+
+    for (var setting in settings) {
+
+        var sett = settings[setting];
+        var id = sett["id"];
+        if(sett["cat"] != "emote") continue;
+
+        if (sett["implemented"] && !sett["hidden"]) {
+
+            settingsInner += '' +
+                '<li>' +
+                '<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >' +
+                '<div class="checkbox-inner">' +
+                '<input type="checkbox" id="' + id + '" ' + (settingsCookie[id] ? "checked" : "") + '>' +
+                '<span></span>' +
+                '</div>' +
+                '<span>' + setting + " - " + sett["info"] +
+                '</span>' +
+                '</div>' +
+                '</li>';
+        }
+    }
+
+    settingsInner += '  </ul>' +
+        '           </div>';
+
+
     var ccss = atob(localStorage.getItem("bdcustomcss"));
     customCssEditor.applyCustomCss(ccss, true, false);
 
-    settingsInner += '</ul>' +
-        '               </div>' +
-        '' +
+    settingsInner += '' +
         '               <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
         '                   <div id="editor-detached" style="display:none;">' +
         '                       <h3>Editor Detached</h3>' +
diff --git a/js/main.min.js b/js/main.min.js
index 8a2f3082..24ccbd9c 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1,4 +1,4 @@
-var settingsPanel,emoteModule,utils,quickEmoteMenu,opublicServers,voiceMode,pluginModule,themeModule,customCssEditor;var jsVersion=1.63;var supportedVersion="0.2.5";var mainObserver;var twitchEmoteUrlStart="https://static-cdn.jtvnw.net/emoticons/v1/";var twitchEmoteUrlEnd="/1.0";var ffzEmoteUrlStart="https://cdn.frankerfacez.com/emoticon/";var ffzEmoteUrlEnd="/1";var bttvEmoteUrlStart="https://cdn.betterttv.net/emote/";var bttvEmoteUrlEnd="/1x";var mainCore;var settings={"Save logs locally":{"id":"bda-gs-0","info":"Saves chat logs locally","implemented":false,"hidden":false},"Public Servers":{"id":"bda-gs-1","info":"Display public servers button","implemented":true,"hidden":false},"Minimal Mode":{"id":"bda-gs-2","info":"Hide elements and reduce the size of elements.","implemented":true,"hidden":false},"Voice Mode":{"id":"bda-gs-4","info":"Only show voice chat","implemented":true,"hidden":false},"Hide Channels":{"id":"bda-gs-3","info":"Hide channels in minimal mode","implemented":true,"hidden":false},"Dark Mode":{"id":"bda-gs-5","info":"Make certain elements dark by default(wip)","implemented":true,"hidden":false},"Emote Menu":{"id":"bda-es-0","info":"Show Twitch/Favourite emotes in emote menu","implemented":true,"hidden":false},"Emoji Menu":{"id":"bda-es-9","info":"Show/Hide Discord emoji menu","implemented":true,"hidden":false},"Show Emotes":{"id":"bda-es-7","info":"Show any emotes","implemented":true,"hidden":false},"FrankerFaceZ Emotes":{"id":"bda-es-1","info":"Show FrankerFaceZ Emotes","implemented":true,"hidden":false},"BetterTTV Emotes":{"id":"bda-es-2","info":"Show BetterTTV Emotes","implemented":true,"hidden":false},"Emote Autocomplete":{"id":"bda-es-3","info":"Autocomplete emote commands","implemented":false,"hidden":false},"Emote Auto Capitalization":{"id":"bda-es-4","info":"Autocapitalize emote commands","implemented":true,"hidden":false},"Override Default Emotes":{"id":"bda-es-5","info":"Override default emotes","implemented":false,"hidden":false},"Show Names":{"id":"bda-es-6","info":"Show emote names on hover","implemented":true,"hidden":false},"Show emote modifiers":{"id":"bda-es-8","info":"Enable/Disable emote mods","implemented":true,"hidden":false},"Voice Disconnect":{"id":"bda-dc-0","info":"Disconnect from voice server when closing Discord","implemented":true,"hidden":false},"Custom css live update":{"id":"bda-css-0","info":"","implemented":true,"hidden":true},"Custom css auto udpate":{"id":"bda-css-1","info":"","implemented":true,"hidden":true},};var links={"Jiiks.net":{"text":"Jiiks.net","href":"http://jiiks.net","target":"_blank"},"twitter":{"text":"Twitter","href":"http://twitter.com/jiiksi","target":"_blank"},"github":{"text":"Github","href":"http://github.com/jiiks","target":"_blank"}};var defaultCookie={"version":jsVersion,"bda-gs-0":false,"bda-gs-1":true,"bda-gs-2":false,"bda-gs-3":false,"bda-gs-4":false,"bda-gs-5":true,"bda-es-0":true,"bda-es-1":true,"bda-es-2":true,"bda-es-3":false,"bda-es-4":false,"bda-es-5":true,"bda-es-6":true,"bda-es-7":true,"bda-es-8":true,"bda-jd":true,"bda-es-8":true,"bda-dc-0":false,"bda-css-0":false,"bda-css-1":false,"bda-es-9":true};var bdchangelog={"changes":{"darkmode":{"title":"v1.63 : Dark Mode","text":"Dark mode makes certain elements dark by default(currently only applies to emote menu)","img":""},"emotemenu":{"title":"v1.62 : Brand new emote menu that fits in Discord emoji menu!","text":"The emote menu has been replaced by a new one that injects itself in the Discord emoji menu!","img":""},"cccss":{"title":"v1.61 : New custom CSS editor","text":"The custom CSS editor now has options and can be detached!","img":""},"vdc":{"title":"v1.61 : Voice Disconnect","text":"Disconnect from voice server when closing Discord!","img":""},"pslist":{"title":"v1.60 : New public server list!","text":'New and shiny public server list powered by <a href="https://www.discordservers.com/" target="_blank">DiscordServers.com</a>!',"img":""},"api":{"title":"v1.59 : New plugin api callback","text":"Use the `observer(e)` callback instead of creating your own MutationObserver","img":""},"emotemods":{"title":"v1.59 : New emote mods!","text":"The following emote mods have been added: :shake2, :shake3, :flap","img":""},"minmode":{"title":"v1.59: Minimal mode","text":"Minimal mode embed fixed size has been removed","img":""}},"fixes":{"modal":{"title":"v1.62 : Fixed modals","text":"Fixed broken modal introduced by 0.0.287","imt":""},"emotes":{"title":"v1.59 : Native sub emote mods","text":"Emote mods now work with native sub emotes!","img":""},"emotes2":{"title":"v1.59 : Emote mods and custom emotes","text":"Emote mods will no longer interfere with custom emotes using :","img":""}}};var settingsCookie={};function Core(){}
+var settingsPanel,emoteModule,utils,quickEmoteMenu,opublicServers,voiceMode,pluginModule,themeModule,customCssEditor;var jsVersion=1.63;var supportedVersion="0.2.5";var mainObserver;var twitchEmoteUrlStart="https://static-cdn.jtvnw.net/emoticons/v1/";var twitchEmoteUrlEnd="/1.0";var ffzEmoteUrlStart="https://cdn.frankerfacez.com/emoticon/";var ffzEmoteUrlEnd="/1";var bttvEmoteUrlStart="https://cdn.betterttv.net/emote/";var bttvEmoteUrlEnd="/1x";var mainCore;var settings={"Save logs locally":{"id":"bda-gs-0","info":"Saves chat logs locally","implemented":false,"hidden":false,"cat":"core"},"Public Servers":{"id":"bda-gs-1","info":"Display public servers button","implemented":true,"hidden":false,"cat":"core"},"Minimal Mode":{"id":"bda-gs-2","info":"Hide elements and reduce the size of elements.","implemented":true,"hidden":false,"cat":"core"},"Voice Mode":{"id":"bda-gs-4","info":"Only show voice chat","implemented":true,"hidden":false,"cat":"core"},"Hide Channels":{"id":"bda-gs-3","info":"Hide channels in minimal mode","implemented":true,"hidden":false,"cat":"core"},"Dark Mode":{"id":"bda-gs-5","info":"Make certain elements dark by default(wip)","implemented":true,"hidden":false,"cat":"core"},"Override Default Emotes":{"id":"bda-es-5","info":"Override default emotes","implemented":false,"hidden":false,"cat":"core"},"Voice Disconnect":{"id":"bda-dc-0","info":"Disconnect from voice server when closing Discord","implemented":true,"hidden":false,"cat":"core"},"Custom css live update":{"id":"bda-css-0","info":"","implemented":true,"hidden":true,"cat":"core"},"Custom css auto udpate":{"id":"bda-css-1","info":"","implemented":true,"hidden":true,"cat":"core"},"Show Emotes":{"id":"bda-es-7","info":"Show any emotes","implemented":true,"hidden":false,"cat":"emote"},"FrankerFaceZ Emotes":{"id":"bda-es-1","info":"Show FrankerFaceZ Emotes","implemented":true,"hidden":false,"cat":"emote"},"BetterTTV Emotes":{"id":"bda-es-2","info":"Show BetterTTV Emotes","implemented":true,"hidden":false,"cat":"emote"},"Emote Menu":{"id":"bda-es-0","info":"Show Twitch/Favourite emotes in emote menu","implemented":true,"hidden":false,"cat":"emote"},"Emoji Menu":{"id":"bda-es-9","info":"Show Discord emoji menu","implemented":true,"hidden":false,"cat":"emote"},"Emote Autocomplete":{"id":"bda-es-3","info":"Autocomplete emote commands","implemented":false,"hidden":false,"cat":"emote"},"Emote Auto Capitalization":{"id":"bda-es-4","info":"Autocapitalize emote commands","implemented":true,"hidden":false,"cat":"emote"},"Show Names":{"id":"bda-es-6","info":"Show emote names on hover","implemented":true,"hidden":false,"cat":"emote"},"Show emote modifiers":{"id":"bda-es-8","info":"Enable emote mods","implemented":true,"hidden":false,"cat":"emote"},};var links={"Jiiks.net":{"text":"Jiiks.net","href":"http://jiiks.net","target":"_blank"},"twitter":{"text":"Twitter","href":"http://twitter.com/jiiksi","target":"_blank"},"github":{"text":"Github","href":"http://github.com/jiiks","target":"_blank"}};var defaultCookie={"version":jsVersion,"bda-gs-0":false,"bda-gs-1":true,"bda-gs-2":false,"bda-gs-3":false,"bda-gs-4":false,"bda-gs-5":true,"bda-es-0":true,"bda-es-1":true,"bda-es-2":true,"bda-es-3":false,"bda-es-4":false,"bda-es-5":true,"bda-es-6":true,"bda-es-7":true,"bda-es-8":true,"bda-jd":true,"bda-es-8":true,"bda-dc-0":false,"bda-css-0":false,"bda-css-1":false,"bda-es-9":true};var bdchangelog={"changes":{"darkmode":{"title":"v1.63 : Dark Mode","text":"Dark mode makes certain elements dark by default(currently only applies to emote menu)","img":""},"emotemenu":{"title":"v1.62 : Brand new emote menu that fits in Discord emoji menu!","text":"The emote menu has been replaced by a new one that injects itself in the Discord emoji menu!","img":""},"cccss":{"title":"v1.61 : New custom CSS editor","text":"The custom CSS editor now has options and can be detached!","img":""},"vdc":{"title":"v1.61 : Voice Disconnect","text":"Disconnect from voice server when closing Discord!","img":""},"pslist":{"title":"v1.60 : New public server list!","text":'New and shiny public server list powered by <a href="https://www.discordservers.com/" target="_blank">DiscordServers.com</a>!',"img":""},"api":{"title":"v1.59 : New plugin api callback","text":"Use the `observer(e)` callback instead of creating your own MutationObserver","img":""},"emotemods":{"title":"v1.59 : New emote mods!","text":"The following emote mods have been added: :shake2, :shake3, :flap","img":""},"minmode":{"title":"v1.59: Minimal mode","text":"Minimal mode embed fixed size has been removed","img":""}},"fixes":{"modal":{"title":"v1.62 : Fixed modals","text":"Fixed broken modal introduced by 0.0.287","imt":""},"emotes":{"title":"v1.59 : Native sub emote mods","text":"Emote mods now work with native sub emotes!","img":""},"emotes2":{"title":"v1.59 : Emote mods and custom emotes","text":"Emote mods will no longer interfere with custom emotes using :","img":""}}};var settingsCookie={};function Core(){}
 Core.prototype.init=function(){var self=this;if(version<supportedVersion){this.alert("Not Supported","BetterDiscord v"+version+"(your version)"+" is not supported by the latest js("+jsVersion+").<br><br> Please download the latest version from <a href='https://betterdiscord.net' target='_blank'>BetterDiscord.net</a>");return;}
 utils=new Utils();var sock=new BdWSocket();sock.start();utils.getHash();emoteModule=new EmoteModule();quickEmoteMenu=new QuickEmoteMenu();voiceMode=new VoiceMode();emoteModule.init();this.initSettings();this.initObserver();function gwDefer(){console.log(new Date().getTime()+" Defer");if($(".guilds-wrapper .guilds").children().length>0){console.log(new Date().getTime()+" Defer Loaded");var guilds=$(".guilds>li:first-child");var showChannelsButton=$("<button/>",{class:"btn",id:"bd-show-channels",text:"R",css:{"cursor":"pointer"},click:function(){settingsCookie["bda-gs-3"]=false;$("body").removeClass("bd-minimal-chan");self.saveSettings();}});$(".guilds-wrapper").prepend(showChannelsButton);opublicServers=new PublicServers();customCssEditor=new CustomCssEditor();pluginModule=new PluginModule();pluginModule.loadPlugins();if(typeof(themesupport2)!=="undefined"){themeModule=new ThemeModule();themeModule.loadThemes();}
 settingsPanel=new SettingsPanel();settingsPanel.init();quickEmoteMenu.init(false);$("#tc-settings-button").on("click",function(){settingsPanel.show();});window.addEventListener("beforeunload",function(){if(settingsCookie["bda-dc-0"]){$('.btn.btn-disconnect').click();}});opublicServers.init();emoteModule.autoCapitalize();if(settingsCookie["version"]<jsVersion){var cl=self.constructChangelog();$("body").append(cl);settingsCookie["version"]=jsVersion;self.saveSettings();}
@@ -49,7 +49,7 @@ if(settingsCookie["bda-gs-3"]){body.addClass("bd-minimal-chan");}else{body.remov
 if(settingsCookie["bda-gs-4"]){voiceMode.enable();}
 if(settingsCookie["bda-gs-5"]){$("#app-mount").addClass("bda-dark");}
 if(settingsCookie["bda-es-6"]){emoteNamePopup=$("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");$(document).on("mouseover",".emote",function(){var x=$(this).offset();var title=$(this).attr("alt");$(emoteNamePopup).find(".tipsy-inner").text(title);$(emoteNamePopup).css('left',x.left-25);$(emoteNamePopup).css('top',x.top-32);$("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});$(document).on("mouseleave",".emote",function(){$(".tipsy").remove();});}else{$(document).off('mouseover','.emote');}};var customCssInitialized=false;var lastTab="";SettingsPanel.prototype.changeTab=function(tab){var self=this;lastTab=tab;var controlGroups=$("#bd-control-groups");$(".bd-tab").removeClass("selected");$(".bd-pane").hide();$("#"+tab).addClass("selected");$("#"+tab.replace("tab","pane")).show();switch(tab){case"bd-settings-tab":break;case"bd-customcss-tab":if(!customCssInitialized){customCssEditor.init();customCssInitialized=true;}
-break;case"bd-plugins-tab":break;case"bd-themes-tab":controlGroups.html("<span>Coming soon</span>");break;}};SettingsPanel.prototype.updateSetting=function(checkbox){var cb=$(checkbox).children().find('input[type="checkbox"]');var enabled=!cb.is(":checked");var id=cb.attr("id");cb.prop("checked",enabled);if(id=="bda-css-2"){$("#app-mount").removeClass("bd-hide-bd");customCssEditor.hideBackdrop=enabled;if(enabled){$("#app-mount").addClass("bd-hide-bd")}}
+break;}};SettingsPanel.prototype.updateSetting=function(checkbox){var cb=$(checkbox).children().find('input[type="checkbox"]');var enabled=!cb.is(":checked");var id=cb.attr("id");cb.prop("checked",enabled);if(id=="bda-css-2"){$("#app-mount").removeClass("bd-hide-bd");customCssEditor.hideBackdrop=enabled;if(enabled){$("#app-mount").addClass("bd-hide-bd")}}
 settingsCookie[id]=enabled;if(settingsCookie["bda-es-0"]){$("#twitchcord-button-container").show();}else{$("#twitchcord-button-container").hide();}
 if(settingsCookie["bda-gs-2"]){$("body").addClass("bd-minimal");}else{$("body").removeClass("bd-minimal");}
 if(settingsCookie["bda-gs-3"]){$("body").addClass("bd-minimal-chan");}else{$("body").removeClass("bd-minimal-chan");}
@@ -57,8 +57,9 @@ if(settingsCookie["bda-gs-1"]){$("#bd-pub-li").show();}else{$("#bd-pub-li").hide
 if(settingsCookie["bda-gs-4"]){voiceMode.enable();}else{voiceMode.disable();}
 $("#app-mount").removeClass("bda-dark");if(settingsCookie["bda-gs-5"]){$("#app-mount").addClass("bda-dark");}
 if(settingsCookie["bda-es-6"]){emoteNamePopup=$("<div class='tipsy tipsy-se' style='display: block; top: 82px; left: 1630.5px; visibility: visible; opacity: 0.8;'><div class='tipsy-inner'></div></div>");$(document).on("mouseover",".emote",function(){var x=$(this).offset();var title=$(this).attr("alt");$(emoteNamePopup).find(".tipsy-inner").text(title);$(emoteNamePopup).css('left',x.left-25);$(emoteNamePopup).css('top',x.top-32);$("div[data-reactid='.0.1.1']").append($(emoteNamePopup));});$(document).on("mouseleave",".emote",function(){$(".tipsy").remove();});}else{$(document).off('mouseover','.emote');}
-mainCore.saveSettings();};SettingsPanel.prototype.construct=function(){var self=this;panel=$("<div/>",{id:"bd-pane",class:"settings-inner",css:{"display":"none"}});var settingsInner=''+'<div class="scroller-wrap">'+'   <div class="scroller settings-wrapper settings-panel">'+'       <div class="tab-bar TOP">'+'           <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Settings</div>'+'           <div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(\'bd-customcss-tab\');">Custom CSS</div>'+'           <div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(\'bd-plugins-tab\');">Plugins</div>'+'           <div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(\'bd-themes-tab\');">Themes</div>'+'       </div>'+'       <div class="bd-settings">'+'               <div class="bd-pane control-group" id="bd-settings-pane" style="display:none;">'+'                   <ul class="checkbox-group">';for(var setting in settings){var sett=settings[setting];var id=sett["id"];if(sett["implemented"]&&!sett["hidden"]){settingsInner+=''+'<li>'+'<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >'+'<div class="checkbox-inner">'+'<input type="checkbox" id="'+id+'" '+(settingsCookie[id]?"checked":"")+'>'+'<span></span>'+'</div>'+'<span>'+setting+" - "+sett["info"]+'</span>'+'</div>'+'</li>';}}
-var ccss=atob(localStorage.getItem("bdcustomcss"));customCssEditor.applyCustomCss(ccss,true,false);settingsInner+='</ul>'+'               </div>'+''+'               <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">'+'                   <div id="editor-detached" style="display:none;">'+'                       <h3>Editor Detached</h3>'+'                       <button class="btn btn-primary" onclick="customCssEditor.attach(); return false;">Attach</button>'+'                   </div>'+'                   <div id="bd-customcss-innerpane"><textarea id="bd-custom-css-ta">'+ccss+'</textarea></div>'+'               </div>'+''+'               <div class="bd-pane control-group" id="bd-plugins-pane" style="display:none;">'+'                   <table class="bd-g-table">'+'                       <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th><th></th></tr></thead><tbody>';$.each(bdplugins,function(){var plugin=this["plugin"];settingsInner+=''+'<tr>'+'   <td>'+plugin.getName()+'</td>'+'   <td width="99%"><textarea>'+plugin.getDescription()+'</textarea></td>'+'   <td>'+plugin.getAuthor()+'</td>'+'   <td>'+plugin.getVersion()+'</td>'+'   <td><button class="bd-psb" onclick="pluginModule.showSettings(\''+plugin.getName()+'\'); return false;"></button></td>'+'   <td>'+'       <div class="checkbox" onclick="pluginModule.handlePlugin(this);">'+'       <div class="checkbox-inner">'+'               <input id="'+plugin.getName()+'" type="checkbox" '+(pluginCookie[plugin.getName()]?"checked":"")+'>'+'               <span></span>'+'           </div>'+'       </div>'+'   </td>'+'</tr>';});settingsInner+='</tbody></table>'+'               </div>'+'               <div class="bd-pane control-group" id="bd-themes-pane" style="display:none;">';if(typeof(themesupport2)==="undefined"){settingsInner+=''+'                   Your version does not support themes. Download the latest version.';}else{settingsInner+=''+'                   <table class="bd-g-table">'+'                       <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th></tr></thead><tbody>';$.each(bdthemes,function(){settingsInner+=''+'<tr>'+'   <td>'+this["name"].replace(/_/g," ")+'</td>'+'   <td width="99%"><textarea>'+this["description"]+'</textarea></td>'+'   <td>'+this["author"]+'</td>'+'   <td>'+this["version"]+'</td>'+'   <td>'+'       <div class="checkbox" onclick="themeModule.handleTheme(this);">'+'           <div class="checkbox-inner">'+'               <input id="ti'+this["name"]+'" type="checkbox" '+(themeCookie[this["name"]]?"checked":"")+'>'+'               <span></span>'+'           </div>'+'       </div>'+'   </td>'+'</tr>';});settingsInner+='</tbody></table>';}
+mainCore.saveSettings();};SettingsPanel.prototype.construct=function(){var self=this;panel=$("<div/>",{id:"bd-pane",class:"settings-inner",css:{"display":"none"}});var settingsInner=''+'<div class="scroller-wrap">'+'   <div class="scroller settings-wrapper settings-panel">'+'       <div class="tab-bar TOP">'+'           <div class="tab-bar-item bd-tab" id="bd-settings-tab" onclick="settingsPanel.changeTab(\'bd-settings-tab\');">Core</div>'+'           <div class="tab-bar-item bd-tab" id="bd-emotes-tab" onclick="settingsPanel.changeTab(\'bd-emotes-tab\');">Emotes</div>'+'           <div class="tab-bar-item bd-tab" id="bd-customcss-tab" onclick="settingsPanel.changeTab(\'bd-customcss-tab\');">Custom CSS</div>'+'           <div class="tab-bar-item bd-tab" id="bd-plugins-tab" onclick="settingsPanel.changeTab(\'bd-plugins-tab\');">Plugins</div>'+'           <div class="tab-bar-item bd-tab" id="bd-themes-tab" onclick="settingsPanel.changeTab(\'bd-themes-tab\');">Themes</div>'+'       </div>'+'       <div class="bd-settings">'+'               <div class="bd-pane control-group" id="bd-settings-pane" style="display:none;">'+'                   <ul class="checkbox-group">';for(var setting in settings){var sett=settings[setting];var id=sett["id"];if(sett["cat"]!="core")continue;if(sett["implemented"]&&!sett["hidden"]){settingsInner+=''+'<li>'+'<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >'+'<div class="checkbox-inner">'+'<input type="checkbox" id="'+id+'" '+(settingsCookie[id]?"checked":"")+'>'+'<span></span>'+'</div>'+'<span>'+setting+" - "+sett["info"]+'</span>'+'</div>'+'</li>';}}
+settingsInner+='  </ul>'+'           </div>';settingsInner+='<div class="bd-pane control-group" id="bd-emotes-pane" style="display:none;">'+'                   <ul class="checkbox-group">';for(var setting in settings){var sett=settings[setting];var id=sett["id"];if(sett["cat"]!="emote")continue;if(sett["implemented"]&&!sett["hidden"]){settingsInner+=''+'<li>'+'<div class="checkbox" onclick="settingsPanel.updateSetting(this);" >'+'<div class="checkbox-inner">'+'<input type="checkbox" id="'+id+'" '+(settingsCookie[id]?"checked":"")+'>'+'<span></span>'+'</div>'+'<span>'+setting+" - "+sett["info"]+'</span>'+'</div>'+'</li>';}}
+settingsInner+='  </ul>'+'           </div>';var ccss=atob(localStorage.getItem("bdcustomcss"));customCssEditor.applyCustomCss(ccss,true,false);settingsInner+=''+'               <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">'+'                   <div id="editor-detached" style="display:none;">'+'                       <h3>Editor Detached</h3>'+'                       <button class="btn btn-primary" onclick="customCssEditor.attach(); return false;">Attach</button>'+'                   </div>'+'                   <div id="bd-customcss-innerpane"><textarea id="bd-custom-css-ta">'+ccss+'</textarea></div>'+'               </div>'+''+'               <div class="bd-pane control-group" id="bd-plugins-pane" style="display:none;">'+'                   <table class="bd-g-table">'+'                       <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th><th></th></tr></thead><tbody>';$.each(bdplugins,function(){var plugin=this["plugin"];settingsInner+=''+'<tr>'+'   <td>'+plugin.getName()+'</td>'+'   <td width="99%"><textarea>'+plugin.getDescription()+'</textarea></td>'+'   <td>'+plugin.getAuthor()+'</td>'+'   <td>'+plugin.getVersion()+'</td>'+'   <td><button class="bd-psb" onclick="pluginModule.showSettings(\''+plugin.getName()+'\'); return false;"></button></td>'+'   <td>'+'       <div class="checkbox" onclick="pluginModule.handlePlugin(this);">'+'       <div class="checkbox-inner">'+'               <input id="'+plugin.getName()+'" type="checkbox" '+(pluginCookie[plugin.getName()]?"checked":"")+'>'+'               <span></span>'+'           </div>'+'       </div>'+'   </td>'+'</tr>';});settingsInner+='</tbody></table>'+'               </div>'+'               <div class="bd-pane control-group" id="bd-themes-pane" style="display:none;">';if(typeof(themesupport2)==="undefined"){settingsInner+=''+'                   Your version does not support themes. Download the latest version.';}else{settingsInner+=''+'                   <table class="bd-g-table">'+'                       <thead><tr><th>Name</th><th>Description</th><th>Author</th><th>Version</th><th></th></tr></thead><tbody>';$.each(bdthemes,function(){settingsInner+=''+'<tr>'+'   <td>'+this["name"].replace(/_/g," ")+'</td>'+'   <td width="99%"><textarea>'+this["description"]+'</textarea></td>'+'   <td>'+this["author"]+'</td>'+'   <td>'+this["version"]+'</td>'+'   <td>'+'       <div class="checkbox" onclick="themeModule.handleTheme(this);">'+'           <div class="checkbox-inner">'+'               <input id="ti'+this["name"]+'" type="checkbox" '+(themeCookie[this["name"]]?"checked":"")+'>'+'               <span></span>'+'           </div>'+'       </div>'+'   </td>'+'</tr>';});settingsInner+='</tbody></table>';}
 settingsInner+=''+'               </div>'+''+'       </div>'+'   </div>'+'   <div style="background:#2E3136; color:#ADADAD; height:30px; position:absolute; bottom:0; left:0; right:0;">'+'       <span style="line-height:30px;margin-left:10px;">BetterDiscord v'+version+'(JSv'+jsVersion+') by Jiiks</span>'+'       <span style="float:right;line-height:30px;margin-right:10px;"><a href="http://betterdiscord.net" target="_blank">BetterDiscord.net</a></span>'+'   </div>'+'</div>';function showSettings(){$(".tab-bar-item").removeClass("selected");settingsButton.addClass("selected");$(".form .settings-right .settings-inner").first().hide();panel.show();if(lastTab==""){self.changeTab("bd-settings-tab");}else{self.changeTab(lastTab);}}
 settingsButton=$("<div/>",{class:"tab-bar-item",text:"BetterDiscord",id:"bd-settings-new",click:showSettings});panel.html(settingsInner);function defer(){if($(".btn.btn-settings").length<1){setTimeout(defer,100);}else{$(".btn.btn-settings").first().on("click",function(){function innerDefer(){if($(".modal-inner").first().is(":visible")){panel.hide();var tabBar=$(".tab-bar.SIDE").first();$(".tab-bar.SIDE .tab-bar-item").click(function(){$(".form .settings-right .settings-inner").first().show();$("#bd-settings-new").removeClass("selected");panel.hide();});tabBar.append(settingsButton);$(".form .settings-right .settings-inner").last().after(panel);$("#bd-settings-new").removeClass("selected");}else{setTimeout(innerDefer,100);}}
 innerDefer();});}}