diff --git a/Themes/default/css/index.css b/Themes/default/css/index.css
index bdeda3ebec..04c606a7f3 100644
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -954,17 +954,17 @@ a[class^="mobile_generic_menu_"] {
 }
 .pm_unread, .alerts_unread {
 	margin-top: 5px;
-	border-top: 1px solid #ddd;
+	border-top: var(--notifylist-border-width) var(--notifylist-border-style) var(--notifylist-border-color);
 }
 .unread_notify {
-	border-bottom: 1px solid #ddd;
+	border-bottom: var(--notifylist-border-width) var(--notifylist-border-style) var(--notifylist-border-color);
 }
 .no_unread {
 	margin-top: 5px;
 	text-align: center;
 }
 .unread_notify:hover {
-	background: #eee;
+	background: var(--notifylist-item-bg_hover);
 	text-decoration: none;
 }
 .unread_notify:last-child {
@@ -2843,26 +2843,26 @@ dl.stats {
 	padding: 0 12px 0 0;
 }
 #personal_messages .capacity_bar {
-	background: #f0f4f7;
+	background: var(--capacitybar-bg);
 	display: block;
 	margin: 6px 0 0 12px;
 	height: 12px;
-	border: 1px solid #adadad;
+	border: var(--capacitybar-border-width) var(--capacitybar-border-style) var(--capacitybar-border-color);
 	width: 10em;
 }
 #personal_messages .capacity_bar span {
-	border-right: 1px solid #adadad;
+	border-right: var(--capacitybar-border-width) var(--capacitybar-border-style) var(--capacitybar-border-color);
 	display: block;
 	height: 12px;
 }
 #personal_messages .capacity_bar span.empty {
-	background: #a6d69d;
+	background: var(--capacitybar-inner-bg_empty);
 }
 #personal_messages .capacity_bar span.filled {
-	background: #eea800;
+	background: var(--capacitybar-inner-bg_filled);
 }
 #personal_messages .capacity_bar span.full {
-	background: #f10909;
+	background: var(--capacitybar-inner-bg_full);
 }
 #personal_messages .reportlinks {
 	padding: 6px 1.3em;
@@ -2878,7 +2878,7 @@ dl.stats {
 }
 dl.addrules dt.floatleft {
 	width: 15em;
-	color: #333;
+	color: var(--pmrules-label-color);
 	padding: 0 15px 6px 15px;
 }
 #addrule fieldset {
@@ -2889,7 +2889,7 @@ dl.addrules dt.floatleft {
 	margin-right: 10px;
 }
 .unread_pm {
-	background: #cfc;
+	background: var(--unreadpm-bg);
 }
 /* Styles for the show alerts section.
 ------------------------------------------------- */
diff --git a/Themes/default/css/variables.css b/Themes/default/css/variables.css
index f8d1474a0c..f82905f948 100644
--- a/Themes/default/css/variables.css
+++ b/Themes/default/css/variables.css
@@ -559,6 +559,25 @@
 	--onoff-border-color_off:                         #969292;
 	--onoff-border-color_on:                          #74d246;
 
+	/** Personal Message Capacity Bar **/
+	--capacitybar-bg:                                 #f0f4f7;
+	--capacitybar-border-color:                       #adadad;
+	--capacitybar-border-style:                       solid;
+	--capacitybar-border-width:                       1px;
+	--capacitybar-inner-bg_empty:                     #a6d69d;
+	--capacitybar-inner-bg_filled:                    #eea800;
+	--capacitybar-inner-bg_full:                      #f10909;
+
+	/** Personal Messages **/
+	--pmrules-label-color:                            #333;
+	--unreadpm-bg:                                    #cfc;
+
+	/* The unread message and alert lists in the user menu. */
+	--notifylist-border-color:                        #ddd;
+	--notifylist-border-style:                        solid;
+	--notifylist-border-width:                        1px;
+	--notifylist-item-bg_hover:                       #eee;
+
 	/** Search Highlight **/
 	--searchhighlight-color:                          #ff7200;
 	--searchhighlight-font-size:                      1.1em;