diff --git a/client/css/style.css b/client/css/style.css
index 7508bd32..b28ad4c0 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -372,11 +372,13 @@ kbd {
 
 #chat .motd .from::before {
 	content: "\f02e"; /* https://fontawesome.com/icons/bookmark?style=solid */
+	color: var(--body-color-muted);
 }
 
 #chat .ctcp .from::before,
 #chat .ctcp_request .from::before {
 	content: "\f15c"; /* https://fontawesome.com/icons/file-alt?style=solid */
+	color: var(--body-color-muted);
 }
 
 #chat .whois .from::before {
@@ -1195,7 +1197,6 @@ background on hover (unless active) */
 }
 
 #chat .from {
-	color: #b1c3ce;
 	padding-right: 10px;
 	text-align: right;
 	width: 134px;
@@ -1213,6 +1214,10 @@ background on hover (unless active) */
 	overflow: hidden; /* Prevents Zalgo text to expand beyond messages */
 }
 
+#chat .unhandled .from {
+	color: var(--body-color-muted);
+}
+
 #chat .special .time,
 #chat .special .from {
 	display: none;
@@ -1331,14 +1336,6 @@ background on hover (unless active) */
 	width: 50px;
 }
 
-#chat table.channel-list td.channel .inline-channel {
-	color: #428bca;
-}
-
-#chat table.channel-list td {
-	color: #555;
-}
-
 #chat.hide-status-messages .condensed,
 #chat.hide-motd .motd {
 	display: none !important;
diff --git a/client/themes/morning.css b/client/themes/morning.css
index de803f42..d3887611 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -124,14 +124,6 @@
 	color: #f92772;
 }
 
-#chat .unhandled .from {
-	color: #b7c5d1;
-}
-
-#chat table.channel-list td {
-	color: #b7c5d1;
-}
-
 #chat .msg.motd .text,
 code,
 .irc-monospace {