diff --git a/package.json b/package.json
index 179439d9ac..1cc11e2a42 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "require-globify": "^1.4.1",
     "resizable": "^1.2.0",
     "twemoji": "^2.5.0",
-    "twitch-chat-emotes": "github:Aaron128l/Userscript--Twitch-Chat-Emotes#2f78696552c9c11db1b23757c8729b6ef259af58",
+    "twitch-chat-emotes": "github:Aaron128l/Userscript--Twitch-Chat-Emotes#7a459e3922cc6f345a5d7bdfbbd1a17bdb73de79",
     "uglify-save-license": "^0.4.1",
     "view-list": "^2.1.0",
     "vinyl-buffer": "^1.0.0",
diff --git a/src/modules/chat/index.js b/src/modules/chat/index.js
index e29ffdc6c0..f0adaa6412 100644
--- a/src/modules/chat/index.js
+++ b/src/modules/chat/index.js
@@ -17,7 +17,7 @@ const EMOTES_TO_CAP = ['567b5b520e984428652809b6'];
 const MAX_EMOTES_WHEN_CAPPED = 10;
 
 const badgeTemplate = (url, description) => `
-    <div class="tw-tooltip-wrapper inline">
+    <div class="tw-tooltip-wrapper tw-inline">
         <img alt="Moderator" class="chat-badge bttv-chat-badge" src="${url}" alt="" srcset="" data-a-target="chat-badge">
         <div class="tw-tooltip tw-tooltip--up tw-tooltip--align-left" data-a-target="tw-tooltip-label" style="margin-bottom: 0.9rem;">${description}</div>
     </div>
diff --git a/src/modules/chat_settings/index.js b/src/modules/chat_settings/index.js
index 713875575c..2fa429971c 100644
--- a/src/modules/chat_settings/index.js
+++ b/src/modules/chat_settings/index.js
@@ -8,13 +8,13 @@ const CHAT_SETTINGS_SELECTOR = '.chat-settings__content';
 const BTTV_CHAT_SETTINGS_CLASS = 'bttv-chat-settings';
 
 const CHAT_SETTINGS_TEMPLATE = `
