diff --git a/main.py b/main.py
index 289767c1bcfc12b6de7999dbfc92874ff570da1a..0fa399d6de63131fc6a9dd7d050cc8e7d1451415 100644
--- a/main.py
+++ b/main.py
@@ -21,6 +21,7 @@ from ui.Database import DBSelectWin
 # Main script
 if __name__ == "__main__":
 
+    sg.theme("SystemDefaultForReal")
     win = DBSelectWin()
     
     while win.poll():
diff --git a/ui/Database.py b/ui/Database.py
index 224c960651eece4e27b3aa6897d1e1d53da34bdc..b1d59e23236ccc2b42106eb9975aaae33c508687 100644
--- a/ui/Database.py
+++ b/ui/Database.py
@@ -66,28 +66,34 @@ class DBSelectWin (sg.Window):
         using_data = (self.edit_window is not None)
 
         self.buttons["-edit-"].update(
-            disabled=not has_db or using_data
+            disabled=not has_db or using_data,
+            button_color=sg.theme_button_color()
         )
 
         self.buttons["-plot-"].update(
-            disabled=not has_db or using_data
+            disabled=not has_db or using_data,
+            button_color=sg.theme_button_color()
         )
 
         self.buttons["-new-"].update(
-            disabled=has_db or using_data
+            disabled=has_db or using_data,
+            button_color=sg.theme_button_color()
         )
 
         self.buttons["-open-close-"].update(
             text="Close" if has_db else "Open",
-            disabled=using_data
+            disabled=using_data,
+            button_color=sg.theme_button_color()
         )
 
         self.inputs["-db_path-"].update(
-            disabled=has_db or using_data
+            disabled=has_db or using_data,
+            text_color="#000"
         )
 
         self.buttons["-browse-"].update(
-            disabled=has_db or using_data
+            disabled=has_db or using_data,
+            button_color=sg.theme_button_color()
         )