diff --git a/renderer/src/builtins/appearance/hidegifbutton.js b/renderer/src/builtins/appearance/hidegifbutton.js
index 3d7dc07e..4618a382 100644
--- a/renderer/src/builtins/appearance/hidegifbutton.js
+++ b/renderer/src/builtins/appearance/hidegifbutton.js
@@ -9,7 +9,7 @@ export default new class HideGIFButton extends Builtin {
 
     enabled() {
         this.after(WebpackModules.find(m => m.type && m.type.render && m.type.render.displayName === "ChannelTextAreaContainer").type, "render", (_, __, returnValue) => {
-            const buttons = Utilities.getNestedProp(returnValue, "props.children.props.children.1.props.children.props.children.2.props.children");
+            const buttons = Utilities.getNestedProp(returnValue, "props.children.0.props.children.1.props.children.1.props.children.2.props.children");
             if (Array.isArray(buttons)) {
                 for (const button of buttons) {
                     if (!button) continue;
diff --git a/renderer/src/builtins/appearance/hidegiftbutton.js b/renderer/src/builtins/appearance/hidegiftbutton.js
index 104de326..81eb5a22 100644
--- a/renderer/src/builtins/appearance/hidegiftbutton.js
+++ b/renderer/src/builtins/appearance/hidegiftbutton.js
@@ -9,12 +9,14 @@ export default new class HideGiftButton extends Builtin {
 
     enabled() {
         this.after(WebpackModules.find(m => m.type && m.type.render && m.type.render.displayName === "ChannelTextAreaContainer").type, "render", (_, __, returnValue) => {
-            const buttons = Utilities.getNestedProp(returnValue, "props.children.props.children.1.props.children.props.children.2.props.children");
+            const buttons = Utilities.getNestedProp(returnValue, "props.children.0.props.children.1.props.children.1.props.children.2.props.children");
             if (Array.isArray(buttons)) {
                 for (const button of buttons) {
-                    if (!button || !button.props) continue;
-                    if (button.props.hasOwnProperty("shouldRenderPremiumGiftButton")) {
-                        button.props.shouldRenderPremiumGiftButton = false;
+                    if (!button) continue;
+                    const renderFunc = Utilities.getNestedProp(button, "type.type");
+                    if (!renderFunc) continue;
+    
+                    if (renderFunc.displayName === "ChannelPremiumGiftButton") {
                         button.props.disabled = true;
                         break;
                     }
diff --git a/renderer/src/builtins/general/publicservers.js b/renderer/src/builtins/general/publicservers.js
index 96a6e269..f8dff9e8 100644
--- a/renderer/src/builtins/general/publicservers.js
+++ b/renderer/src/builtins/general/publicservers.js
@@ -23,8 +23,7 @@ export default new class PublicServers extends Builtin {
     }
 
     _appendButton() {
-        const wrapper = DiscordModules.GuildClasses.wrapper.split(" ")[0];
-        const guilds = DOM.query(`.${wrapper} .listItem-2P_4kh`);
+        const guilds = DOM.query(`.${DiscordModules.GuildClasses.wrapper} .${DiscordModules.GuildClasses.listItem}`);
         DOM.after(guilds, this.button);
     }
 
diff --git a/renderer/src/data/strings.js b/renderer/src/data/strings.js
index 8298165c..cefa43f8 100644
--- a/renderer/src/data/strings.js
+++ b/renderer/src/data/strings.js
@@ -24,6 +24,10 @@ export default {
                 showToasts: {
                     name: "Show Toasts",
                     note: "Shows a small notification for important information"
+                },
+                mediaKeys: {
+                    name: "Disable Media Keys",
+                    note: "Prevents Discord from hijacking your media keys after playing a video."
                 }
             },
             appearance: {
@@ -162,10 +166,6 @@ export default {
                 animateOnHover: {
                     name: "Animate On Hover",
                     note: "Only animate the emote modifiers on hover"
-                },
-                mediaKeys: {
-                    name: "Disable Media Keys",
-                    note: "Prevents Discord from hijacking your media keys after playing a video."
                 }
             },
             categories: {
diff --git a/renderer/src/modules/pluginmanager.js b/renderer/src/modules/pluginmanager.js
index cc895a47..22671da5 100644
--- a/renderer/src/modules/pluginmanager.js
+++ b/renderer/src/modules/pluginmanager.js
@@ -67,7 +67,7 @@ export default new class PluginManager extends AddonManager {
     loadPlugin(filename) {return this.loadAddon(filename);}
 
     loadAddon(filename, shouldCTE = true) {
-        const error = super.loadAddon(filename);
+        const error = super.loadAddon(filename, shouldCTE);
         if (error && shouldCTE) Modals.showAddonErrors({plugins: [error]});
         return error;
     }
diff --git a/renderer/src/modules/thememanager.js b/renderer/src/modules/thememanager.js
index 32dd1e2b..79f85965 100644
--- a/renderer/src/modules/thememanager.js
+++ b/renderer/src/modules/thememanager.js
@@ -48,7 +48,7 @@ export default new class ThemeManager extends AddonManager {
     reloadTheme(idOrFileOrAddon) {return this.reloadAddon(idOrFileOrAddon);}
 
     loadAddon(filename, shouldCTE = true) {
-        const error = super.loadAddon(filename);
+        const error = super.loadAddon(filename, shouldCTE);
         if (error && shouldCTE) Modals.showAddonErrors({themes: [error]});
         return error;
     }