diff --git a/js/kiri-init.js b/js/kiri-init.js
index 3b615541..b5031dc8 100644
--- a/js/kiri-init.js
+++ b/js/kiri-init.js
@@ -1605,6 +1605,7 @@ var gs_kiri_init = exports;
         if (dark) {
             SPACE.platform.setGrid(25, 5, 0x999999, 0x333333);
             SPACE.platform.opacity(0.8);
+            DOC.body.classList.add('dark');
         } else {
             SPACE.platform.setGrid(25, 5, 0x999999, 0xcccccc);
             SPACE.platform.opacity(0.3);
diff --git a/web/kiri/style.css b/web/kiri/style.css
index 97d14a73..3fd32296 100644
--- a/web/kiri/style.css
+++ b/web/kiri/style.css
@@ -4,6 +4,10 @@ input[type=range]::-moz-focus-outer {
 .grouphead {
     position: relative;
 }
+.dark .popper {
+    background-color: rgba(255,255,255,0.75);
+    color: black;
+}
 .popper {
     position: absolute;
     top: 0;
diff --git a/web/moto/style.css b/web/moto/style.css
index 274cbe65..02529017 100644
--- a/web/moto/style.css
+++ b/web/moto/style.css
@@ -20,7 +20,6 @@ body,div {
 }
 label {
     font-size: 14px;
-    border-bottom: 1px solid #ddd;
     margin-right: 2px;
 }
 canvas {
@@ -96,6 +95,15 @@ th, tr, td, span, div, label, button {
     flex-basis: auto;
     width: 33.33%;
 }
+.grouphead:first-of-type {
+    margin-top: 0;
+}
+.dark .grouphead {
+    background-color: rgba(100,120,150,0.75);
+    border: 1px solid #555;
+    color: #eee;
+    font-weight: normal;
+}
 .grouphead {
     color: black;
     background-color: rgba(170,221,255,0.7);
@@ -182,6 +190,16 @@ th, tr, td, span, div, label, button {
  margin-right: -14px !important;
  margin-bottom: -14px !important;
 }
+.dark .control {
+    border: 0 !important;
+    background-color: rgba(255,255,255,0.5);
+}
+.dark .control button {
+    border: 1px solid rgba(128,128,128,0.5);
+}
+.control {
+    background-color: rgba(255,255,255,0.75);
+}
 .control label {
     padding: 2px;
 }
@@ -276,6 +294,10 @@ th, tr, td, span, div, label, button {
     width: 100%;
     height: 100%;
 }
+#control > div:hover label {
+    text-decoration: underline;
+    text-decoration-color: #aaa;
+}
 #control-left {
     display: none;
     position: fixed;
@@ -284,12 +306,11 @@ th, tr, td, span, div, label, button {
     top: 5px;
     left: 0px;
     padding: 5px;
-    border-top: 3px solid #ddd;
-    border-right: 3px solid #ddd;
-    border-bottom: 3px solid #ddd;
+    border-top: 2px solid #ddd;
+    border-right: 2px solid #ddd;
+    border-bottom: 2px solid #ddd;
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
-    background-color: rgba(255,255,255,0.75);
     overflow-x: visible;
     overflow-y: scroll;
 }
@@ -301,16 +322,27 @@ th, tr, td, span, div, label, button {
     right: 0px;
     bottom: 5px;
     padding: 5px;
-    border-top: 3px solid #ddd;
-    border-left: 3px solid #ddd;
-    border-bottom: 3px solid #ddd;
+    border-top: 2px solid #ddd;
+    border-left: 2px solid #ddd;
+    border-bottom: 2px solid #ddd;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
-    background-color: rgba(255,255,255,0.75);
     color: #222;
     overflow-y: scroll;
     overflow-x: visible;
 }
+.dark .compact .grouphead {
+    background-color: rgba(100,120,150,0.75);
+    border: 1px solid #555;
+    color: #eee;
+    xfont-weight: normal;
+}
+.dark .compact .grouphead:hover {
+    background-color: rgba(80,100,180,0.75);
+}
+.dark .compact.control {
+    background-color: rgba(128,128,128,0.2) !important;
+}
 .compact {
     overflow: visible !important;
     bottom: auto !important;
@@ -360,6 +392,9 @@ th, tr, td, span, div, label, button {
 #control-left::-webkit-scrollbar, #control-right::-webkit-scrollbar {
     display: none;
 }
+.dark #control-left:hover, .dark #control-right:hover {
+    background-color: rgba(255,255,255,0.6);
+}
 #control-left:hover, #control-right:hover {
     background-color: #ffffff;
 }