diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts
index e361397565..593992415f 100644
--- a/src/common/__tests__/user-store.test.ts
+++ b/src/common/__tests__/user-store.test.ts
@@ -57,11 +57,12 @@ describe("user store tests", () => {
       expect(us.preferences.colorTheme).toBe('light')
     })
 
-    it("correctly resets theme to default value", () => {
+    it("correctly resets theme to default value", async () => {
       const us = UserStore.getInstance<UserStore>();
+      us.isLoaded = true;
 
       us.preferences.colorTheme = "some other theme";
-      us.resetTheme();
+      await us.resetTheme();
       expect(us.preferences.colorTheme).toBe(UserStore.defaultTheme);
     })
 
diff --git a/src/common/user-store.ts b/src/common/user-store.ts
index b03616c1d2..6a988d4004 100644
--- a/src/common/user-store.ts
+++ b/src/common/user-store.ts
@@ -88,7 +88,8 @@ export class UserStore extends BaseStore<UserStoreModel> {
   }
 
   @action
-  resetTheme() {
+  async resetTheme() {
+    await this.whenLoaded;
     this.preferences.colorTheme = UserStore.defaultTheme;
   }
 
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index 5d3b65f5e9..b7c492c9f5 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -23,7 +23,6 @@
   --font-weight-thin: 300;
   --font-weight-normal: 400;
   --font-weight-bold: 500;
-  --mainBackground: #1e2124;
   --main-layout-header: 40px;
   --drag-region-height: 22px
 }
diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts
index e96bc1f873..4b8dc5fffd 100644
--- a/src/renderer/theme.store.ts
+++ b/src/renderer/theme.store.ts
@@ -48,6 +48,7 @@ export class ThemeStore {
         await this.loadTheme(themeId);
         this.applyTheme();
       } catch (err) {
+        logger.error(err);
         userStore.resetTheme();
       }
     }, {
@@ -79,7 +80,7 @@ export class ThemeStore {
       }
       return existingTheme;
     } catch (err) {
-      logger.error(`Can't load theme "${themeId}": ${err}`);
+      throw new Error(`Can't load theme "${themeId}": ${err}`);
     }
   }
 
@@ -90,7 +91,7 @@ export class ThemeStore {
       document.head.prepend(this.styles);
     }
     const cssVars = Object.entries(theme.colors).map(([cssName, color]) => {
-      return `--${cssName}: ${color} !important;`
+      return `--${cssName}: ${color};`;
     });
     this.styles.textContent = `:root {\n${cssVars.join("\n")}}`;
     // Adding universal theme flag which can be used in component styles