diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
index 3562a11..d3cd98e 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
@@ -65,7 +65,7 @@ export class BaseTableComponent<TModel, TApiService extends ApiService<TModel>>
     }
   };
 
-  theme: GuiTheme = GuiTheme.DARK;
+  theme: GuiTheme = localStorage.getItem('theme') === 'dark' ? GuiTheme.DARK : GuiTheme.FABRIC;
 
   private themeSubscription: Subscription = new Subscription();
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
index 5393f59..7c93e54 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/login/login.component.ts
@@ -22,6 +22,7 @@ export class LoginComponent {
   IsPwdHidden: boolean = true;
 
   constructor(private authService: AuthenticationService, @Inject(MAT_DIALOG_DATA) public data: any) {
+    //localStorage.getItem('theme') === 'dark'
     if (typeof (this.afterLogin) == typeof (data.afterLogin))
       this.afterLogin = data.afterLogin;
   }
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
index f72beba..2a6a239 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/nav-menu/nav-menu.component.ts
@@ -28,7 +28,7 @@ export class NavMenuComponent {
   }
 
   get isDarkTheme(): boolean {
-    return true;
+    return localStorage.getItem('theme') === 'dark'
   }
 
   collapse() {
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
index 263c737..b962070 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
@@ -17,6 +17,7 @@ export class ColorModeService {
   }
 
   setTheme(theme: Theme) {
+    localStorage.setItem('theme', theme)
     this.updateTheme();
   }
 
@@ -75,7 +76,7 @@ export const ParseTheme: (value: string) => Theme | undefined = (value: string)
 }
 
 export function GetLocalTheme(): Theme {
-  let sTheme: string | null = 'dark';
+  let sTheme: string | null = localStorage.getItem('theme');
 
   if (sTheme === null)
     return Theme.Dark;