diff --git a/src/main.ts b/src/main.ts
index 35b00f3..86377bf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,7 @@
 import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { AppComponent } from './app/app.component';
+import { AppComponent } from '@/src/app.component';
+import { appConfig } from '@/src/app.config';
+
 
 bootstrapApplication(AppComponent, appConfig)
   .catch((err) => console.error(err));
diff --git a/src/views/pages/auth/login.ts b/src/views/pages/auth/login.ts
index 4d57ca6..bbdcceb 100644
--- a/src/views/pages/auth/login.ts
+++ b/src/views/pages/auth/login.ts
@@ -6,7 +6,7 @@ import { PasswordModule} from 'primeng/password';
 import {FormsModule} from '@angular/forms';
 import {RouterModule} from '@angular/router';
 import { RippleModule} from 'primeng/ripple';
-import { LayoutService } from '@/src/service/applayoutservice';
+import { LayoutService } from '@/src/service/layout.service';
 
 
 @Component({
@@ -23,7 +23,7 @@ import { LayoutService } from '@/src/service/applayoutservice';
   template: `
     <div class="surface-ground flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
     <div class="flex flex-column align-items-center justify-content-center">
-      <img src="assets/layout/images/{{layoutService.config().colorScheme === 'light' ? 'logo-dark' : 'logo-white'}}.svg" alt="Sakai logo" class="mb-5 w-6rem flex-shrink-0">
+      <img src="assets/layout/images/{{layoutService.isDarkTheme() ? 'logo-dark' : 'logo-white'}}.svg" alt="Sakai logo" class="mb-5 w-6rem flex-shrink-0">
       <div style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, var(--primary-color) 10%, rgba(33, 150, 243, 0) 30%);">
         <div class="w-full surface-card py-8 px-5 sm:px-8" style="border-radius:53px">
           <div class="text-center mb-5">