-    <div class="${BTTV_CHAT_SETTINGS_CLASS} border-t mg-t-2 pd-t-2">
-        <div class="mg-b-2"><p class="c-text-alt-2 upcase">BetterTTV</p></div>
-        <div class="mg-b-1"><button class="setBlacklistKeywords">Set Blacklist Keywords</button></div>
-        <div class="mg-b-1"><button class="setHighlightKeywords">Set Highlight Keywords</button></div>
-        <div class="mg-b-1"><button class="setFontFamily">Set Font</button></div>
-        <div class="mg-b-1"><button class="setFontSize">Set Font Size</button></div>
-        <div class="mg-b-1"><button class="clearChat">Clear My Chat</button></div>
+    <div class="${BTTV_CHAT_SETTINGS_CLASS} tw-border-t tw-mg-t-2 tw-pd-t-2">
+        <div class="tw-mg-b-2"><p class="tw-c-text-alt-2 tw-upcase">BetterTTV</p></div>
+        <div class="tw-mg-b-1"><button class="setBlacklistKeywords">Set Blacklist Keywords</button></div>
+        <div class="tw-mg-b-1"><button class="setHighlightKeywords">Set Highlight Keywords</button></div>
+        <div class="tw-mg-b-1"><button class="setFontFamily">Set Font</button></div>
+        <div class="tw-mg-b-1"><button class="setFontSize">Set Font Size</button></div>
+        <div class="tw-mg-b-1"><button class="clearChat">Clear My Chat</button></div>
         <button class="openSettings">BetterTTV Settings</button>
     </div>
 `;
diff --git a/src/modules/chat_state/style.css b/src/modules/chat_state/style.css
index d464d89045..19a0adb75a 100644
--- a/src/modules/chat_state/style.css
+++ b/src/modules/chat_state/style.css
@@ -32,7 +32,7 @@
   }
 }
 
-.theme--dark {
+.tw-theme--dark {
   #bttv-channel-state-contain {
     color: #b19dd8;
 
diff --git a/src/modules/emotes/style.css b/src/modules/emotes/style.css
index 0f9fe99532..90fe0c4d24 100644
--- a/src/modules/emotes/style.css
+++ b/src/modules/emotes/style.css
@@ -107,7 +107,7 @@ div.bttv-emote + .bttv-emo-567b5dc00e984428652809bd img {
   }
 }
 
-.theme--dark {
+.tw-theme--dark {
   .bttv-emote-tooltip {
     padding: 3px 6px;
     border-radius: 2px;
diff --git a/src/modules/hide_bits/style.css b/src/modules/hide_bits/style.css
index 4473d0c7cc..a8f3f376b7 100644
--- a/src/modules/hide_bits/style.css
+++ b/src/modules/hide_bits/style.css
@@ -2,7 +2,7 @@
   .pinned-cheer,
   button[data-a-target="bits-button"],
   div[data-a-target="bits-card"],
-  .channel-header__right div.mg-l-1:last-child button:not([data-test-selector="subscribe-button__dropdown"]),
+  .channel-header__right div.tw-mg-l-1:last-child button:not([data-test-selector="subscribe-button__dropdown"]),
   img.chat-line__message--emote[src^="https://d3aqoihi2n8ty8.cloudfront.net/actions/"],
   img.chat-line__message--emote[src^="https://d3aqoihi2n8ty8.cloudfront.net/partner-actions/"] {
     display: none !important;
diff --git a/src/modules/host_button/index.js b/src/modules/host_button/index.js
index 7fc6fff8e3..87a78e64d6 100644
--- a/src/modules/host_button/index.js
+++ b/src/modules/host_button/index.js
@@ -4,14 +4,14 @@ const watcher = require('../../watcher');
 const twitch = require('../../utils/twitch');
 const tmiApi = require('../../utils/tmi-api');
 
-const SHARE_BUTTON_SELECTOR = '.channel-info-bar__action-container .mg-x-1:first';
+const SHARE_BUTTON_SELECTOR = '.channel-info-bar__action-container .tw-mg-x-1:first';
 const HOST_BUTTON_ID = 'bttv-host-button';
 
 let $hostButton;
 let hosting = false;
 
 const buttonTemplate = `
-    <div class="mg-r-1">
+    <div class="tw-mg-r-1">
         <button id="${HOST_BUTTON_ID}" class="tw-button tw-button--hollow">
             <span class="tw-button__text">Host</span>
         </button>
diff --git a/src/modules/settings/index.js b/src/modules/settings/index.js
index e9e1d17108..5e569cebd0 100644
--- a/src/modules/settings/index.js
+++ b/src/modules/settings/index.js
@@ -189,8 +189,8 @@ class SettingsModule {
 
         $('.top-nav__dropdown-wrapper a[data-a-target="settings-dropdown-link"]').after(`
             <a href="#" target="_blank" class="tw-interactable" data-a-target="bttv-settings-dropdown-link">
-                <div class="c-text-alt align-items-center flex pd-x-2 pd-y-05">
-                    <div class="align-items-center flex mg-r-1">
+                <div class="tw-c-text-alt tw-align-items-center tw-flex tw-pd-x-2 tw-pd-y-05">
+                    <div class="tw-align-items-center tw-flex tw-mg-r-1">
                         <figure class="icon bttvSettingsIconDropDown"></figure>
                     </div>
                     <p>BetterTTV Settings</p>
diff --git a/src/modules/split_chat/style.css b/src/modules/split_chat/style.css
index 9f0b9c6c6a..06608a009b 100644
--- a/src/modules/split_chat/style.css
+++ b/src/modules/split_chat/style.css
@@ -2,7 +2,7 @@
   background-color: #efeded;
 }
 
-.theme--dark {
+.tw-theme--dark {
   .chat-line__message.bttv-split-chat-alt-bg, .vod-message.bttv-split-chat-alt-bg {
     background-color: #1f1925;
   }