diff --git a/ui/dist/themes/dark.css b/ui/dist/themes/dark.css
index 9c2f6d197..d6daa1d38 100644
--- a/ui/dist/themes/dark.css
+++ b/ui/dist/themes/dark.css
@@ -9,7 +9,7 @@
     --color-load-screen-text: #FFF;
     --color-money: var(--color-primary);
     --color-meta-light: #757575;
-    --color-dark-overlay: rgb(15, 21, 23, 0.85);
+    --color-dark-overlay: rgba(15, 21, 23, 0.85);
 
     /* Text */
     --text-color: #FFF;
@@ -32,9 +32,14 @@
     /* Header */
     --header-color: #EEE;
     --header-active-color: #FFF;
+    --header-button-bg: transparent;
 
     /* Table */
     --table-border: 0;
     --table-item-even: var(--color-bg-alt);
     --table-item-odd: transparent;
+
+    /* Modla */
+    --modal-overlay-bg: var(--color-dark-overlay);
+    --modal-border: 1px solid rgba(0, 0, 0, 0.25);
 }
diff --git a/ui/scss/_gui.scss b/ui/scss/_gui.scss
index 7e4d93f1d..59646f480 100644
--- a/ui/scss/_gui.scss
+++ b/ui/scss/_gui.scss
@@ -94,7 +94,7 @@ sub { top: 0.4em; }
 
 code {
   font: 0.8em Consolas, 'Lucida Console', 'Source Sans', monospace;
-  background-color: #eee;
+  background-color: var(--color-bg-alt);
 }
 
 p
diff --git a/ui/scss/_vars.scss b/ui/scss/_vars.scss
index 95e394126..75783d391 100644
--- a/ui/scss/_vars.scss
+++ b/ui/scss/_vars.scss
@@ -72,6 +72,7 @@
   --header-color: #666;
   --header-active-color: rgba(0,0,0, 0.85);
   --header-height: $spacing-vertical * 2.5;
+  --header-button-bg: var(--button-bg);
 
   /* Header -> search */
   --search-bg: rgba(255, 255, 255, 0.7);
diff --git a/ui/scss/component/_header.scss b/ui/scss/component/_header.scss
index e26c2aa9f..4f7eac1e3 100644
--- a/ui/scss/component/_header.scss
+++ b/ui/scss/component/_header.scss
@@ -18,7 +18,11 @@
   flex: 0 0 content;
   padding-left: $spacing-vertical / 4;
   padding-right: $spacing-vertical / 4;
+  .button-alt {
+      background: var(--header-button-bg) !important;
+  }
 }
+
 .header__item--wunderbar {
   flex-grow: 1;
 }
diff --git a/ui/scss/component/_modal.scss b/ui/scss/component/_modal.scss
index f367e45f3..7140e6cf8 100644
--- a/ui/scss/component/_modal.scss
+++ b/ui/scss/component/_modal.scss
@@ -74,7 +74,7 @@
   width: 400px;
 }
 .error-modal__error-list { /*shitty hack/temp fix for long errors making modal unusable*/
-  border: 1px solid #eee;
+  border: 1px solid var(--input-border-color);
   padding: 8px;
   list-style: none;
   max-height: 400px;