diff --git a/Discord/Golden-Devil.theme.css b/Discord/Golden-Devil.theme.css
index 01e9f66..e502a0b 100644
--- a/Discord/Golden-Devil.theme.css
+++ b/Discord/Golden-Devil.theme.css
@@ -103,31 +103,31 @@
 }
 
 /* modify colors */
-#app-mount .container_ee69e0 /* channel list */,
-.privateChannels_f0963d /* dms list */,
-#app-mount .container_b2ca13 /* user panel inner */,
-.members_cbd271 /* member list inner */,
-.member_a31c43 /* member list members */,
-.searchResultsWrap_c2b47d /* search results */,
-.searchHeader_b7c924 /* search results header */,
-.chat_a7d72e.container_f3abf4 /* message requests */,
-#app-mount .panels_a4d4d9 > div /* user panel children */,
-.container_adcaac /* vc panel */,
-.sidebarRegionScroller_c25c6d /* settings left */,
-#app-mount .container_f1fd9c /* browse channels container */,
-#app-mount .header_f1fd9c /* browse channels header */,
-#app-mount .container_c2efea /* browse channels inner */,
-.chat_a7d72e.background_e85cee /* server guide body */,
-#app-mount .scrollerContainer_c6b11b /* channels and roles customize */,
-.shop_e77fa3 /* shop */,
-.wrapper_d880dc.minimum_d880dc /* private call */,
-.container_effbe2, .container__33507 /* emoji/sticker and gif picker searchbars */,
+.theme-dark .container_ee69e0 /* channel list */,
+.theme-dark .privateChannels_f0963d /* dms list */,
+.theme-dark #app-mount .container_b2ca13 /* user panel inner */,
+.theme-dark .members_cbd271 /* member list inner */,
+.theme-dark .member_a31c43 /* member list members */,
+.theme-dark .searchResultsWrap_c2b47d /* search results */,
+.theme-dark .searchHeader_b7c924 /* search results header */,
+.theme-dark .chat_a7d72e.container_f3abf4 /* message requests */,
+.theme-dark #app-mount .panels_a4d4d9 > div /* user panel children */,
+.theme-dark .container_adcaac /* vc panel */,
+.theme-dark #app-mount .sidebarRegionScroller_c25c6d /* settings left */,
+.theme-dark #app-mount .container_f1fd9c /* browse channels container */,
+.theme-dark #app-mount .header_f1fd9c /* browse channels header */,
+.theme-dark #app-mount .container_c2efea /* browse channels inner */,
+.theme-dark .chat_a7d72e.background_e85cee /* server guide body */,
+.theme-dark #app-mount .scrollerContainer_c6b11b /* channels and roles customize */,
+.theme-dark .shop_e77fa3 /* shop */,
+.theme-dark .wrapper_d880dc.minimum_d880dc /* private call */,
+.theme-dark .container_effbe2, .theme-dark .container__33507 /* emoji/sticker and gif picker searchbars */,
 #app-mount .uploadModal_f82cc7 /* upload modal */,
