From 45d3ec2cc020c8ca514ad16aaedca326e2ca2463 Mon Sep 17 00:00:00 2001
From: pohky <otoriosu@gmail.com>
Date: Fri, 8 Jan 2016 16:33:43 +0100
Subject: [PATCH] compact mode fix

---
 js/main.js     | 1232 +++++++++++++++++++++++++++---------------------
 js/main.min.js |    7 +-
 2 files changed, 707 insertions(+), 532 deletions(-)

diff --git a/js/main.js b/js/main.js
index a215de6b..70f6d9f8 100644
--- a/js/main.js
+++ b/js/main.js
@@ -5,8 +5,6 @@
  * Last Update: 24/010/2015 - 17:27
  * https://github.com/Jiiks/BetterDiscordApp
  */
-
-
 var settingsPanel, emoteModule, utils, quickEmoteMenu, opublicServers, voiceMode, pluginModule, themeModule;
 var jsVersion = 1.57;
 var supportedVersion = "0.2.3";
@@ -36,7 +34,7 @@ var settings = {
     "Emote Auto Capitalization":  { "id": "bda-es-4", "info": "Autocapitalize emote commands",                  "implemented": true  },
     "Override Default Emotes":    { "id": "bda-es-5", "info": "Override default emotes",                        "implemented": false },
     "Show Names":                 { "id": "bda-es-6", "info": "Show emote names on hover",                      "implemented": true  }
-}
+};
 
 var links = {
     "Jiiks.net": { "text": "Jiiks.net", "href": "http://jiiks.net",          "target": "_blank" },
@@ -45,7 +43,7 @@ var links = {
 };
 
 var defaultCookie = {
-    "version":  jsVersion,
+    "version": jsVersion,
     "bda-gs-0": false,
     "bda-gs-1": true,
     "bda-gs-2": false,
@@ -59,7 +57,7 @@ var defaultCookie = {
     "bda-es-5": true,
     "bda-es-6": true,
     "bda-es-7": true,
-    "bda-jd":   true
+    "bda-jd": true
 };
 
 var bdchangelog = {
@@ -81,7 +79,7 @@ var bdchangelog = {
             "text": "Discord sub emotes are now replaced by BetterDiscord sub emotes and can be favorited!",
             "img": ""
         }
-	},
+    },
     "upcoming": {
         "ignore": {
             "title": "Ignore User!",
@@ -95,16 +93,16 @@ var settingsCookie = {};
 
 function Core() {}
 
-Core.prototype.init = function() {
+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>");
+    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();
@@ -122,11 +120,30 @@ Core.prototype.init = function() {
     //Incase were too fast
     function gwDefer() {
         console.log(new Date().getTime() + " Defer");
-        if($(".guilds-wrapper .guilds").children().length > 0) {
+        if ($(".guilds-wrapper .guilds").children().length > 0) {
             console.log(new Date().getTime() + " Defer Loaded");
             var guilds = $(".guilds li:first-child");
 
-            guilds.after($("<li></li>", { id: "bd-pub-li", css: { "height": "20px", "display": settingsCookie["bda-gs-1"] == true ? "" : "none" } }).append($("<div/>", { class: "guild-inner", css: { "height": "20px", "border-radius": "4px" } }).append($("<a/>").append($("<div/>", { css: { "line-height": "20px", "font-size": "12px" }, text: "public", id: "bd-pub-button" })))));
+            guilds.after($("<li></li>", {
+                id: "bd-pub-li",
+                css: {
+                    "height": "20px",
+                    "display": settingsCookie["bda-gs-1"] == true ? "" : "none"
+                }
+            }).append($("<div/>", {
+                class: "guild-inner",
+                css: {
+                    "height": "20px",
+                    "border-radius": "4px"
+                }
+            }).append($("<a/>").append($("<div/>", {
+                css: {
+                    "line-height": "20px",
+                    "font-size": "12px"
+                },
+                text: "public",
+                id: "bd-pub-button"
+            })))));
 
             var showChannelsButton = $("<button/>", {
                 class: "btn",
@@ -135,7 +152,7 @@ Core.prototype.init = function() {
                 css: {
                     "cursor": "pointer"
                 },
-                click: function() {
+                click: function () {
                     settingsCookie["bda-gs-3"] = false;
                     $("body").removeClass("bd-minimal-chan");
                     self.saveSettings();
@@ -148,7 +165,7 @@ Core.prototype.init = function() {
 
             pluginModule = new PluginModule();
             pluginModule.loadPlugins();
-            if(typeof(themesupport2) !== "undefined") {
+            if (typeof (themesupport2) !== "undefined") {
                 themeModule = new ThemeModule();
                 themeModule.loadThemes();
             }
@@ -158,8 +175,12 @@ Core.prototype.init = function() {
 
             quickEmoteMenu.init(false);
 
-            $("#tc-settings-button").on("click", function() { settingsPanel.show(); });
-            $("#bd-pub-button").on("click", function() { opublicServers.show(); });
+            $("#tc-settings-button").on("click", function () {
+                settingsPanel.show();
+            });
+            $("#bd-pub-button").on("click", function () {
+                opublicServers.show();
+            });
 
             opublicServers.init();
 
@@ -169,7 +190,7 @@ Core.prototype.init = function() {
 
 
             /*Display new features in BetterDiscord*/
-            if(settingsCookie["version"] < jsVersion) {
+            if (settingsCookie["version"] < jsVersion) {
                 var cl = self.constructChangelog();
                 $("body").append(cl);
                 settingsCookie["version"] = jsVersion;
@@ -185,20 +206,20 @@ Core.prototype.init = function() {
     }
 
 
-    $(document).ready(function() {
+    $(document).ready(function () {
         setTimeout(gwDefer, 1000);
     });
 };
 
-Core.prototype.initSettings = function() {
-    if($.cookie("better-discord") == undefined) {
+Core.prototype.initSettings = function () {
+    if ($.cookie("better-discord") == undefined) {
         settingsCookie = defaultCookie;
         this.saveSettings();
     } else {
         this.loadSettings();
 
-        for(var setting in defaultCookie) {
-            if(settingsCookie[setting] == undefined) {
+        for (var setting in defaultCookie) {
+            if (settingsCookie[setting] == undefined) {
                 settingsCookie[setting] = defaultCookie[setting];
                 this.saveSettings();
             }
@@ -206,36 +227,47 @@ Core.prototype.initSettings = function() {
     }
 };
 
-Core.prototype.saveSettings = function() {
-    $.cookie("better-discord", JSON.stringify(settingsCookie), { expires: 365, path: '/' });
+Core.prototype.saveSettings = function () {
+    $.cookie("better-discord", JSON.stringify(settingsCookie), {
+        expires: 365,
+        path: '/'
+    });
 };
 
-Core.prototype.loadSettings = function() {
+Core.prototype.loadSettings = function () {
     settingsCookie = JSON.parse($.cookie("better-discord"));
 };
 var botlist = ["119598467310944259"]; //Temp
-Core.prototype.initObserver = function() {
+Core.prototype.initObserver = function () {
 
-    mainObserver = new MutationObserver(function(mutations) {
-        mutations.forEach(function(mutation) {
-            if(mutation.target.getAttribute('class') != null) {
-                if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
+    mainObserver = new MutationObserver(function (mutations) {
+        mutations.forEach(function (mutation) {
+            if (mutation.target.getAttribute('class') != null) {
+                if (mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
                     quickEmoteMenu.obsCallback();
                     voiceMode.obsCallback();
-                    if(typeof pluginModule !== "undefined") pluginModule.channelSwitch();
-                    $(".message-group").each(function() {
-                        var a = $(this).find(".avatar-large").css("background-image").match(/\d+/).toString();
-                        if(botlist.indexOf(a) > -1) {
-                            $(this).find(".user-name").addClass("boticon");
+                    if (typeof pluginModule !== "undefined") pluginModule.channelSwitch();
+                    $(".message-group").each(function () {
+                        var a = $(this).find(".avatar-large");
+                        if (a.length > 0) {
+                            var b = a.css("background-image").match(/\d+/).toString();
+                            if (botlist.indexOf(a) > -1) {
+                                $(this).find(".user-name").addClass("boticon");
+                            }
                         }
                     });
                 }
-                if(mutation.target.getAttribute('class').indexOf('scroller messages') != -1) {
+                if (mutation.target.getAttribute('class').indexOf('scroller messages') != -1) {
                     var lastMessage = $(".message-group").last();
-                    if(lastMessage != undefined) {
-                        if(botlist.indexOf(lastMessage.find(".avatar-large").css("background-image").match(/\d+/).toString()) > -1) { lastMessage.find(".user-name").addClass("boticon"); }
+                    if (lastMessage != undefined) {
+                        var a = lastMessage.find(".avatar-large");
+                        if (a.length > 0) {
+                            if (botlist.indexOf(a.css("background-image").match(/\d+/).toString()) > -1) {
+                                lastMessage.find(".user-name").addClass("boticon");
+                            }
+                        }
                     }
-			        if(typeof pluginModule !== "undefined")  pluginModule.newMessage();
+                    if (typeof pluginModule !== "undefined") pluginModule.newMessage();
                 }
             }
             emoteModule.obsCallback(mutation);
@@ -244,10 +276,13 @@ Core.prototype.initObserver = function() {
     });
 
     //noinspection JSCheckFunctionSignatures
-    mainObserver.observe(document, { childList: true, subtree: true });
+    mainObserver.observe(document, {
+        childList: true,
+        subtree: true
+    });
 };
 
-Core.prototype.constructChangelog = function() {
+Core.prototype.constructChangelog = function () {
     var changeLog = '' +
         '<div id="bd-wn-modal" class="modal" style="opacity:1;">' +
         '  <div class="modal-inner">' +
@@ -259,60 +294,60 @@ Core.prototype.constructChangelog = function() {
         '           <div class="scroller-wrap">' +
         '               <div class="scroller">';
 
-    if(bdchangelog.changes != null) {
+    if (bdchangelog.changes != null) {
         changeLog += '' +
             '<h1 class="changelog-added">' +
             '   <span>New Stuff</span>' +
             '</h1>' +
             '<ul>';
 
-        for(var change in bdchangelog.changes) {
+        for (var change in bdchangelog.changes) {
             change = bdchangelog.changes[change];
 
             changeLog += '' +
                 '<li>' +
-                '   <strong>'+change.title+'</strong>' +
-                '   <div>'+change.text+'</div>' +
+                '   <strong>' + change.title + '</strong>' +
+                '   <div>' + change.text + '</div>' +
                 '</li>';
         }
 
         changeLog += '</ul>';
     }
 
-    if(bdchangelog.fixes != null) {
+    if (bdchangelog.fixes != null) {
         changeLog += '' +
             '<h1 class="changelog-fixed">' +
             '   <span>Fixed</span>' +
             '</h1>' +
             '<ul>';
 
-        for(var fix in bdchangelog.fixes) {
+        for (var fix in bdchangelog.fixes) {
             fix = bdchangelog.fixes[fix];
 
             changeLog += '' +
                 '<li>' +
-                '   <strong>'+fix.title+'</strong>' +
-                '   <div>'+fix.text+'</div>' +
+                '   <strong>' + fix.title + '</strong>' +
+                '   <div>' + fix.text + '</div>' +
                 '</li>';
         }
 
         changeLog += '</ul>';
     }
 
-    if(bdchangelog.upcoming != null) {
+    if (bdchangelog.upcoming != null) {
         changeLog += '' +
             '<h1 class="changelog-in-progress">' +
             '   <span>Coming Soon</span>' +
             '</h1>' +
             '<ul>';
 
-        for(var upc in bdchangelog.upcoming) {
+        for (var upc in bdchangelog.upcoming) {
             upc = bdchangelog.upcoming[upc];
 
             changeLog += '' +
                 '<li>' +
-                '   <strong>'+upc.title+'</strong>' +
-                '   <div>'+upc.text+'</div>' +
+                '   <strong>' + upc.title + '</strong>' +
+                '   <div>' + upc.text + '</div>' +
                 '</li>';
         }
 
@@ -331,19 +366,19 @@ Core.prototype.constructChangelog = function() {
     return changeLog;
 };
 
-Core.prototype.alert = function(title, text) {
+Core.prototype.alert = function (title, text) {
     $("body").append('' +
-                    '<div class="bd-alert">' +
-                    '   <div class="bd-alert-header">' +
-                    '       <span>'+title+'</span>' +
-                    '       <div class="bd-alert-closebtn" onclick="$(this).parent().parent().remove();">×</div>' +
-                    '   </div>' + 
-                    '   <div class="bd-alert-body">' +
-                    '       <div class="scroller-wrap dark fade">' + 
-                    '           <div class="scroller">'+text+'</div>' +
-                    '       </div>' +
-                    '   </div>' +
-                    '</div>');  
+        '<div class="bd-alert">' +
+        '   <div class="bd-alert-header">' +
+        '       <span>' + title + '</span>' +
+        '       <div class="bd-alert-closebtn" onclick="$(this).parent().parent().remove();">×</div>' +
+        '   </div>' +
+        '   <div class="bd-alert-body">' +
+        '       <div class="scroller-wrap dark fade">' +
+        '           <div class="scroller">' + text + '</div>' +
+        '       </div>' +
+        '   </div>' +
+        '</div>');
 };
 
 /* BetterDiscordApp EmoteModule JavaScript
@@ -363,37 +398,43 @@ Core.prototype.alert = function(title, text) {
 
 var emotesFfz = {};
 var emotesBTTV = {};
-var emotesTwitch = { "emotes": { "emote": { "image_id": 0 } } }; //for ide
+var emotesTwitch = {
+    "emotes": {
+        "emote": {
+            "image_id": 0
+        }
+    }
+}; //for ide
 var subEmotesTwitch = {};
 
-function EmoteModule() {
-}
+function EmoteModule() {}
 
-EmoteModule.prototype.init = function() {
+EmoteModule.prototype.init = function () {};
+
+EmoteModule.prototype.getBlacklist = function () {
+    $.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/" + _hash + "/emotefilter.json", function (data) {
+        bemotes = data.blacklist;
+    });
 };
 
-EmoteModule.prototype.getBlacklist = function() {
-    $.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/"+_hash+"/emotefilter.json", function(data) { bemotes = data.blacklist; });
-};
-
-EmoteModule.prototype.obsCallback = function(mutation) {
+EmoteModule.prototype.obsCallback = function (mutation) {
     var self = this;
 
-    if(!settingsCookie["bda-es-7"]) return;
-    
-    $(".emoji").each(function() {
+    if (!settingsCookie["bda-es-7"]) return;
+
+    $(".emoji").each(function () {
         var t = $(this);
-        if(t.attr("src").indexOf(".png") != -1) {
+        if (t.attr("src").indexOf(".png") != -1) {
             t.replaceWith("<span>" + t.attr("alt") + "</span>");
         }
     });
 
-    for(var i = 0 ; i < mutation.addedNodes.length ; ++i) {
+    for (var i = 0; i < mutation.addedNodes.length; ++i) {
         var next = mutation.addedNodes.item(i);
-        if(next) {
+        if (next) {
             var nodes = self.getNodes(next);
-            for(var node in nodes) {
-                if(nodes.hasOwnProperty(node)) {
+            for (var node in nodes) {
+                if (nodes.hasOwnProperty(node)) {
                     self.injectEmote(nodes[node]);
                 }
             }
@@ -401,13 +442,13 @@ EmoteModule.prototype.obsCallback = function(mutation) {
     }
 };
 
-EmoteModule.prototype.getNodes = function(node) {
+EmoteModule.prototype.getNodes = function (node) {
     var next;
     var nodes = [];
 
     var treeWalker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT, null, false);
 
-    while(next = treeWalker.nextNode()) {
+    while (next = treeWalker.nextNode()) {
         nodes.push(next);
     }
 
@@ -418,47 +459,49 @@ EmoteModule.prototype.getNodes = function(node) {
 var bemotes = [];
 var spoilered = [];
 
-EmoteModule.prototype.injectEmote = function(node) {
+EmoteModule.prototype.injectEmote = function (node) {
 
-    if(typeof emotesTwitch === 'undefined') return;
+    if (typeof emotesTwitch === 'undefined') return;
 
-    if(!node.parentElement) return;
+    if (!node.parentElement) return;
 
     var parent = node.parentElement;
-    
-    if(parent.tagName != "SPAN") return;
-  
+
+    if (parent.tagName != "SPAN") return;
+
     var edited = false;
-    
-    if($(parent.parentElement).hasClass("edited")) {
+
+    if ($(parent.parentElement).hasClass("edited")) {
         parent = parent.parentElement.parentElement.firstChild; //:D
         edited = true;
     }
-    
+
     //if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) return;
 
     function inject() {
-        if(!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) { return; }
+        if (!$(parent.parentElement).hasClass("markup") && !$(parent.parentElement).hasClass("message-content")) {
+            return;
+        }
 
         var parentInnerHTML = parent.innerHTML;
-        
+
         var words = parentInnerHTML.split(/\s+/g);
 
-        if(!words) return;
+        if (!words) return;
 
-        words.some(function(word) {
-            if(word.slice(0, 4) == "[!s]" ) {
+        words.some(function (word) {
+            if (word.slice(0, 4) == "[!s]") {
 
                 parentInnerHTML = parentInnerHTML.replace("[!s]", "");
                 var markup = $(parent).parent();
                 var reactId = markup.attr("data-reactid");
-                
-                if(spoilered.indexOf(reactId) > -1) {
+
+                if (spoilered.indexOf(reactId) > -1) {
                     return;
                 }
 
                 markup.addClass("spoiler");
-                markup.on("click", function() {
+                markup.on("click", function () {
                     $(this).removeClass("spoiler");
                     spoilered.push($(this).attr("data-reactid"));
                 });
@@ -466,22 +509,22 @@ EmoteModule.prototype.injectEmote = function(node) {
                 return;
             }
 
-            if(word.length < 4) {
+            if (word.length < 4) {
                 return;
             }
 
-			if(word == "ClauZ") {
-				parentInnerHTML = parentInnerHTML.replace("ClauZ", '<img src="https://cdn.frankerfacez.com/emoticon/70852/1" style="width:25px; transform:translate(-29px, -14px);"></img>');
-				return;
-			}
+            if (word == "ClauZ") {
+                parentInnerHTML = parentInnerHTML.replace("ClauZ", '<img src="https://cdn.frankerfacez.com/emoticon/70852/1" style="width:25px; transform:translate(-29px, -14px);"></img>');
+                return;
+            }
 
-            if($.inArray(word, bemotes) != -1) return;
+            if ($.inArray(word, bemotes) != -1) return;
 
             if (emotesTwitch.emotes.hasOwnProperty(word)) {
                 var len = Math.round(word.length / 4);
-                var name =  word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
+                var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
                 var url = twitchEmoteUrlStart + emotesTwitch.emotes[word].image_id + twitchEmoteUrlEnd;
-                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
+                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
                 return;
             }
 
@@ -490,8 +533,8 @@ EmoteModule.prototype.injectEmote = function(node) {
                     var len = Math.round(word.length / 4);
                     var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
                     var url = ffzEmoteUrlStart + emotesFfz[word] + ffzEmoteUrlEnd;
-                    
-                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
+
+                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
                     return;
                 }
             }
@@ -501,17 +544,17 @@ EmoteModule.prototype.injectEmote = function(node) {
                     var len = Math.round(word.length / 4);
                     var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
                     var url = emotesBTTV[word];
-                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
+                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
                     return;
                 }
             }
-              
-            if(typeof emotesBTTV2 !== 'undefined' && settingsCookie["bda-es-2"]) {
-                if(emotesBTTV2.hasOwnProperty(word)) {
+
+            if (typeof emotesBTTV2 !== 'undefined' && settingsCookie["bda-es-2"]) {
+                if (emotesBTTV2.hasOwnProperty(word)) {
                     var len = Math.round(word.length / 4);
                     var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
-                    var url = bttvEmoteUrlStart + emotesBTTV2[word]  + bttvEmoteUrlEnd;
-                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
+                    var url = bttvEmoteUrlStart + emotesBTTV2[word] + bttvEmoteUrlEnd;
+                    parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
                     return;
                 }
             }
@@ -520,12 +563,12 @@ EmoteModule.prototype.injectEmote = function(node) {
                 var len = Math.round(word.length / 4);
                 var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
                 var url = twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd;
-                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"'+name+'\", \"'+url+'\");\' class="fav" title="Favorite!" type="button"></div>');
+                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
                 return;
             }
         });
 
-        if(parent.parentElement == null) return;
+        if (parent.parentElement == null) return;
 
         var oldHeight = parent.parentElement.offsetHeight;
         parent.innerHTML = parentInnerHTML.replace(new RegExp("\uFDD9", "g"), "");
@@ -534,42 +577,42 @@ EmoteModule.prototype.injectEmote = function(node) {
         //Scrollfix
         var scrollPane = $(".scroller.messages").first();
         scrollPane.scrollTop(scrollPane.scrollTop() + (newHeight - oldHeight));
-   } 
-   
-   if(edited) {
-       setTimeout(inject, 250);
-   } else {
-       inject();
-   }
-   
+    }
+
+    if (edited) {
+        setTimeout(inject, 250);
+    } else {
+        inject();
+    }
+
 };
 
-EmoteModule.prototype.autoCapitalize = function() {
+EmoteModule.prototype.autoCapitalize = function () {
 
     var self = this;
 
-    $('body').delegate($(".channel-textarea-inner textarea"), 'keyup change paste', function() {
-        if(!settingsCookie["bda-es-4"]) return;
+    $('body').delegate($(".channel-textarea-inner textarea"), 'keyup change paste', function () {
+        if (!settingsCookie["bda-es-4"]) return;
 
         var text = $(".channel-textarea-inner textarea").val();
 
-        if(text == undefined) return;
+        if (text == undefined) return;
 
         var lastWord = text.split(" ").pop();
-        if(lastWord.length > 3) {
-			if(lastWord == "danSgame") return;
+        if (lastWord.length > 3) {
+            if (lastWord == "danSgame") return;
             var ret = self.capitalize(lastWord.toLowerCase());
-            if(ret !== null && ret !== undefined) {
+            if (ret !== null && ret !== undefined) {
                 $(".channel-textarea-inner textarea").val(text.replace(lastWord, ret));
             }
         }
     });
 };
 
-EmoteModule.prototype.capitalize = function(value) {
+EmoteModule.prototype.capitalize = function (value) {
     var res = emotesTwitch.emotes;
-    for(var p in res){
-        if(res.hasOwnProperty(p) && value == (p+ '').toLowerCase()){
+    for (var p in res) {
+        if (res.hasOwnProperty(p) && value == (p + '').toLowerCase()) {
             return p;
         }
     }
@@ -582,17 +625,27 @@ EmoteModule.prototype.capitalize = function(value) {
  * https://github.com/Jiiks/BetterDiscordApp
  */
 
-var publicServers = { "servers": { "server": { "code": 0, "icon": null, "title": "title", "language": "EN", "description": "description" } } }; //for ide
+var publicServers = {
+    "servers": {
+        "server": {
+            "code": 0,
+            "icon": null,
+            "title": "title",
+            "language": "EN",
+            "description": "description"
+        }
+    }
+}; //for ide
 
 function PublicServers() {
 
 }
 
-PublicServers.prototype.getPanel = function() {
+PublicServers.prototype.getPanel = function () {
     return this.container;
 };
 
-PublicServers.prototype.init = function() {
+PublicServers.prototype.init = function () {
 
     var self = this;
 
@@ -611,7 +664,7 @@ PublicServers.prototype.init = function() {
 
     $("<span/>", {
         id: "bd-ps-close",
-        style:"cursor:pointer;",
+        style: "cursor:pointer;",
         text: "X"
     }).appendTo(header);
 
@@ -624,7 +677,7 @@ PublicServers.prototype.init = function() {
     psbody.appendTo(this.getPanel());
 
     var table = $("<table/>", {
-        border:"0"
+        border: "0"
     });
 
     var thead = $("<thead/>");
@@ -657,12 +710,14 @@ PublicServers.prototype.init = function() {
 
     $("body").append(this.getPanel());
 
-    $("#bd-ps-close").on("click", function() { self.show(); });
+    $("#bd-ps-close").on("click", function () {
+        self.show();
+    });
 
     var servers = publicServers.servers;
 
-    for(var server in servers) {
-        if(servers.hasOwnProperty(server)) {
+    for (var server in servers) {
+        if (servers.hasOwnProperty(server)) {
             var s = servers[server];
             var code = s.code;
             var title = s.title;
@@ -674,7 +729,7 @@ PublicServers.prototype.init = function() {
     }
 };
 
-PublicServers.prototype.addServer = function(name, code, title, language, description) {
+PublicServers.prototype.addServer = function (name, code, title, language, description) {
     var self = this;
     var tableBody = $("#bd-ps-tbody");
 
@@ -692,8 +747,8 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
 
     tr.append($("<td/>", {
         css: {
-            "-webkit-user-select":"initial",
-            "user-select":"initial"
+            "-webkit-user-select": "initial",
+            "user-select": "initial"
         },
         text: code
     }));
@@ -715,23 +770,25 @@ PublicServers.prototype.addServer = function(name, code, title, language, descri
             "outline": "1px solid #000",
             "color": "#EDEDED"
         },
-        click: function() { self.joinServer(code); }
+        click: function () {
+            self.joinServer(code);
+        }
     })));
 
     tableBody.append(tr);
 };
 
-PublicServers.prototype.show = function() {
+PublicServers.prototype.show = function () {
     this.getPanel().toggle();
     var li = $("#bd-pub-li");
     li.removeClass();
-    if(this.getPanel().is(":visible")) {
+    if (this.getPanel().is(":visible")) {
         li.addClass("active");
     }
 };
 
 //Workaround for joining a server
-PublicServers.prototype.joinServer = function(code) {
+PublicServers.prototype.joinServer = function (code) {
     $(".guilds-add").click();
     $(".action.join .btn").click();
     $(".create-guild-container input").val(code);
@@ -753,27 +810,33 @@ function QuickEmoteMenu() {
 
 }
 
-QuickEmoteMenu.prototype.init = function(reload) {
+QuickEmoteMenu.prototype.init = function (reload) {
 
     emoteBtn = null;
     $(".channel-textarea").first().removeClass("emotemenu-enabled");
-    if(!emoteMenu) {
+    if (!emoteMenu) {
         this.initEmoteList();
     }
 
     var menuOpen;
 
-    emoteBtn = $("<div/>", { id:"twitchcord-button-container", style:"display:none" }).append($("<button/>", { id: "twitchcord-button", onclick: "return false;" }));
+    emoteBtn = $("<div/>", {
+        id: "twitchcord-button-container",
+        style: "display:none"
+    }).append($("<button/>", {
+        id: "twitchcord-button",
+        onclick: "return false;"
+    }));
 
     $(".content.flex-spacer.flex-horizontal .flex-spacer.flex-vertical form").append(emoteBtn);
 
     emoteMenu.detach();
     emoteBtn.append(emoteMenu);
 
-    $("#twitchcord-button").on("click", function() {
+    $("#twitchcord-button").on("click", function () {
         menuOpen = !menuOpen;
-        if(menuOpen) {
-            $("#bdemotemenustyle").html('.twitchcord-button-open { background-image:url(https://static-cdn.jtvnw.net/emoticons/v1/'+eiarr[Math.floor(Math.random()*eiarr.length)]+'/1.0) !important; }');
+        if (menuOpen) {
+            $("#bdemotemenustyle").html('.twitchcord-button-open { background-image:url(https://static-cdn.jtvnw.net/emoticons/v1/' + eiarr[Math.floor(Math.random() * eiarr.length)] + '/1.0) !important; }');
             emoteMenu.addClass("emotemenu-open");
             $(this).addClass("twitchcord-button-open");
         } else {
@@ -782,18 +845,21 @@ QuickEmoteMenu.prototype.init = function(reload) {
         }
         return false;
     });
-    
-    $(document).off("click.bdem").on("click.bdem", function() {
-        if(menuOpen) {
+
+    $(document).off("click.bdem").on("click.bdem", function () {
+        if (menuOpen) {
             menuOpen = !menuOpen;
             emoteMenu.removeClass();
             $("#twitchcord-button").removeClass();
         }
     });
-    
-    $("#emote-menu").on("click", function() { $("#rmenu").hide(); return false; });
 
-    if(settingsCookie["bda-es-0"]) {
+    $("#emote-menu").on("click", function () {
+        $("#rmenu").hide();
+        return false;
+    });
+
+    if (settingsCookie["bda-es-0"]) {
         $(".channel-textarea").first().addClass("emotemenu-enabled");
         emoteBtn.show();
     }
@@ -801,14 +867,14 @@ QuickEmoteMenu.prototype.init = function(reload) {
     var emoteIcon = $(".emote-icon");
 
     emoteIcon.off();
-    emoteIcon.on("click", function() {
+    emoteIcon.on("click", function () {
         var emote = $(this).attr("title");
         var ta = $(".channel-textarea-inner textarea");
         ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote);
     });
-    
+
     var fe = localStorage["bdfavemotes"];
-    if(fe != undefined) {
+    if (fe != undefined) {
         favoriteEmotes = JSON.parse(atob(fe));
         this.updateFavorites();
     }
@@ -816,14 +882,14 @@ QuickEmoteMenu.prototype.init = function(reload) {
 
 var bdfw = {};
 
-QuickEmoteMenu.prototype.obsCallback = function() {
+QuickEmoteMenu.prototype.obsCallback = function () {
 
-    if(!emoteBtn) return;
-    if(!$(".content.flex-spacer.flex-horizontal .flex-spacer.flex-vertical form")) return;
+    if (!emoteBtn) return;
+    if (!$(".content.flex-spacer.flex-horizontal .flex-spacer.flex-vertical form")) return;
 
     var tcbtn = $("#twitchcord-button-container");
 
-    if(tcbtn.parent().prop("tagName") == undefined) {
+    if (tcbtn.parent().prop("tagName") == undefined) {
         quickEmoteMenu = new QuickEmoteMenu();
         quickEmoteMenu.init(true);
     }
@@ -831,54 +897,97 @@ QuickEmoteMenu.prototype.obsCallback = function() {
 
 var favoriteEmotes = {};
 
-QuickEmoteMenu.prototype.initEmoteList = function() {
+QuickEmoteMenu.prototype.initEmoteList = function () {
 
-    emoteMenu = $("<div/>", { id: "emote-menu" });
+    emoteMenu = $("<div/>", {
+        id: "emote-menu"
+    });
+
+    var emoteMenuHeader = $("<div/>", {
+        id: "emote-menu-header"
+    });
+    var emoteMenuBody = $("<div/>", {
+        id: "emote-menu-inner"
+    });
+    var emoteMenuBodyFav = $("<div/>", {
+        id: "emote-menu-inner-fav",
+        css: {
+            "display": "none"
+        }
+    })
+
+    var globalTab = $("<div/>", {
+        class: "emote-menu-tab emote-menu-tab-selected",
+        id: "emgb",
+        text: "Global",
+        click: function () {
+            $("#emfa").removeClass("emote-menu-tab-selected");
+            $("#emgb").addClass("emote-menu-tab-selected");
+            $("#emote-menu-inner-fav").hide();
+            $("#emote-menu-inner").show();
+        }
+    });
+    var favoriteTab = $("<div/>", {
+        class: "emote-menu-tab",
+        id: "emfa",
+        text: "Favorite",
+        click: function () {
+            $("#emgb").removeClass("emote-menu-tab-selected");
+            $("#emfa").addClass("emote-menu-tab-selected");
+            $("#emote-menu-inner").hide();
+            $("#emote-menu-inner-fav").show();
+        }
+    });
 
-    var emoteMenuHeader = $("<div/>", { id: "emote-menu-header" });
-    var emoteMenuBody = $("<div/>", { id: "emote-menu-inner" });
-    var emoteMenuBodyFav = $("<div/>", { id: "emote-menu-inner-fav", css: { "display": "none" }})
-    
-    var globalTab = $("<div/>", {class: "emote-menu-tab emote-menu-tab-selected", id: "emgb", text: "Global", click: function() { $("#emfa").removeClass("emote-menu-tab-selected"); $("#emgb").addClass("emote-menu-tab-selected"); $("#emote-menu-inner-fav").hide(); $("#emote-menu-inner").show(); }});
-    var favoriteTab = $("<div/>", {class: "emote-menu-tab", id: "emfa", text: "Favorite", click: function() { $("#emgb").removeClass("emote-menu-tab-selected"); $("#emfa").addClass("emote-menu-tab-selected"); $("#emote-menu-inner").hide(); $("#emote-menu-inner-fav").show(); }});
-    
     emoteMenuHeader.append(globalTab);
     emoteMenuHeader.append(favoriteTab);
-    
+
     emoteMenu.append(emoteMenuHeader);
-    
-    var swrapper = $("<div/>", { class: "scroller-wrap" });
-    var scroller = $("<div/>", { class: "scroller"});
-    
-    
+
+    var swrapper = $("<div/>", {
+        class: "scroller-wrap"
+    });
+    var scroller = $("<div/>", {
+        class: "scroller"
+    });
+
+
     swrapper.append(scroller);
     scroller.append(emoteMenuBody);
     scroller.append(emoteMenuBodyFav);
-    
+
     emoteMenu.append(swrapper);
 
-    for(var emote in emotesTwitch.emotes) {
-        if(emotesTwitch.emotes.hasOwnProperty(emote)) {
+    for (var emote in emotesTwitch.emotes) {
+        if (emotesTwitch.emotes.hasOwnProperty(emote)) {
             var id = emotesTwitch.emotes[emote].image_id;
-            emoteMenuBody.append($("<div/>" , { class: "emote-container" }).append($("<img/>", { class: "emote-icon", id: emote, alt: "", src: "https://static-cdn.jtvnw.net/emoticons/v1/"+id+"/1.0", title: emote })));
+            emoteMenuBody.append($("<div/>", {
+                class: "emote-container"
+            }).append($("<img/>", {
+                class: "emote-icon",
+                id: emote,
+                alt: "",
+                src: "https://static-cdn.jtvnw.net/emoticons/v1/" + id + "/1.0",
+                title: emote
+            })));
         }
     }
 };
 
-QuickEmoteMenu.prototype.favorite = function(name, url) {
-    
-    if(!favoriteEmotes.hasOwnProperty(name)) {
+QuickEmoteMenu.prototype.favorite = function (name, url) {
+
+    if (!favoriteEmotes.hasOwnProperty(name)) {
         favoriteEmotes[name] = url;
     }
-  
+
     this.updateFavorites();
 };
 
-QuickEmoteMenu.prototype.updateFavorites = function() {
-    
-    if(!$("#rmenu").length) {
+QuickEmoteMenu.prototype.updateFavorites = function () {
+
+    if (!$("#rmenu").length) {
         $("body").append('<div id="rmenu"><ul><a href="#">Remove</a></ul></div>');
-        $(document).on("click", function() {
+        $(document).on("click", function () {
             $("#rmenu").hide();
         });
     }
@@ -886,32 +995,42 @@ QuickEmoteMenu.prototype.updateFavorites = function() {
     var self = this;
     var emoteMenuBody = $("#emote-menu-inner-fav");
     emoteMenuBody.empty();
-    for(var emote in favoriteEmotes) {
+    for (var emote in favoriteEmotes) {
         var url = favoriteEmotes[emote];
-        
-        var econtainer = $("<div/>", { class: "emote-container" });
-        var icon = $("<img/>", { class: "emote-icon", alt: "", src: url, title: emote }).appendTo(econtainer);
+
+        var econtainer = $("<div/>", {
+            class: "emote-container"
+        });
+        var icon = $("<img/>", {
+            class: "emote-icon",
+            alt: "",
+            src: url,
+            title: emote
+        }).appendTo(econtainer);
         emoteMenuBody.append(econtainer);
-        
-        icon.off("click").on("click", function(e) {
+
+        icon.off("click").on("click", function (e) {
             var emote = $(this).attr("title");
             var ta = $(".channel-textarea-inner textarea");
             ta.val(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote);
         });
-        icon.off("contextmenu").on("contextmenu", function(e) {
+        icon.off("contextmenu").on("contextmenu", function (e) {
             var title = $(this).attr("title");
             var menu = $("#rmenu");
-            menu.find("a").off("click").on("click",function() {
+            menu.find("a").off("click").on("click", function () {
                 delete favoriteEmotes[title];
                 self.updateFavorites();
             });
             menu.hide();
-            menu.css({top: e.pageY, left: e.pageX});
+            menu.css({
+                top: e.pageY,
+                left: e.pageX
+            });
             menu.show();
             return false;
         });
     }
-    
+
     window.localStorage["bdfavemotes"] = btoa(JSON.stringify(favoriteEmotes));
 };
 
@@ -929,53 +1048,62 @@ var panel = null;
 function SettingsPanel() {
     utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/codemirror.min.js");
     utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.9.0/mode/css/css.min.js");
-	utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.4.2/Sortable.min.js");
+    utils.injectJs("https://cdnjs.cloudflare.com/ajax/libs/Sortable/1.4.2/Sortable.min.js");
 }
 
-SettingsPanel.prototype.init = function() {
+SettingsPanel.prototype.init = function () {
     var self = this;
     self.construct();
     var body = $("body");
 
-    if(settingsCookie["bda-es-0"]) {
+    if (settingsCookie["bda-es-0"]) {
         $("#twitchcord-button-container").show();
     } else {
         $("#twitchcord-button-container").hide();
     }
 
-    if(settingsCookie["bda-gs-2"]) {
+    if (settingsCookie["bda-gs-2"]) {
         body.addClass("bd-minimal");
     } else {
         body.removeClass("bd-minimal");
     }
-    if(settingsCookie["bda-gs-3"]) {
+    if (settingsCookie["bda-gs-3"]) {
         body.addClass("bd-minimal-chan");
     } else {
         body.removeClass("bd-minimal-chan");
     }
 
-    if(settingsCookie["bda-gs-4"]) {
+    if (settingsCookie["bda-gs-4"]) {
         voiceMode.enable();
     }
 
-    if(settingsCookie["bda-jd"]) {
+    if (settingsCookie["bda-jd"]) {
         opublicServers.joinServer("0Tmfo5ZbORCRqbAd");
         settingsCookie["bda-jd"] = false;
         mainCore.saveSettings();
     }
-    
+
     if (settingsCookie["bda-es-6"]) {
         //Pretty emote titles
-      	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()});
+        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');
+        $(document).off('mouseover', '.emote');
     }
 };
 
-SettingsPanel.prototype.applyCustomCss = function(css) {
-    if($("#customcss").length == 0) {
+SettingsPanel.prototype.applyCustomCss = function (css) {
+    if ($("#customcss").length == 0) {
         $("head").append('<style id="customcss"></style>');
     }
 
@@ -987,95 +1115,107 @@ SettingsPanel.prototype.applyCustomCss = function(css) {
 var customCssInitialized = false;
 var lastTab = "";
 
-SettingsPanel.prototype.changeTab = function(tab) {
-    
+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).addClass("selected");
     $("#" + tab.replace("tab", "pane")).show();
-     
-    switch(tab) {
-        case "bd-settings-tab":
-        break;
-        case "bd-customcss-tab":
-            if(!customCssInitialized) {
-                var editor = CodeMirror.fromTextArea(document.getElementById("bd-custom-css-ta"), {
-                    lineNumbers: true, mode: 'css', indentUnit: 4, theme: 'neat'
-                });
-                
-                
-                editor.on("change", function(cm) {
-                    var css = cm.getValue();
-                    self.applyCustomCss(css);
-                });
 
-                customCssInitialized = true;
-            }
+    switch (tab) {
+    case "bd-settings-tab":
         break;
-        case "bd-plugins-tab":
-            
+    case "bd-customcss-tab":
+        if (!customCssInitialized) {
+            var editor = CodeMirror.fromTextArea(document.getElementById("bd-custom-css-ta"), {
+                lineNumbers: true,
+                mode: 'css',
+                indentUnit: 4,
+                theme: 'neat'
+            });
+
+
+            editor.on("change", function (cm) {
+                var css = cm.getValue();
+                self.applyCustomCss(css);
+            });
+
+            customCssInitialized = true;
+        }
         break;
-        case "bd-themes-tab":
-            controlGroups.html("<span>Coming soon</span>");
+    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);
+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);
 
-        settingsCookie[id] = enabled;
+    settingsCookie[id] = enabled;
 
-        if(settingsCookie["bda-es-0"]) {
-            $("#twitchcord-button-container").show();
-        } else {
-            $("#twitchcord-button-container").hide();
-        }
+    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");
-        }
-        if(settingsCookie["bda-gs-1"]) {
-            $("#bd-pub-li").show();
-        } else {
-            $("#bd-pub-li").hide();
-        }
-        if(settingsCookie["bda-gs-4"]){
-            voiceMode.enable();
-        } else {
-            voiceMode.disable();
-        }
-        if (settingsCookie["bda-es-6"]) {
-      	    //Pretty emote titles
-      	    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');
-    	}
+    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");
+    }
+    if (settingsCookie["bda-gs-1"]) {
+        $("#bd-pub-li").show();
+    } else {
+        $("#bd-pub-li").hide();
+    }
+    if (settingsCookie["bda-gs-4"]) {
+        voiceMode.enable();
+    } else {
+        voiceMode.disable();
+    }
+    if (settingsCookie["bda-es-6"]) {
+        //Pretty emote titles
+        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();
+    mainCore.saveSettings();
 }
 
-SettingsPanel.prototype.construct = function() {
+SettingsPanel.prototype.construct = function () {
     var self = this;
-    
+
     panel = $("<div/>", {
         id: "bd-pane",
         class: "settings-inner",
@@ -1083,128 +1223,128 @@ SettingsPanel.prototype.construct = function() {
             "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) {
+        '<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"]) {
+        if (sett["implemented"]) {
 
             settingsInner += '' +
-            '<li>' +
+                '<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 class="checkbox-inner">' +
+                '<input type="checkbox" id="' + id + '" ' + (settingsCookie[id] ? "checked" : "") + '>' +
+                '<span></span>' +
                 '</div>' +
-            '</li>';
+                '<span>' + setting + " - " + sett["info"] +
+                '</span>' +
+                '</div>' +
+                '</li>';
         }
     }
-    
+
     var ccss = atob(localStorage.getItem("bdcustomcss"));
     self.applyCustomCss(ccss);
-    
+
     settingsInner += '</ul>' +
-    '               </div>' +
-    '' +
-    '               <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
-    '                   <textarea id="bd-custom-css-ta">'+ccss+'</textarea>' +
-    '               </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() {
+        '               </div>' +
+        '' +
+        '               <div class="bd-pane control-group" id="bd-customcss-pane" style="display:none;">' +
+        '                   <textarea id="bd-custom-css-ta">' + ccss + '</textarea>' +
+        '               </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>' + 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="themeModule.handleTheme(this);">' +
-            '           <div class="checkbox-inner">' +
-            '               <input id="ti'+this["name"]+'" type="checkbox" ' + (themeCookie[this["name"]] ? "checked" : "") +'>' +
+            '       <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>';
-    
+        '               </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 == "") {
+        if (lastTab == "") {
             self.changeTab("bd-settings-tab");
         } else {
             self.changeTab(lastTab);
@@ -1221,18 +1361,18 @@ SettingsPanel.prototype.construct = function() {
     panel.html(settingsInner);
 
     function defer() {
-        if($(".btn.btn-settings").length < 1) {
+        if ($(".btn.btn-settings").length < 1) {
             setTimeout(defer, 100);
-        }else {
-            $(".btn.btn-settings").first().on("click", function() {
+        } else {
+            $(".btn.btn-settings").first().on("click", function () {
 
                 function innerDefer() {
-                    if($(".modal-inner").first().is(":visible")) {
+                    if ($(".modal-inner").first().is(":visible")) {
 
                         panel.hide();
                         var tabBar = $(".tab-bar.SIDE").first();
 
-                        $(".tab-bar.SIDE .tab-bar-item").click(function() {
+                        $(".tab-bar.SIDE .tab-bar-item").click(function () {
                             $(".form .settings-right .settings-inner").first().show();
                             $("#bd-settings-new").removeClass("selected");
                             panel.hide();
@@ -1250,7 +1390,7 @@ SettingsPanel.prototype.construct = function() {
         }
     }
     defer();
-    
+
 };
 
 /* BetterDiscordApp Utilities JavaScript
@@ -1261,44 +1401,51 @@ SettingsPanel.prototype.construct = function() {
  */
 
 var _hash;
+
 function Utils() {
 
 }
 
-Utils.prototype.getTextArea = function() {
+Utils.prototype.getTextArea = function () {
     return $(".channel-textarea-inner textarea");
 };
 
-Utils.prototype.jqDefer = function(fnc) {
-    if(window.jQuery) { fnc(); } else { setTimeout(function() { this.jqDefer(fnc) }, 100) }
+Utils.prototype.jqDefer = function (fnc) {
+    if (window.jQuery) {
+        fnc();
+    } else {
+        setTimeout(function () {
+            this.jqDefer(fnc)
+        }, 100)
+    }
 };
 
-Utils.prototype.getHash = function() {
-    $.getJSON("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function(data) {
+Utils.prototype.getHash = function () {
+    $.getJSON("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function (data) {
         _hash = data.sha;
         emoteModule.getBlacklist();
     });
 };
 
-Utils.prototype.loadHtml = function(html, callback) {
-  var container = $("<div/>", {
-      class: "bd-container"
-  }).appendTo("body");  
+Utils.prototype.loadHtml = function (html, callback) {
+    var container = $("<div/>", {
+        class: "bd-container"
+    }).appendTo("body");
 
-  //TODO Inject these in next core update
-  html = '//cdn.rawgit.com/Jiiks/BetterDiscordApp/' + _hash + '/html/' + html + '.html';
-  
-  container.load(html, callback());
+    //TODO Inject these in next core update
+    html = '//cdn.rawgit.com/Jiiks/BetterDiscordApp/' + _hash + '/html/' + html + '.html';
+
+    container.load(html, callback());
 };
 
-Utils.prototype.injectJs = function(uri) {
+Utils.prototype.injectJs = function (uri) {
     $("<script/>", {
         type: "text/javascript",
         src: uri
     }).appendTo($("body"));
 };
 
-Utils.prototype.injectCss = function(uri) {
+Utils.prototype.injectCss = function (uri) {
     $("<link/>", {
         type: "text/css",
         rel: "stylesheet",
@@ -1306,12 +1453,12 @@ Utils.prototype.injectCss = function(uri) {
     }).appendTo($("head"));
 };
 
-Utils.prototype.log = function(message) {
-    console.info("%c[BetterDiscord]%c " + message, "color:teal; font-weight:bold;","");
+Utils.prototype.log = function (message) {
+    console.info("%c[BetterDiscord]%c " + message, "color:teal; font-weight:bold;", "");
 };
 
-Utils.prototype.err = function(message) {
-    console.info("%c[BetterDiscord]%c " + message, "color:red; font-weight:bold;","");
+Utils.prototype.err = function (message) {
+    console.info("%c[BetterDiscord]%c " + message, "color:red; font-weight:bold;", "");
 };
 
 /* BetterDiscordApp VoiceMode JavaScript
@@ -1325,17 +1472,17 @@ function VoiceMode() {
 
 }
 
-VoiceMode.prototype.obsCallback = function() {
+VoiceMode.prototype.obsCallback = function () {
     var self = this;
-    if(settingsCookie["bda-gs-4"]) {
+    if (settingsCookie["bda-gs-4"]) {
         self.disable();
-        setTimeout(function() {
+        setTimeout(function () {
             self.enable();
         }, 300);
     }
 }
 
-VoiceMode.prototype.enable = function() {
+VoiceMode.prototype.enable = function () {
     $(".scroller.guild-channels ul").first().css("display", "none");
     $(".scroller.guild-channels header").first().css("display", "none");
     $(".app.flex-vertical").first().css("overflow", "hidden");
@@ -1344,7 +1491,7 @@ VoiceMode.prototype.enable = function() {
     $(".guild-header .btn.btn-hamburger").first().css("visibility", "hidden");
 };
 
-VoiceMode.prototype.disable = function() {
+VoiceMode.prototype.disable = function () {
     $(".scroller.guild-channels ul").first().css("display", "");
     $(".scroller.guild-channels header").first().css("display", "");
     $(".app.flex-vertical").first().css("overflow", "");
@@ -1363,62 +1510,62 @@ VoiceMode.prototype.disable = function() {
 var pluginCookie = {};
 
 function PluginModule() {
-    
+
 }
 
-PluginModule.prototype.loadPlugins = function() {
+PluginModule.prototype.loadPlugins = function () {
 
     this.loadPluginData();
 
-    $.each(bdplugins, function() {
+    $.each(bdplugins, function () {
         var plugin = this["plugin"];
         plugin.load();
-        
+
         var name = plugin.getName();
         var enabled = false;
-        
-        if(pluginCookie.hasOwnProperty(name)) {
+
+        if (pluginCookie.hasOwnProperty(name)) {
             enabled = pluginCookie[name];
         } else {
             pluginCookie[name] = false;
         }
-        
-        if(enabled) {
+
+        if (enabled) {
             plugin.start();
         }
     });
 };
 
-PluginModule.prototype.handlePlugin = function(checkbox) {
-    
+PluginModule.prototype.handlePlugin = 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(enabled) {
+
+    if (enabled) {
         bdplugins[id]["plugin"].start();
         pluginCookie[id] = true;
     } else {
         bdplugins[id]["plugin"].stop();
         pluginCookie[id] = false;
     }
-    
+
     this.savePluginData();
 };
 
-PluginModule.prototype.showSettings = function(plugin) {
-    if(bdplugins[plugin] != null) {
-        if(typeof bdplugins[plugin].plugin.getSettingsPanel === "function") {
+PluginModule.prototype.showSettings = function (plugin) {
+    if (bdplugins[plugin] != null) {
+        if (typeof bdplugins[plugin].plugin.getSettingsPanel === "function") {
             var panel = bdplugins[plugin].plugin.getSettingsPanel();
-            
-            $(".modal-inner").off("click.bdpsm").on("click.bdpsm", function(e) {
-                if($("#bd-psm-id").length) {
+
+            $(".modal-inner").off("click.bdpsm").on("click.bdpsm", function (e) {
+                if ($("#bd-psm-id").length) {
                     $(".bd-psm").remove();
                 } else {
                     $(".bd-psm").attr("id", "bd-psm-id");
                 }
-                
+
             });
             $(".modal").append('<div class="bd-psm"><div class="scroller-wrap" style="height:100%"><div id="bd-psm-s" class="scroller" style="padding:10px;"></div></div></div>');
             $("#bd-psm-s").append(panel);
@@ -1426,39 +1573,42 @@ PluginModule.prototype.showSettings = function(plugin) {
     }
 };
 
-PluginModule.prototype.loadPluginData = function() {
+PluginModule.prototype.loadPluginData = function () {
     var cookie = $.cookie("bd-plugins");
-    if(cookie != undefined) {
-        pluginCookie = JSON.parse($.cookie("bd-plugins")); 
+    if (cookie != undefined) {
+        pluginCookie = JSON.parse($.cookie("bd-plugins"));
     }
 };
 
-PluginModule.prototype.savePluginData = function() {
-    $.cookie("bd-plugins", JSON.stringify(pluginCookie), { expires: 365, path: '/' });
+PluginModule.prototype.savePluginData = function () {
+    $.cookie("bd-plugins", JSON.stringify(pluginCookie), {
+        expires: 365,
+        path: '/'
+    });
 };
 
-PluginModule.prototype.newMessage = function() {
-    $.each(bdplugins, function() {
-        if(!pluginCookie[this.plugin.getName()]) return;
-        if(typeof this.plugin.onMessage === "function") {
+PluginModule.prototype.newMessage = function () {
+    $.each(bdplugins, function () {
+        if (!pluginCookie[this.plugin.getName()]) return;
+        if (typeof this.plugin.onMessage === "function") {
             this.plugin.onMessage();
         }
     });
 };
 
-PluginModule.prototype.channelSwitch = function() {
-    $.each(bdplugins, function() {
-        if(!pluginCookie[this.plugin.getName()]) return;
-        if(typeof this.plugin.onSwitch === "function") {
-            this.plugin.onSwitch();   
+PluginModule.prototype.channelSwitch = function () {
+    $.each(bdplugins, function () {
+        if (!pluginCookie[this.plugin.getName()]) return;
+        if (typeof this.plugin.onSwitch === "function") {
+            this.plugin.onSwitch();
         }
     });
 };
 
-PluginModule.prototype.socketEvent = function(e, data) {
-    $.each(bdplugins, function() {
-        if(!pluginCookie[this.plugin.getName()]) return;
-        if(typeof this.plugin.socketEvent === "function") {
+PluginModule.prototype.socketEvent = function (e, data) {
+    $.each(bdplugins, function () {
+        if (!pluginCookie[this.plugin.getName()]) return;
+        if (typeof this.plugin.socketEvent === "function") {
             this.plugin.socketEvent(data);
         }
     });
@@ -1475,56 +1625,59 @@ PluginModule.prototype.socketEvent = function(e, data) {
 var themeCookie = {};
 
 function ThemeModule() {
-    
+
 }
 
-ThemeModule.prototype.loadThemes = function() {
+ThemeModule.prototype.loadThemes = function () {
     this.loadThemeData();
-    
-    $.each(bdthemes, function() {
+
+    $.each(bdthemes, function () {
         var name = this["name"];
         var enabled = false;
-        if(themeCookie.hasOwnProperty(name)) {
-            if(themeCookie[name]) {
+        if (themeCookie.hasOwnProperty(name)) {
+            if (themeCookie[name]) {
                 enabled = true;
             }
         } else {
             themeCookie[name] = false;
         }
-        
-        if(enabled) {
-            $("head").append('<style id="'+name+'">'+unescape(bdthemes[name]["css"])+'</style>');
+
+        if (enabled) {
+            $("head").append('<style id="' + name + '">' + unescape(bdthemes[name]["css"]) + '</style>');
         }
     });
 };
 
-ThemeModule.prototype.handleTheme = function(checkbox) {
-    
+ThemeModule.prototype.handleTheme = function (checkbox) {
+
     var cb = $(checkbox).children().find('input[type="checkbox"]');
     var enabled = !cb.is(":checked");
     var id = cb.attr("id").substring(2);
     cb.prop("checked", enabled);
-    
-    if(enabled) {
-        $("head").append('<style id="'+id+'">'+unescape(bdthemes[id]["css"])+'</style>');
+
+    if (enabled) {
+        $("head").append('<style id="' + id + '">' + unescape(bdthemes[id]["css"]) + '</style>');
         themeCookie[id] = true;
     } else {
-        $("#"+id).remove();
+        $("#" + id).remove();
         themeCookie[id] = false;
     }
-    
+
     this.saveThemeData();
 };
 
-ThemeModule.prototype.loadThemeData = function() {
+ThemeModule.prototype.loadThemeData = function () {
     var cookie = $.cookie("bd-themes");
-    if(cookie != undefined) {
+    if (cookie != undefined) {
         themeCookie = JSON.parse($.cookie("bd-themes"));
     }
 };
 
-ThemeModule.prototype.saveThemeData = function() {
-    $.cookie("bd-themes", JSON.stringify(themeCookie), { expires: 365, path: '/' });
+ThemeModule.prototype.saveThemeData = function () {
+    $.cookie("bd-themes", JSON.stringify(themeCookie), {
+        expires: 365,
+        path: '/'
+    });
 };
 
 
@@ -1537,31 +1690,35 @@ function BdWSocket() {
     bdws = this;
 }
 
-BdWSocket.prototype.start = function() {
+BdWSocket.prototype.start = function () {
     var self = this;
     $.ajax({
-        method:"GET",
-        url:"https://discordapp.com/api/gateway",
-        headers: {authorization: localStorage.token.match(/\"(.+)\"/)[1]},
-        success: function(data){
+        method: "GET",
+        url: "https://discordapp.com/api/gateway",
+        headers: {
+            authorization: localStorage.token.match(/\"(.+)\"/)[1]
+        },
+        success: function (data) {
             self.open(data.url);
         }
     });
 };
 
-BdWSocket.prototype.open = function(host) {
+BdWSocket.prototype.open = function (host) {
     utils.log("Socket Host: " + host);
     try {
         bdSocket = new WebSocket(host);
-        bdSocket.onopen =  this.onOpen;
+        bdSocket.onopen = this.onOpen;
         bdSocket.onmessage = this.onMessage;
         bdSocket.onerror = this.onError;
         bdSocket.onclose = this.onClose;
-    }catch(err) { utils.log(err); }
-    
+    } catch (err) {
+        utils.log(err);
+    }
+
 };
 
-BdWSocket.prototype.onOpen = function() {
+BdWSocket.prototype.onOpen = function () {
     utils.log("Socket Open");
     var data = {
         op: 2,
@@ -1574,58 +1731,61 @@ BdWSocket.prototype.onOpen = function() {
     bdws.send(data);
 };
 
-BdWSocket.prototype.onMessage = function(e) {
+BdWSocket.prototype.onMessage = function (e) {
 
     var packet, data, type;
     try {
         packet = JSON.parse(e.data);
         data = packet.d;
         type = packet.t;
-    } catch(err) {
+    } catch (err) {
         utils.err(err);
         return;
     }
 
-    switch(type) {
-        case "READY": 
-            bdSocket.interval = setInterval(() => bdws.send({ op: 1, d: Date.now() }), data.heartbeat_interval);
-            utils.log("Socket Ready");
-            break;
-        case "PRESENCE_UPDATE":
-                pluginModule.socketEvent("PRESENCE_UPDATE", data);
-            break;
-        case "TYPING_START":
-                pluginModule.socketEvent("TYPING_START", data);
-            break;
-        case "MESSAGE_CREATE":
-                pluginModule.socketEvent("MESSAGE_CREATE", data);
-            break;
-        case "MESSAGE_UPDATE":
-                pluginModule.socketEvent("MESSAGE_UPDATE", data);
-            break;
-        default:
-            break;
+    switch (type) {
+    case "READY":
+        bdSocket.interval = setInterval(() => bdws.send({
+            op: 1,
+            d: Date.now()
+        }), data.heartbeat_interval);
+        utils.log("Socket Ready");
+        break;
+    case "PRESENCE_UPDATE":
+        pluginModule.socketEvent("PRESENCE_UPDATE", data);
+        break;
+    case "TYPING_START":
+        pluginModule.socketEvent("TYPING_START", data);
+        break;
+    case "MESSAGE_CREATE":
+        pluginModule.socketEvent("MESSAGE_CREATE", data);
+        break;
+    case "MESSAGE_UPDATE":
+        pluginModule.socketEvent("MESSAGE_UPDATE", data);
+        break;
+    default:
+        break;
     }
 
 };
 
-BdWSocket.prototype.onError = function(e) {
+BdWSocket.prototype.onError = function (e) {
     utils.log("Socket Error - " + e.message);
 };
 
-BdWSocket.prototype.onClose = function(e) {
+BdWSocket.prototype.onClose = function (e) {
     utils.log("Socket Closed - " + e.code + " : " + e.reason);
     clearInterval(bdSocket.interval);
     bdws.start();
 };
 
-BdWSocket.prototype.send = function(data) {
-    if(bdSocket.readyState == 1) {
+BdWSocket.prototype.send = function (data) {
+    if (bdSocket.readyState == 1) {
         bdSocket.send(JSON.stringify(data));
     }
 };
 
-BdWSocket.prototype.getSocket = function() {
+BdWSocket.prototype.getSocket = function () {
     return bdSocket;
 };
 
@@ -1643,52 +1803,52 @@ function BdApi() {}
 
 //Joins a server
 //code = server invite code
-BdApi.joinServer = function(code) {
-	opublicServers.joinServer(code);
+BdApi.joinServer = function (code) {
+    opublicServers.joinServer(code);
 };
 
 //Inject CSS to document head
 //id = id of element
 //css = custom css
-BdApi.injectCSS = function(id, css) {
-	$("head").append('<style id="'+id+'"></style>')
+BdApi.injectCSS = function (id, css) {
+    $("head").append('<style id="' + id + '"></style>')
     $("#" + id).html(css);
 };
 
 //Clear css/remove any element
 //id = id of element
-BdApi.clearCSS = function(id) {
-	$("#"+id).remove();
+BdApi.clearCSS = function (id) {
+    $("#" + id).remove();
 };
 
 //Get another plugin
 //name = name of plugin
-BdApi.getPlugin = function(name) {
-    if(bdplugins.hasOwnProperty(name)) {
+BdApi.getPlugin = function (name) {
+    if (bdplugins.hasOwnProperty(name)) {
         return bdplugins[name]["plugin"];
     }
     return null;
 };
 
 //Get ipc for reason
-BdApi.getIpc = function() {
-	return betterDiscordIPC;
+BdApi.getIpc = function () {
+    return betterDiscordIPC;
 };
 
 //Get BetterDiscord Core
-BdApi.getCore = function() {
-    return mainCore;	
+BdApi.getCore = function () {
+    return mainCore;
 };
 
 //Attempts to get user id by username
 //Name = username
 //Since Discord hides users if there's too many, this will often fail
-BdApi.getUserIdByName = function(name) {
+BdApi.getUserIdByName = function (name) {
     var users = $(".member-username");
-    
-    for(var i = 0 ; i < users.length ; i++) {
+
+    for (var i = 0; i < users.length; i++) {
         var user = $(users[i]);
-        if(user.text() == name) {
+        if (user.text() == name) {
             var avatarUrl = user.closest(".member").find(".avatar-small").css("background-image");
             return avatarUrl.match(/\d+/);
         }
@@ -1700,13 +1860,13 @@ BdApi.getUserIdByName = function(name) {
 //ID = user id
 //Since Discord hides users if there's too many, this will often fail
 var gg;
-BdApi.getUserNameById = function(id) {
+BdApi.getUserNameById = function (id) {
     var users = $(".avatar-small");
-    
-    for(var i = 0 ; i < users.length ; i++) {
+
+    for (var i = 0; i < users.length; i++) {
         var user = $(users[i]);
         var url = user.css("background-image");
-        if(id == url.match(/\d+/)) {
+        if (id == url.match(/\d+/)) {
             return user.parent().find(".member-username").text();
         }
     }
@@ -1715,13 +1875,29 @@ BdApi.getUserNameById = function(id) {
 
 //Set current game
 //game = game
-BdApi.setPlaying = function(game) {
-    bdws.send({"op":3,"d":{"idle_since":null,"game":{"name": game}}});
+BdApi.setPlaying = function (game) {
+    bdws.send({
+        "op": 3,
+        "d": {
+            "idle_since": null,
+            "game": {
+                "name": game
+            }
+        }
+    });
 };
 
 //Set current status
 //idle_since = date
 //status = status
-BdApi.setStatus = function(idle_since, status) {
-    bdws.send({"op":3,"d":{"idle_since":idle_since,"game":{"name": status}}});
+BdApi.setStatus = function (idle_since, status) {
+    bdws.send({
+        "op": 3,
+        "d": {
+            "idle_since": idle_since,
+            "game": {
+                "name": status
+            }
+        }
+    });
 };
\ No newline at end of file
diff --git a/js/main.min.js b/js/main.min.js
index fd58bd1b..55675d62 100644
--- a/js/main.min.js
+++ b/js/main.min.js
@@ -1,11 +1,10 @@
-var settingsPanel,emoteModule,utils,quickEmoteMenu,opublicServers,voiceMode,pluginModule,themeModule;var jsVersion=1.57;var supportedVersion="0.2.3";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},"Public Servers":{"id":"bda-gs-1","info":"Display public servers button","implemented":true},"Minimal Mode":{"id":"bda-gs-2","info":"Hide elements and reduce the size of elements.","implemented":true},"Voice Mode":{"id":"bda-gs-4","info":"Only show voice chat","implemented":true},"Hide Channels":{"id":"bda-gs-3","info":"Hide channels in minimal mode","implemented":true},"Quick Emote Menu":{"id":"bda-es-0","info":"Show quick emote menu for adding emotes","implemented":true},"Show Emotes":{"id":"bda-es-7","info":"Show any emotes","implemented":true},"FrankerFaceZ Emotes":{"id":"bda-es-1","info":"Show FrankerFaceZ Emotes","implemented":true},"BetterTTV Emotes":{"id":"bda-es-2","info":"Show BetterTTV Emotes","implemented":true},"Emote Autocomplete":{"id":"bda-es-3","info":"Autocomplete emote commands","implemented":false},"Emote Auto Capitalization":{"id":"bda-es-4","info":"Autocapitalize emote commands","implemented":true},"Override Default Emotes":{"id":"bda-es-5","info":"Override default emotes","implemented":false},"Show Names":{"id":"bda-es-6","info":"Show emote names on hover","implemented":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-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-jd":true};var bdchangelog={"changes":{"api":{"title":"Api Functions!","text":"New api events!","img":""},"dec":{"title":"Decorations&Snow!","text":"Decorations and snow have been removed.","img":""}},"fixes":{"emotes":{"title":"Sub emotes!","text":"Discord sub emotes are now replaced by BetterDiscord sub emotes and can be favorited!","img":""}},"upcoming":{"ignore":{"title":"Ignore User!","text":"Ignore users you don't like!","img":""}}};var settingsCookie={};function Core(){}
+var settingsPanel,emoteModule,utils,quickEmoteMenu,opublicServers,voiceMode,pluginModule,themeModule;var jsVersion=1.57;var supportedVersion="0.2.3";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},"Public Servers":{"id":"bda-gs-1","info":"Display public servers button","implemented":true},"Minimal Mode":{"id":"bda-gs-2","info":"Hide elements and reduce the size of elements.","implemented":true},"Voice Mode":{"id":"bda-gs-4","info":"Only show voice chat","implemented":true},"Hide Channels":{"id":"bda-gs-3","info":"Hide channels in minimal mode","implemented":true},"Quick Emote Menu":{"id":"bda-es-0","info":"Show quick emote menu for adding emotes","implemented":true},"Show Emotes":{"id":"bda-es-7","info":"Show any emotes","implemented":true},"FrankerFaceZ Emotes":{"id":"bda-es-1","info":"Show FrankerFaceZ Emotes","implemented":true},"BetterTTV Emotes":{"id":"bda-es-2","info":"Show BetterTTV Emotes","implemented":true},"Emote Autocomplete":{"id":"bda-es-3","info":"Autocomplete emote commands","implemented":false},"Emote Auto Capitalization":{"id":"bda-es-4","info":"Autocapitalize emote commands","implemented":true},"Override Default Emotes":{"id":"bda-es-5","info":"Override default emotes","implemented":false},"Show Names":{"id":"bda-es-6","info":"Show emote names on hover","implemented":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-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-jd":true};var bdchangelog={"changes":{"api":{"title":"Api Functions!","text":"New api events!","img":""},"dec":{"title":"Decorations&Snow!","text":"Decorations and snow have been removed.","img":""}},"fixes":{"emotes":{"title":"Sub emotes!","text":"Discord sub emotes are now replaced by BetterDiscord sub emotes and can be favorited!","img":""}},"upcoming":{"ignore":{"title":"Ignore User!","text":"Ignore users you don't like!","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");guilds.after($("<li></li>",{id:"bd-pub-li",css:{"height":"20px","display":settingsCookie["bda-gs-1"]==true?"":"none"}}).append($("<div/>",{class:"guild-inner",css:{"height":"20px","border-radius":"4px"}}).append($("<a/>").append($("<div/>",{css:{"line-height":"20px","font-size":"12px"},text:"public",id:"bd-pub-button"})))));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();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();});$("#bd-pub-button").on("click",function(){opublicServers.show();});opublicServers.init();emoteModule.autoCapitalize();if(settingsCookie["version"]<jsVersion){var cl=self.constructChangelog();$("body").append(cl);settingsCookie["version"]=jsVersion;self.saveSettings();}
 $("head").append("<style>.CodeMirror{ min-width:100%; }</style>");$("head").append('<style id="bdemotemenustyle"></style>');}else{setTimeout(gwDefer,100);}}
-$(document).ready(function(){setTimeout(gwDefer,1000);});};Core.prototype.initSettings=function(){if($.cookie("better-discord")==undefined){settingsCookie=defaultCookie;this.saveSettings();}else{this.loadSettings();for(var setting in defaultCookie){if(settingsCookie[setting]==undefined){settingsCookie[setting]=defaultCookie[setting];this.saveSettings();}}}};Core.prototype.saveSettings=function(){$.cookie("better-discord",JSON.stringify(settingsCookie),{expires:365,path:'/'});};Core.prototype.loadSettings=function(){settingsCookie=JSON.parse($.cookie("better-discord"));};var botlist=["119598467310944259"];Core.prototype.initObserver=function(){mainObserver=new MutationObserver(function(mutations){mutations.forEach(function(mutation){if(mutation.target.getAttribute('class')!=null){if(mutation.target.getAttribute('class').indexOf("titlebar")!=-1){quickEmoteMenu.obsCallback();voiceMode.obsCallback();if(typeof pluginModule!=="undefined")pluginModule.channelSwitch();$(".message-group").each(function(){var a=$(this).find(".avatar-large").css("background-image").match(/\d+/).toString();if(botlist.indexOf(a)>-1){$(this).find(".user-name").addClass("boticon");}});}
-if(mutation.target.getAttribute('class').indexOf('scroller messages')!=-1){var lastMessage=$(".message-group").last();if(lastMessage!=undefined){if(botlist.indexOf(lastMessage.find(".avatar-large").css("background-image").match(/\d+/).toString())>-1){lastMessage.find(".user-name").addClass("boticon");}}
+$(document).ready(function(){setTimeout(gwDefer,1000);});};Core.prototype.initSettings=function(){if($.cookie("better-discord")==undefined){settingsCookie=defaultCookie;this.saveSettings();}else{this.loadSettings();for(var setting in defaultCookie){if(settingsCookie[setting]==undefined){settingsCookie[setting]=defaultCookie[setting];this.saveSettings();}}}};Core.prototype.saveSettings=function(){$.cookie("better-discord",JSON.stringify(settingsCookie),{expires:365,path:'/'});};Core.prototype.loadSettings=function(){settingsCookie=JSON.parse($.cookie("better-discord"));};var botlist=["119598467310944259"];Core.prototype.initObserver=function(){mainObserver=new MutationObserver(function(mutations){mutations.forEach(function(mutation){if(mutation.target.getAttribute('class')!=null){if(mutation.target.getAttribute('class').indexOf("titlebar")!=-1){quickEmoteMenu.obsCallback();voiceMode.obsCallback();if(typeof pluginModule!=="undefined")pluginModule.channelSwitch();$(".message-group").each(function(){var a=$(this).find(".avatar-large");if(a.length>0){var b=a.css("background-image").match(/\d+/).toString();if(botlist.indexOf(a)>-1){$(this).find(".user-name").addClass("boticon");}}});}
+if(mutation.target.getAttribute('class').indexOf('scroller messages')!=-1){var lastMessage=$(".message-group").last();if(lastMessage!=undefined){var a=lastMessage.find(".avatar-large");if(a.length>0){if(botlist.indexOf(a.css("background-image").match(/\d+/).toString())>-1){lastMessage.find(".user-name").addClass("boticon");}}}
 if(typeof pluginModule!=="undefined")pluginModule.newMessage();}}
 emoteModule.obsCallback(mutation);});});mainObserver.observe(document,{childList:true,subtree:true});};Core.prototype.constructChangelog=function(){var changeLog=''+'<div id="bd-wn-modal" class="modal" style="opacity:1;">'+'  <div class="modal-inner">'+'       <div id="bdcl" class="change-log"> '+'           <div class="header">'+'               <strong>What\'s new in BetterDiscord JS v1.53&'+jsVersion+'</strong>'+'               <button class="close" onclick=\'$("#bd-wn-modal").remove();\'></button>'+'           </div><!--header-->'+'           <div class="scroller-wrap">'+'               <div class="scroller">';if(bdchangelog.changes!=null){changeLog+=''+'<h1 class="changelog-added">'+'   <span>New Stuff</span>'+'</h1>'+'<ul>';for(var change in bdchangelog.changes){change=bdchangelog.changes[change];changeLog+=''+'<li>'+'   <strong>'+change.title+'</strong>'+'   <div>'+change.text+'</div>'+'</li>';}
 changeLog+='</ul>';}