diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css
index eca6d4a8ed..1af481b1cd 100644
--- a/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css
+++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/drawings.css
@@ -203,10 +203,11 @@ footer p {
 
 
 
-button {
-    background-color: var(--blender-panel-header, var(--bg-color));
-    color: var(--blender-text, var(--text-color));
-    border-color: var(--blender-tab-outline, var(--border-color));
+button,
+select {
+    background-color: var(--blender-button-background, var(--bg-color));
+    color: var(--blender-button-text, var(--text-color));
+    border-color: var(--blender-button-border, var(--border-color));
     transition: filter 0.2s ease;
 }
 
diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css
index 1443d86cbb..225547ff78 100644
--- a/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css
+++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/gantt.css
@@ -250,17 +250,12 @@ footer p {
     }
 }
 
-:root.blender button {
-    background-color: var(--blender-panel-header);
-    color: var(--blender-text);
-    border-color: var(--blender-tab-outline);
-    transition: filter 0.2s ease;
-}
 
-button {
-    background-color: var(--blender-panel-header, var(--bg-color));
-    color: var(--blender-text, var(--text-color));
-    border-color: var(--blender-tab-outline, var(--border-color));
+button,
+select {
+    background-color: var(--blender-button-background, var(--bg-color));
+    color: var(--blender-button-text, var(--text-color));
+    border-color: var(--blender-button-border, var(--border-color));
     transition: filter 0.2s ease;
 }
 
@@ -509,7 +504,9 @@ button:hover {
 
 /* Highlight row */
 :root.blender .gitemhighlight td,
-:root.blender .gitemhighlight .gantt-inputtable {
+:root.blender .gitemhighlight .gantt-inputtable,
+:root.blender .gitemhighlight .gcaption,
+:root.blender .gitemhighlight .ggroupcaption {
     background-color: var(--blender-active-highlight) !important;
     color: var(--blender-active-text-highlight) !important;
 }
@@ -568,7 +565,7 @@ button:hover {
 :root.blender .gantt-inputtable {
     background-color: var(--blender-panel-header);
     box-sizing: border-box;
-    border: 2px solid var(--blender-top-bar-header);
+    border: 2px solid var(--blender-button-border);
     color: var(--blender-text);
 }
 
diff --git a/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css b/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css
index 682466a3f7..2e8d6b2814 100644
--- a/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css
+++ b/src/blenderbim/blenderbim/bim/data/webui/static/css/index.css
@@ -210,10 +210,11 @@ footer p {
     margin-top: var(--margin-small);
 }
 
-button {
-    background-color: var(--blender-panel-header, var(--bg-color));
-    color: var(--blender-text, var(--text-color));
-    border-color: var(--blender-tab-outline, var(--border-color));
+button,
+select {
+    background-color: var(--blender-button-background, var(--bg-color));
+    color: var(--blender-button-text, var(--text-color));
+    border-color: var(--blender-button-border, var(--border-color));
     transition: filter 0.2s ease;
 }
 
diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py
index a97f73c119..7657312e16 100644
--- a/src/blenderbim/blenderbim/tool/web.py
+++ b/src/blenderbim/blenderbim/tool/web.py
@@ -396,6 +396,7 @@ class Web(blenderbim.core.tool.Web):
         top_bar = bpy.context.preferences.themes[0].topbar.space
         info = bpy.context.preferences.themes[0].info
         outliner = bpy.context.preferences.themes[0].outliner
+        ui = bpy.context.preferences.themes[0].user_interface
 
         theme = {
             "window_background": get_color(prefs, "back"),
@@ -413,6 +414,9 @@ class Web(blenderbim.core.tool.Web):
             "even_row": mix_colors(get_color(outliner.space, "back"), get_color(outliner, "row_alternate")),
             "active_highlight": get_color(outliner, "active"),
             "active_text_highlight": get_color(outliner, "active_object"),
+            "button_background": get_color(ui.wcol_tool, "inner"),
+            "button_test": get_color(ui.wcol_tool, "text"),
+            "button_border": get_color(ui.wcol_tool, "outline"),
         }
         cls.send_webui_data(theme, "theme", "theme_data", use_web_data=False)