diff --git a/index.html b/index.html
index b0d2913..b5adb1b 100644
--- a/index.html
+++ b/index.html
@@ -226,21 +226,15 @@
         <div class="debug-row"><span class="debug-label">Speed:</span> <span id="dbg-speed">--</span></div>
         <div class="debug-row"><span class="debug-label">Transition:</span> <span id="dbg-trans">--</span></div>
         <div class="debug-section">Effective theme</div>
-        <div class="debug-row"><span class="libel">sky</span> <div class="swatch" id="dbg-t-sky"></div> <span class="hex" id="dbg-h-sky">--</span></div>
-        <div class="debug-row"><span class="libel">cloud</span> <div class="swatch" id="dbg-t-cloud"></div> <span class="hex" id="dbg-h-cloud">--</span></div>
-        <div class="debug-row"><span class="libel">shadow</span> <div class="swatch" id="dbg-t-cloudShadow"></div> <span class="hex" id="dbg-h-cloudShadow">--</span></div>
-        <div class="debug-row"><span class="libel">sun</span> <div class="swatch" id="dbg-t-sun"></div> <span class="hex" id="dbg-h-sun">--</span></div>
-        <div class="debug-row"><span class="libel">glare</span> <div class="swatch" id="dbg-t-sunGlare"></div> <span class="hex" id="dbg-h-sunGlare">--</span></div>
-        <div class="debug-row"><span class="libel">light</span> <div class="swatch" id="dbg-t-sunLight"></div> <span class="hex" id="dbg-h-sunLight">--</span></div>
-        <div class="debug-row"><span class="libel">bg</span> <div class="swatch" id="dbg-t-bg"></div> <span class="hex" id="dbg-h-bg">--</span></div>
+        <div class="debug-row"><span class="libel">skyColor</span> <div class="swatch" id="dbg-t-sky"></div> <span class="hex" id="dbg-h-sky">--</span></div>
+        <div class="debug-row"><span class="libel">cloudColor</span> <div class="swatch" id="dbg-t-cloud"></div> <span class="hex" id="dbg-h-cloud">--</span></div>
+        <div class="debug-row"><span class="libel">lightColor</span> <div class="swatch" id="dbg-t-sunLight"></div> <span class="hex" id="dbg-h-sunLight">--</span></div>
+        <div class="debug-row"><span class="libel">bgColor</span> <div class="swatch" id="dbg-t-bg"></div> <span class="hex" id="dbg-h-bg">--</span></div>
         <div class="debug-section">Vanta colors</div>
-        <div class="debug-row"><span class="libel">sky</span> <div class="swatch" id="dbg-v-sky"></div> <span class="hex" id="dbg-vh-sky">--</span></div>
-        <div class="debug-row"><span class="libel">cloud</span> <div class="swatch" id="dbg-v-cloud"></div> <span class="hex" id="dbg-vh-cloud">--</span></div>
-        <div class="debug-row"><span class="libel">shadow</span> <div class="swatch" id="dbg-v-cloudShadow"></div> <span class="hex" id="dbg-vh-cloudShadow">--</span></div>
-        <div class="debug-row"><span class="libel">sun</span> <div class="swatch" id="dbg-v-sun"></div> <span class="hex" id="dbg-vh-sun">--</span></div>
-        <div class="debug-row"><span class="libel">glare</span> <div class="swatch" id="dbg-v-sunGlare"></div> <span class="hex" id="dbg-vh-sunGlare">--</span></div>
-        <div class="debug-row"><span class="libel">light</span> <div class="swatch" id="dbg-v-sunLight"></div> <span class="hex" id="dbg-vh-sunLight">--</span></div>
-        <div class="debug-row"><span class="libel">bg</span> <div class="swatch" id="dbg-v-bg"></div> <span class="hex" id="dbg-vh-bg">--</span></div>
+        <div class="debug-row"><span class="libel">skyColor</span> <div class="swatch" id="dbg-v-sky"></div> <span class="hex" id="dbg-vh-sky">--</span></div>
+        <div class="debug-row"><span class="libel">cloudColor</span> <div class="swatch" id="dbg-v-cloud"></div> <span class="hex" id="dbg-vh-cloud">--</span></div>
+        <div class="debug-row"><span class="libel">lightColor</span> <div class="swatch" id="dbg-v-sunLight"></div> <span class="hex" id="dbg-vh-sunLight">--</span></div>
+        <div class="debug-row"><span class="libel">bgColor</span> <div class="swatch" id="dbg-v-bg"></div> <span class="hex" id="dbg-vh-bg">--</span></div>
     </div>
     <div id="info-panel">
         <svg id="analog-clock" viewBox="0 0 280 280">
@@ -958,30 +952,20 @@ var weatherThemes = {
                     var k = keys[i];
                     var kk = keyMap[k];
                     var c = themeColors[k];
-                    if (kk === 'sunLight') {
-                        document.getElementById('dbg-t-sunLight').style.backgroundColor = '#' + ('00000' + c.toString(16)).slice(-6);
-                        document.getElementById('dbg-h-sunLight').textContent = '#' + ('00000' + c.toString(16)).slice(-6);
-                    } else {
-                        document.getElementById('dbg-t-' + kk).style.backgroundColor = '#' + ('00000' + c.toString(16)).slice(-6);
-                        document.getElementById('dbg-h-' + kk).textContent = '#' + ('00000' + c.toString(16)).slice(-6);
-                    }
+                    document.getElementById('dbg-t-' + kk).style.backgroundColor = '#' + ('00000' + c.toString(16)).slice(-6);
+                    document.getElementById('dbg-h-' + kk).textContent = '#' + ('00000' + c.toString(16)).slice(-6);
                 }
             }
 
             if (vantaColors) {
                 var vKeys = ['sky', 'cloud', 'light', 'bg'];
-                var vKeyMap = {sky: 'sky', cloud: 'cloud', light: 'sunLight', bg: 'bg'};
                 for (var j = 0; j < vKeys.length; j++) {
                     var vk = vKeys[j];
                     var vc = vantaColors[vk];
-                    var kk = vKeyMap[vk];
-                    if (kk === 'sunLight') {
-                        document.getElementById('dbg-v-sunLight').style.backgroundColor = '#' + ('00000' + vc.toString(16)).slice(-6);
-                        document.getElementById('dbg-vh-sunLight').textContent = '#' + ('00000' + vc.toString(16)).slice(-6);
-                    } else {
-                        document.getElementById('dbg-v-' + kk).style.backgroundColor = '#' + ('00000' + vc.toString(16)).slice(-6);
-                        document.getElementById('dbg-vh-' + kk).textContent = '#' + ('00000' + vc.toString(16)).slice(-6);
-                    }
+                    var id = 'dbg-v-' + vk;
+                    var hid = 'dbg-vh-' + vk;
+                    document.getElementById(id).style.backgroundColor = '#' + ('00000' + vc.toString(16)).slice(-6);
+                    document.getElementById(hid).textContent = '#' + ('00000' + vc.toString(16)).slice(-6);
                 }
             }
         }