diff --git a/components/Settings/AppSettings/Appearance.vue b/components/Settings/AppSettings/Appearance.vue
index 92be5e1..9b31663 100644
--- a/components/Settings/AppSettings/Appearance.vue
+++ b/components/Settings/AppSettings/Appearance.vue
@@ -51,8 +51,9 @@
 <script lang="ts" setup>
 const runtimeConfig = useRuntimeConfig()
 const baseURL = runtimeConfig.app.baseURL;
-const styleFolder = `${baseURL}/themes/style`
-const layoutFolder = `${baseURL}/themes/layout`
+
+const styleFolder = `${baseURL}themes/style`
+const layoutFolder = `${baseURL}themes/layout`
 
 enum StyleLayout {
   Style,
diff --git a/utils/loadPreferredThemes.ts b/utils/loadPreferredThemes.ts
index 00a4d1b..33d2a68 100644
--- a/utils/loadPreferredThemes.ts
+++ b/utils/loadPreferredThemes.ts
@@ -2,20 +2,17 @@ let styleLinkElement: HTMLLinkElement | null;
 let layoutLinkElement: HTMLLinkElement | null;
 
 
-export default () => {
+export default () => {  
   const runtimeConfig = useRuntimeConfig()
   const baseURL = runtimeConfig.app.baseURL;
-  
-  let currentStyle = settingsLoad().selectedThemeStyle ?? undefined
-  let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
 
-  if (!currentStyle) {
-    if (prefersLight()) {
-      currentStyle = `${baseURL}themes/style/light.css`
-    } else {
-      currentStyle = `${baseURL}themes/style/dark.css`
-    }
-  }
+  let currentStyle = settingsLoad().selectedThemeStyle ?? (
+    prefersLight()
+      ? `${baseURL}themes/style/light.css`
+      : `${baseURL}themes/style/dark.css`
+  );
+
+  let currentLayout = settingsLoad().selectedThemeLayout ?? `${baseURL}themes/layout/gorb.css`
 
   if (styleLinkElement) {
     styleLinkElement.href = currentStyle;