diff --git a/repo/core/css/theme.css b/repo/core/css/theme.css
index 052c6c0..4cfc448 100644
--- a/repo/core/css/theme.css
+++ b/repo/core/css/theme.css
@@ -203,7 +203,9 @@
 
 .notion-body.dark
   [style*='box-shadow: rgba(15, 15, 15, 0.2) 0px 0px 0px 1px, rgba(15, 15, 15, 0.2) 0px 2px 4px'],
-.notion-body:not(.dark) [style*='box-shadow: white -3px 0px 0px'] {
+.notion-body:not(.dark)
+  .notion-dark-theme
+  [style*='box-shadow: white -3px 0px 0px'] {
   box-shadow: rgba(15, 15, 15, 0.1) 0px 0px 0px 1px,
     rgba(15, 15, 15, 0.1) 0px 2px 4px !important;
 }
@@ -425,8 +427,11 @@
 .notion-page-content [style*='color: inherit;'],
 .notion-frame .notion-page-block,
 .notion-body.dark [style*=' color: rgba(255, 255, 255, 0.9)'],
-.notion-body.dark [style*='color: rgba(255, 255, 255, 0.7)'],
-.notion-body:not(.dark) [style*=' color: rgb(55, 53, 47);'] {
+.notion-body.dark [style^='color: rgba(255, 255, 255, 0.9)'],
+.notion-body.dark [style*=' color: rgba(255, 255, 255, 0.7)'],
+.notion-body.dark [style^='color: rgba(255, 255, 255, 0.7)'],
+.notion-body:not(.dark) [style*=' color: rgb(55, 53, 47);'],
+.notion-body:not(.dark) [style^='color: rgb(55, 53, 47);'] {
   color: var(--theme--text) !important;
 }
 .notion-body.dark [style*='color: rgba(255, 255, 255, 0.6)'],
diff --git a/repo/emoji-sets/mod.js b/repo/emoji-sets/mod.js
index 289da8b..8ceb5b5 100644
--- a/repo/emoji-sets/mod.js
+++ b/repo/emoji-sets/mod.js
@@ -29,7 +29,6 @@ module.exports = {
         'joypixels',
         'openmoji',
         'emojidex',
-        'messenger',
         'lg',
         'htc',
         'mozilla',
@@ -109,6 +108,15 @@ module.exports = {
                     el.style.display = 'none';
                     if (el.parentElement.getAttribute('contenteditable'))
                       el.remove();
+                  } else if (
+                    el.previousElementSibling.matches(
+                      'span[role="image"][aria-label]'
+                    )
+                  ) {
+                    el.previousElementSibling.innerText = el.getAttribute(
+                      'alt'
+                    );
+                    el.setAttribute('aria-label', el.getAttribute('alt'));
                   }
                 });
               } else {
@@ -116,11 +124,11 @@ module.exports = {
                   el.parentElement
                     .querySelectorAll('span[role="image"][aria-label]')
                     .forEach((text) => text.remove());
+                  el.style.display = 'inline-block';
                   if (!el.style.background.includes(store().style)) {
                     el.style.background = `url(https://emojicdn.elk.sh/${el.getAttribute(
                       'aria-label'
                     )}?style=${store().style})`;
-                    el.style.display = 'inline-block';
                     el.style.backgroundSize = 'contain';
                     el.style.backgroundRepeat = 'no-repeat';
                     el.style.opacity = 1;
@@ -135,12 +143,3 @@ module.exports = {
     },
   },
 };
-// span[role="image"][aria-label]
-/*  */
-
-// <div style="position: relative; width: 36px; height: 36px;">
-//   <img class="notion-emoji" alt="😀" aria-label="😀" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" style="width: 36px; height: 36px; background: url(&quot;/images/twitter-emoji-spritesheet-64.png&quot;) 53.5714% 62.5% / 5700% 5700%; opacity: 1; transition: opacity 100ms ease-out 0s;">
-//   <img alt="😀" aria-label="😀" src="https://notion-emojis.s3-us-west-2.amazonaws.com/v0/svg-twitter/1f600.svg" style="position: absolute; top: 0px; left: 0px; opacity: 0; width: 36px; height: 36px;">
-// </div>
-
-//   <img class="notion-emoji" alt="✝" aria-label="✝" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" style="width: 100%; height: 100%; background: url(&quot;/images/twitter-emoji-spritesheet-64.png&quot;) 98.2143% 25% / 5700% 5700%;">
diff --git a/repo/emoji-sets/styles.css b/repo/emoji-sets/styles.css
deleted file mode 100644
index 600e758..0000000
--- a/repo/emoji-sets/styles.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.notion-emoji::after {
-  content: attr(aria-label, '');
-  width: 1em;
-  height: 1em;
-}