diff --git a/src/index.ejs b/src/index.ejs
index 7cb00ad69..11d81f7d1 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -16,7 +16,7 @@
     <% } %>
   </head>
 
-  <body class="light mainRed secBlue">
+  <body class="dark mainRed secBlue">
     <div id="app"></div>
     <!-- Set `__static` path to static files in production -->
     <script>
diff --git a/src/main/index.js b/src/main/index.js
index 0fa7564f8..ac6d54f06 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -181,7 +181,7 @@ function runApp() {
      * Initial window options
      */
     const newWindow = new BrowserWindow({
-      backgroundColor: '#fff',
+      backgroundColor: '#212121',
       icon: isDev
         ? path.join(__dirname, '../../_icons/iconColor.png')
         /* eslint-disable-next-line */
diff --git a/src/renderer/App.js b/src/renderer/App.js
index c5b1115e8..504782cc4 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -125,6 +125,7 @@ export default Vue.extend({
     }
   },
   created () {
+    this.checkThemeSettings()
     this.setWindowTitle()
   },
   mounted: function () {
@@ -137,7 +138,6 @@ export default Vue.extend({
       this.grabAllProfiles(this.$t('Profile.All Channels')).then(async () => {
         this.grabHistory()
         this.grabAllPlaylists()
-        this.checkThemeSettings()
 
         if (this.usingElectron) {
           console.log('User is using Electron')
@@ -169,7 +169,7 @@ export default Vue.extend({
       let secColor = localStorage.getItem('secColor')
 
       if (baseTheme === null) {
-        baseTheme = 'light'
+        baseTheme = 'dark'
       }
 
       if (mainColor === null) {
diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index 5fd0181ae..4e61c67fe 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -22,7 +22,6 @@
   --logo-text: url("~../../_icons/textColorSmall.png");
 }
 
-
 .dark {
   --primary-text-color: #EEEEEE;
   --secondary-text-color: #ddd;
