diff --git a/modular/compacter_mode.css b/modular/compacter_mode.css
index 0ccc76a..b97812a 100644
--- a/modular/compacter_mode.css
+++ b/modular/compacter_mode.css
@@ -270,16 +270,16 @@ button.hh2-spotify-controls-button {
   color: var(--text-muted) !important;
 }
 
-[class^="members-"] [class^="member-"] > [class*="layout-"] {
+[class^="members-"] [class^="member-"] > [class^="memberInner-"] {
   height: 32px;
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"],
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"] {
   width: 24px !important;
@@ -287,7 +287,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > svg[viewBox="0 0 40 40"] {
@@ -296,7 +296,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > [class^="avatarDecoration-"] {
@@ -307,7 +307,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > svg[viewBox="0 0 32 32"] {
@@ -316,7 +316,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"] {
   margin-right: 8px;
 }
@@ -326,7 +326,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="children-"]
   > .presence-icons-wrapper
   > span
diff --git a/modular/font/terminus.css b/modular/font/terminus.css
index 2a44088..74ee65b 100644
--- a/modular/font/terminus.css
+++ b/modular/font/terminus.css
@@ -44,11 +44,9 @@
 .theme-dark,
 .theme-light {
   --font-primary: "Terminus (TTF) for Windows", "Terminus (TTF)",
-    "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont", monospace,
-    Twemoji !important;
+    "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont", monospace !important;
   --font-display: "Terminus (TTF) for Windows", "Terminus (TTF)",
-    "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont", monospace,
-    Twemoji !important;
+    "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont", monospace !important;
   --font-code: "Terminus (TTF) for Windows", "Terminus (TTF)", "Sazanami Gothic",
     "UnifontBitmap", "Unifont Windows", "Unifont", monospace !important;
 
@@ -80,9 +78,10 @@
 }
 
 .hh2-spotify-controls-album-name,
+.gm-spotify-controls-album-name,
 .showTag-username {
   color: var(--highlight) !important;
-  font-size: 12px !important;
+  font-size: 0.75em !important;
 }
 
 [class^="sidebar-"]
@@ -132,8 +131,3 @@ code.inline,
 code.inline {
   line-height: 12px !important;
 }
-
-[class^="markup-"] ol,
-[class^="markup-"] ul {
-  margin: 4px 0 0 24px !important;
-}
diff --git a/modular/font/unifont.css b/modular/font/unifont.css
index a0a857b..b8d52ce 100644
--- a/modular/font/unifont.css
+++ b/modular/font/unifont.css
@@ -60,10 +60,6 @@
     "UnifontBitmap", "Unifont Windows", "Unifont", monospace !important;
 }
 
-.sjis {
-  font-family: "Sazanami Gothic" !important;
-}
-
 [class*="menu-"] [class^="item-"],
 [class^="containerDefault-"] [class^="name-"],
 [class^="membersGroup-"] {
diff --git a/modular/overwrite_colors.css b/modular/overwrite_colors.css
index 8250f0c..fb33afe 100644
--- a/modular/overwrite_colors.css
+++ b/modular/overwrite_colors.css
@@ -79,10 +79,10 @@
   --status-positive-text: var(--text);
   --status-danger-text: var(--text);
   --status-warning-text: var(--text);
-  --button-secondary-background: var(--primary);
+  --button-secondary-background: var(--secondary);
   --button-secondary-background-hover: var(--highlight);
   --button-secondary-background-active: var(--highlight);
-  --button-secondary-background-disabled: var(--secondary);
+  --button-secondary-background-disabled: var(--tertiary);
   --text-danger: var(--_color1);
   --status-danger: var(--_color1);
   --status-danger-background: var(--_color1);
diff --git a/xmc.user.css b/xmc.user.css
index fd6ad69..fa3793c 100644
--- a/xmc.user.css
+++ b/xmc.user.css
@@ -95,10 +95,10 @@
   --status-positive-text: var(--text);
   --status-danger-text: var(--text);
   --status-warning-text: var(--text);
-  --button-secondary-background: var(--primary);
+  --button-secondary-background: var(--secondary);
   --button-secondary-background-hover: var(--highlight);
   --button-secondary-background-active: var(--highlight);
-  --button-secondary-background-disabled: var(--secondary);
+  --button-secondary-background-disabled: var(--tertiary);
   --text-danger: var(--_color1);
   --status-danger: var(--_color1);
   --status-danger-background: var(--_color1);
@@ -1875,10 +1875,6 @@ code.inline,
     monospace !important;
 }
 
-.sjis {
-  font-family: "Sazanami Gothic" !important;
-}
-
 [class*="menu-"] [class^="item-"],
 [class^="containerDefault-"] [class^="name-"],
 [class^="membersGroup-"] {
@@ -1932,9 +1928,9 @@ code.inline,
 .theme-dark,
 .theme-light {
   --font-primary: "Terminus (TTF) for Windows", "Terminus (TTF)", "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont",
-    monospace, Twemoji !important;
+    monospace !important;
   --font-display: "Terminus (TTF) for Windows", "Terminus (TTF)", "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont",
-    monospace, Twemoji !important;
+    monospace !important;
   --font-code: "Terminus (TTF) for Windows", "Terminus (TTF)", "Sazanami Gothic", "UnifontBitmap", "Unifont Windows", "Unifont",
     monospace !important;
 
@@ -1966,9 +1962,10 @@ code.inline,
 }
 
 .hh2-spotify-controls-album-name,
+.gm-spotify-controls-album-name,
 .showTag-username {
   color: var(--highlight) !important;
-  font-size: 12px !important;
+  font-size: 0.75em !important;
 }
 
 [class^="sidebar-"]
@@ -2017,11 +2014,6 @@ code.inline,
 [class^="markdown-"] [class^="codeInline-"],
 code.inline {
   line-height: 12px !important;
-}
-
-[class^="markup-"] ol,
-[class^="markup-"] ul {
-  margin: 4px 0 0 24px !important;
 }`,
   'The Funny': `@font-face {
   font-family: "Pointfree";
@@ -5094,16 +5086,16 @@ button.hh2-spotify-controls-button {
   color: var(--text-muted) !important;
 }
 
-[class^="members-"] [class^="member-"] > [class*="layout-"] {
+[class^="members-"] [class^="member-"] > [class^="memberInner-"] {
   height: 32px;
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"],
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"] {
   width: 24px !important;
@@ -5111,7 +5103,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > svg[viewBox="0 0 40 40"] {
@@ -5120,7 +5112,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > [class^="avatarDecoration-"] {
@@ -5131,7 +5123,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"]
   > [class^="wrapper-"]
   > svg[viewBox="0 0 32 32"] {
@@ -5140,7 +5132,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="avatar-"] {
   margin-right: 8px;
 }
@@ -5150,7 +5142,7 @@ button.hh2-spotify-controls-button {
 }
 [class^="members-"]
   [class^="member-"]
-  > [class*="layout-"]
+  > [class^="memberInner-"]
   > [class^="children-"]
   > .presence-icons-wrapper
   > span