-.uploadModal_f82cc7 .footer_f82cc7 /* upload modal footer */ {
+.theme-dark .uploadModal_f82cc7 .footer_f82cc7 /* upload modal footer */ {
 	background: var(--dark-red);
 }
 .userPanelOuter_c69a7b {
-	--background-secondary-alt: var(--bg-4) !important;
+	--background-secondary-alt: var(--dark-red) !important;
 }
 .mainCard_a6d69a /* forum post */,
 .navRow_be9398[data-theme=dark] /* add new account bottom */ {
@@ -571,7 +571,7 @@ button.button_dd4f85 /* small buttons */,
 
 /* separate guilds panel background */
 .guilds_a4d4d9 {
-	background: var(--bg-4);
+	background: var(--dark-red);
 	border-radius: var(--roundness-xl);
 	margin: 0 0 var(--spacing) var(--spacing);
 }
@@ -588,7 +588,7 @@ button.button_dd4f85 /* small buttons */,
 .membersWrap_cbd271::after {
 	content: '';
 	position: absolute;
-	background: linear-gradient(transparent 85%, var(--bg-4) 100%);
+	background: linear-gradient(transparent 85%, var(--dark-red) 100%);
 	bottom: 0;
 	left: 0;
 	right: 0;
@@ -599,7 +599,7 @@ button.button_dd4f85 /* small buttons */,
 .guilds_a4d4d9::before /* add top scroll shadow */ {
 	content: '';
 	position: absolute;
-	background: linear-gradient(var(--bg-4) 0%, transparent 15%);
+	background: linear-gradient(var(--dark-red) 0%, transparent 15%);
 	top: 0;
 	left: 0;
 	right: 0;
@@ -620,7 +620,7 @@ button.button_dd4f85 /* small buttons */,
 .expandedFolderBackground_bc7085,
 .folder_bc7085,
 .folderIconWrapper_bc7085 {
-	background-color: var(--bg-4) !important;
+	background-color: var(--dark-red) !important;
 } */
 
 /* extra top margin for macos and custom clients */
@@ -879,7 +879,7 @@ html.theme-dark {
 	--background-message-highlight: var(--active);
 	--background-message-highlight-hover: var(--black);
 	--background-message-hover: var(--message-hover);
-	--background-mobile-primary: var(--bg-4);
+	--background-mobile-primary: var(--dark-red);
 	--background-mobile-secondary: var(--primary-630);
 	--background-modifier-accent: var(--hover);
 	--background-modifier-accent-2: red;
@@ -887,7 +887,7 @@ html.theme-dark {
 	--background-modifier-hover: var(--gold);
 	--background-modifier-selected: var(--active);
 	--background-nested-floating: var(--primary-630);
-	--background-primary: var(--bg-4);
+	--background-primary: var(--dark-red);
 	--background-secondary: var(--bg-3);
 	--background-secondary-alt: var(--bg-3);
 	--background-tertiary: var(--bg-3);
@@ -896,7 +896,7 @@ html.theme-dark {
 	--bg-base-primary: var(--primary-600);
 	--bg-base-secondary: var(--primary-630);
 	--bg-base-tertiary: var(--primary-660);
-	--bg-mod-faint: var(--bg-4);
+	--bg-mod-faint: var(--dark-red);
 	--bg-mod-strong: hsl(var(--primary-500-hsl) / 0.54);
 	--bg-mod-subtle: hsl(var(--primary-500-hsl) / 0.48);
 	--bg-surface-overlay: var(--primary-800);
@@ -1000,7 +1000,7 @@ html.theme-dark {
 	--header-muted: var(--text-4);
 	--header-primary: var(--text-2);
 	--header-secondary: var(--text-4);
-	--home-background: var(--bg-4);
+	--home-background: var(--dark-red);
 	--home-card-resting-border: hsl(var(--transparent-hsl) / 0);
 	--icon-muted: var(--primary-400);
 	--icon-primary: var(--primary-130);
@@ -1032,8 +1032,8 @@ html.theme-dark {
 	--logo-primary: var(--white-500);
 	--mention-background: var(--mention);
 	--mention-foreground: var(--accent-1);
-	--modal-background: var(--bg-4);
-	--modal-footer-background: var(--bg-4);
+	--modal-background: var(--dark-red);
+	--modal-footer-background: var(--dark-red);
 	--navigator-header-tint: var(--white-500);
 	--polls-image-normal-border: hsl(var(--black-430-hsl) / 0.9);
 	--polls-victor-border: var(--yellow-300);
@@ -1149,8 +1149,8 @@ html.theme-dark {
 	--voice-video-video-tile-blur-fallback: hsl(var(--primary-700-hsl) / 0.48);
 	--white: var(--white-500);
 
-	--profile-gradient-primary-color: var(--bg-4);
-	--profile-gradient-secondary-color: var(--bg-4);
+	--profile-gradient-primary-color: var(--dark-red);
+	--profile-gradient-secondary-color: var(--dark-red);
 
 	--elevation-low: none;
 	--search-popout-option-fade: none;
@@ -1182,14 +1182,14 @@ html.theme-dark {
 	--white-500: var(--gold);
 }
 
-.menu_d90b3d {
+.theme-dark .menu_d90b3d {
   background: var(--black) /* Right click menu */
 }
 
-.item_d90b3d {
+.theme-dark .item_d90b3d {
   color: var(--gold)
 }
 
-.scroller_d53d65 {
+.theme-dark .scroller_d53d65 {
   background: var(--dark-red)
 }
diff --git a/Discord/Pink-Angel.theme.css b/Discord/Pink-Angel.theme.css
index b7e00a9..58c2fd3 100644
--- a/Discord/Pink-Angel.theme.css
+++ b/Discord/Pink-Angel.theme.css
@@ -103,27 +103,27 @@
 }
 
 /* modify colors */
-#app-mount .container_ee69e0 /* channel list */,
-.privateChannels_f0963d /* dms list */,
-#app-mount .container_b2ca13 /* user panel inner */,
-.members_cbd271 /* member list inner */,
-.member_a31c43 /* member list members */,
-.searchResultsWrap_c2b47d /* search results */,
-.searchHeader_b7c924 /* search results header */,
-.chat_a7d72e.container_f3abf4 /* message requests */,
-#app-mount .panels_a4d4d9 > div /* user panel children */,
-.container_adcaac /* vc panel */,
-.sidebarRegionScroller_c25c6d /* settings left */,
-#app-mount .container_f1fd9c /* browse channels container */,
-#app-mount .header_f1fd9c /* browse channels header */,
-#app-mount .container_c2efea /* browse channels inner */,
-.chat_a7d72e.background_e85cee /* server guide body */,
-#app-mount .scrollerContainer_c6b11b /* channels and roles customize */,
-.shop_e77fa3 /* shop */,
-.wrapper_d880dc.minimum_d880dc /* private call */,
-.container_effbe2, .container__33507 /* emoji/sticker and gif picker searchbars */,
+.theme-light .container_ee69e0/* channel list */,
+.theme-light .privateChannels_f0963d /* dms list */,
+.theme-light #app-mount .container_b2ca13 /* user panel inner */,
+.theme-light .members_cbd271 /* member list inner */,
+.theme-light .member_a31c43 /* member list members */,
+.theme-light .searchResultsWrap_c2b47d /* search results */,
+.theme-light .searchHeader_b7c924 /* search results header */,
+.theme-light .chat_a7d72e.container_f3abf4 /* message requests */,
+.theme-light #app-mount .panels_a4d4d9 > div /* user panel children */,
+.theme-light .container_adcaac /* vc panel */,
+.theme-light .sidebarRegionScroller_c25c6d /* settings left */,
+.theme-light #app-mount .container_f1fd9c /* browse channels container */,
+.theme-light #app-mount .header_f1fd9c /* browse channels header */,
+.theme-light #app-mount .container_c2efea /* browse channels inner */,
+.theme-light .chat_a7d72e.background_e85cee /* server guide body */,
+.theme-light #app-mount .scrollerContainer_c6b11b /* channels and roles customize */,
+.theme-light .shop_e77fa3 /* shop */,
+.theme-light .wrapper_d880dc.minimum_d880dc /* private call */,
+.theme-light .container_effbe2, .theme-light .container__33507 /* emoji/sticker and gif picker searchbars */,
 #app-mount .uploadModal_f82cc7 /* upload modal */,
-.uploadModal_f82cc7 .footer_f82cc7 /* upload modal footer */ {
+.theme-light .uploadModal_f82cc7 .footer_f82cc7 /* upload modal footer */ {
 	background: var(--light-pink);
 }
 .userPanelOuter_c69a7b {
@@ -243,7 +243,7 @@ path[fill='var(--white-500)'] {
 	background: var(--bg-1) !important;
 }
 .container_cebd1c.checked_cebd1c > .slider_cebd1c > rect /* settings checkbutton circle */,
-.userMenuItem_e1268c path[fill="var(--white-500)"] /* account switcher account hover */,
+.userMenuItem_e1268c path[fill="var(--dark-pink)"] /* account switcher account hover */,
 .colorDefault_d90b3d.focused_d90b3d path {
 	fill: var(--text-0);
 }
@@ -1182,14 +1182,14 @@ html.theme-light {
 	--white-500: var(--dark-pink);
 }
 
-.menu_d90b3d {
+.theme-light .menu_d90b3d {
   background: var(--pink-white) /* Right click menu */
 }
 
-.item_d90b3d {
+.theme-light .item_d90b3d {
   color: var(--dark-pink)
 }
 
-.scroller_d53d65 {
+.theme-light .scroller_d53d65 {
   background: var(--light-pink)
 }