diff --git a/web/gui/src/main/webapp/app/fw/layer/dialog-theme.css b/web/gui/src/main/webapp/app/fw/layer/dialog-theme.css
index 213b7fa..23626d0 100644
--- a/web/gui/src/main/webapp/app/fw/layer/dialog-theme.css
+++ b/web/gui/src/main/webapp/app/fw/layer/dialog-theme.css
@@ -22,8 +22,11 @@
     background-color: #518ecc;
     color: white;
 }
+
+
+/* ========== DARK Theme ========== */
+
 .dark .dialog .dialog-button {
-    /* TODO: dark theme */
-    background-color: #518ecc;
-    color: white;
+    background-color: #345e85;
+    color: #cccccd;
 }
diff --git a/web/gui/src/main/webapp/app/fw/layer/flash-theme.css b/web/gui/src/main/webapp/app/fw/layer/flash-theme.css
index 30fe6d5..3f271fd 100644
--- a/web/gui/src/main/webapp/app/fw/layer/flash-theme.css
+++ b/web/gui/src/main/webapp/app/fw/layer/flash-theme.css
@@ -21,22 +21,27 @@
 .light #flash svg g.flashItem rect {
     fill: #ccc;
 }
-.dark #flash svg g.flashItem rect {
-    fill: #555;
-}
 
 .light #flash svg g.flashItem text {
     fill: #333;
 }
-.dark #flash svg g.flashItem text {
-    fill: #999;
-}
 
 .light .centered {
     box-shadow: 2px 2px 24px 5px #888;
     background-color: #eee;
 }
-/* TODO: confirm / fix dark*/
+
+
+/* ========== DARK Theme ========== */
+
+.dark #flash svg g.flashItem rect {
+    fill: #555;
+}
+
+.dark #flash svg g.flashItem text {
+    fill: #999;
+}
+
 .dark .centered {
     box-shadow: 2px 2px 24px 5px #888;
     background-color: #eee;
diff --git a/web/gui/src/main/webapp/app/fw/layer/panel-theme.css b/web/gui/src/main/webapp/app/fw/layer/panel-theme.css
index 3e966ae..a9d7888 100644
--- a/web/gui/src/main/webapp/app/fw/layer/panel-theme.css
+++ b/web/gui/src/main/webapp/app/fw/layer/panel-theme.css
@@ -23,9 +23,44 @@
     color: #3c3a3a;
     border: 1px solid #c7c7c0;
 }
-.dark .floatpanel {
-    /* TODO: dark theme */
-    background-color: white;
-    color: #3c3a3a;
+
+.light .floatpanel hr {
     border: 1px solid #c7c7c0;
 }
+
+.light .floatpanel .bottom tr:nth-child(odd) {
+    background-color: #f4f4f4;
+}
+
+.light .floatpanel .bottom tr:nth-child(even) {
+    background-color: #fbfbfb;
+}
+
+
+/* ========== DARK Theme ========== */
+
+.dark .floatpanel {
+    background-color: #282528;
+    color: #888c8c;
+    border: 1px solid #364144;
+}
+
+.dark .floatpanel th {
+    background-color: #242424;
+}
+
+.dark .floatpanel h2 {
+    color: #dddddd;
+}
+
+.dark .floatpanel hr {
+    border: 1px solid #30303a;
+}
+
+.dark .floatpanel .bottom tr:nth-child(odd) {
+    background-color: #333333;
+}
+
+.dark .floatpanel .bottom tr:nth-child(even) {
+    background-color: #3a3a3a;
+}