diff --git a/private/css/Layout.css b/private/css/Layout.css
index 2e95fac..c0d1399 100644
--- a/private/css/Layout.css
+++ b/private/css/Layout.css
@@ -28,7 +28,6 @@ body {
 }
 
 #desktop {
-    background: var(--darkmode-background);
     cursor: default; /* Fix for issue in IE7. IE7 wants to use the I-bar text cursor */
     height: 100%;
     min-height: 100%;
@@ -330,7 +329,7 @@ li.divider {
 /* Column and Panel Handles */
 
 .horizontalHandle {
-    background: #eee url("../images/bg-handle-horizontal.gif") repeat-x;
+    background: url("../images/bg-handle-horizontal.gif") repeat-x;
     font-size: 1px;
     height: 4px;
     line-height: 1px;
@@ -342,7 +341,7 @@ li.divider {
 }
 
 .horizontalHandle .handleIcon {
-    background: url("../images/handle-icon-horizontal.gif") center center
+    background: var(--darkmode-line-color) url("../images/handle-icon-horizontal.gif") center center
         no-repeat;
     font-size: 1px;
     height: 4px;
@@ -352,8 +351,8 @@ li.divider {
 }
 
 .columnHandle {
-    background: #c3c3c3 url("../images/handle-icon.gif") center center no-repeat;
-    border: 1px solid #909090;
+    background: var(--darkmode-line-color) url("../images/handle-icon.gif") center center no-repeat;
+        border: 1px solid var(--darkmode-line-color);
     border-bottom: 0;
     border-top: 0;
     float: left;
diff --git a/private/css/Window.css b/private/css/Window.css
index ae6be66..0132958 100644
--- a/private/css/Window.css
+++ b/private/css/Window.css
@@ -19,12 +19,13 @@ Required by:
 ---------------------------------------------------------------- */
 
 .mocha {
-    background-color: #e5e5e5;
+    background: var(--darkmode-background);
     display: none;
     overflow: hidden;
 }
 
 .mochaOverlay {
+    background: var(--darkmode-background);
     left: 0;
     position: absolute; /* This is also set in theme.js in order to make theme transitions smoother */
     top: 0;
diff --git a/private/css/style.css b/private/css/style.css
index 53892d8..9d5440f 100644
--- a/private/css/style.css
+++ b/private/css/style.css
@@ -118,9 +118,9 @@ pre {
 /* Dividers */
 
 hr {
-    background-color: #ddd;
+    background-color: var(--darkmode-line-color);
     border: 0px;
-    color: #ccc;
+    color: var(--darkmode-text);
     height: 1px;
 }