diff --git a/jslib b/jslib
index e372bf24..92a65b7b 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e372bf242b24f55c1142e33693ad2c801ab74c93
+Subproject commit 92a65b7b368a8dbf55350657674c90169b04c30b
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index c424d5f3..a7cdea27 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -135,7 +135,7 @@ export class SettingsComponent implements OnInit {
     this.localeOptions = localeOptions;
 
     this.themeOptions = [
-      { name: i18nService.t("default"), value: null },
+      { name: i18nService.t("default"), value: ThemeType.System },
       { name: i18nService.t("light"), value: ThemeType.Light },
       { name: i18nService.t("dark"), value: ThemeType.Dark },
       { name: "Nord", value: ThemeType.Nord },
diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 75e37e4f..5fdcef6b 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -47,7 +47,9 @@ import { ThemeType } from "jslib-common/enums/themeType";
 
 import { Account } from "../models/account";
 
-import { AccountFactory } from "jslib-common/models/domain/account";
+import { GlobalState } from "jslib-common/models/domain/globalState";
+
+import { StateFactory } from "jslib-common/factories/stateFactory";
 
 export function initFactory(
   window: Window,
@@ -190,7 +192,7 @@ export function initFactory(
           secureStorageService,
           logService,
           stateMigrationService,
-          new AccountFactory(Account)
+          new StateFactory(GlobalState, Account)
         ),
       deps: [
         StorageServiceAbstraction,
diff --git a/src/main.ts b/src/main.ts
index c2be3d9d..c636e500 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -22,7 +22,11 @@ import { NativeMessagingMain } from "./main/nativeMessaging.main";
 
 import { StateService } from "jslib-common/services/state.service";
 
-import { Account, AccountFactory } from "jslib-common/models/domain/account";
+import { Account } from "./models/account";
+
+import { GlobalState } from "jslib-common/models/domain/globalState";
+
+import { StateFactory } from "jslib-common/factories/stateFactory";
 
 export class Main {
   logService: ElectronLogService;
@@ -86,7 +90,7 @@ export class Main {
       null,
       this.logService,
       null,
-      new AccountFactory(Account)
+      new StateFactory(GlobalState, Account)
     );
 
     this.windowMain = new WindowMain(