diff --git a/website/o3dv/css/controls.css b/website/o3dv/css/controls.css
index 2975408..cbf2421 100644
--- a/website/o3dv/css/controls.css
+++ b/website/o3dv/css/controls.css
@@ -59,8 +59,9 @@ div.ov_button
 
 div.ov_button.outline
 {
-	color: var(--ov_button_color);
+	color: var(--ov_outline_button_text_color);
 	background: transparent;
+	border: 1px solid var(--ov_outline_button_color);
 }
 
 div.ov_tooltip
@@ -84,8 +85,8 @@ div.ov_button:hover
 
 div.ov_button.outline:hover
 {
-	background: var(--ov_hover_color);
-	border: 1px solid var(--ov_button_color);
+	background: var(--ov_outline_button_hover_color);
+	border: 1px solid var(--ov_outline_button_color);
 }
 
 }
diff --git a/website/o3dv/css/core.css b/website/o3dv/css/core.css
index 927599b..d004bf0 100644
--- a/website/o3dv/css/core.css
+++ b/website/o3dv/css/core.css
@@ -5,6 +5,9 @@
     --ov_button_color: #3393bd;
     --ov_button_hover_color: #146a8f;
     --ov_button_text_color: #ffffff;
+    --ov_outline_button_color: #3393bd;
+    --ov_outline_button_hover_color: #c9e5f8;
+    --ov_outline_button_text_color: #3393bd;
 	--ov_icon_color: #263238;
 	--ov_hover_color: #c9e5f8;
 	--ov_light_icon_color: #838383;
diff --git a/website/o3dv/js/themehandler.js b/website/o3dv/js/themehandler.js
index 4b4a5bc..9bce861 100644
--- a/website/o3dv/js/themehandler.js
+++ b/website/o3dv/js/themehandler.js
@@ -8,6 +8,9 @@ OV.ThemeHandler = class {
                     '--ov_button_color': '#3393bd',
                     '--ov_button_hover_color': '#146a8f',
                     '--ov_button_text_color': '#ffffff',
+                    '--ov_outline_button_color': '#3393bd',
+                    '--ov_outline_button_hover_color': '#c9e5f8',
+                    '--ov_outline_button_text_color': '#3393bd',
                     '--ov_icon_color': '#263238',
                     '--ov_hover_color': '#c9e5f8',
                     '--ov_light_icon_color': '#838383',
@@ -30,6 +33,9 @@ OV.ThemeHandler = class {
                     '--ov_button_color': '#3393bd',
                     '--ov_button_hover_color': '#146a8f',
                     '--ov_button_text_color': '#ffffff',
+                    '--ov_outline_button_color': '#c9e5f8',
+                    '--ov_outline_button_hover_color': '#2a2b2e',
+                    '--ov_outline_button_text_color': '#c9e5f8',
                     '--ov_icon_color': '#fafafa',
                     '--ov_hover_color': '#667c86',
                     '--ov_light_icon_color': '#dadada',
diff --git a/website/o3dv/js/website.js b/website/o3dv/js/website.js
index 7e7b3c7..49b0efa 100644
--- a/website/o3dv/js/website.js
+++ b/website/o3dv/js/website.js
@@ -46,6 +46,7 @@ OV.Website = class
 
     Load ()
     {
+        this.themeHandler.SwitchTheme ('dark');
         this.settings.LoadFromCookies (this.cookieHandler);
 
         this.InitViewer ();
@@ -66,8 +67,6 @@ OV.Website = class
         $(window).on ('resize', () => {
 			this.Resize ();
 		});
-
-        this.themeHandler.SwitchTheme ('dark');
     }
 
     Resize ()