diff --git a/src/App.tsx b/src/App.tsx
index 9f1cd7f..690ff66 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -6,6 +6,7 @@ import {
 	mergeMantineTheme,
 } from '@mantine/core';
 import { Notifications } from '@mantine/notifications';
+import { Loading, MainLayout } from 'components';
 import { useCommonHooks, useQueryAPI } from 'hooks';
 import { useEffect, useState } from 'react';
 import {
@@ -15,7 +16,6 @@ import {
 	Route,
 	RouterProvider,
 } from 'react-router-dom';
-import { Loading, MainLayout } from './components';
 import '@mantine/core/styles.css';
 import '@mantine/dates/styles.css';
 import '@mantine/notifications/styles.css';
diff --git a/src/components/MainLayout.tsx b/src/components/MainLayout.tsx
index 353c887..6d8e48d 100644
--- a/src/components/MainLayout.tsx
+++ b/src/components/MainLayout.tsx
@@ -12,7 +12,7 @@ export function MainLayout() {
 				'--image-background':
 					theme.backgroundImage.toLocaleLowerCase() === 'none'
 						? undefined
-						: `linear-gradient(${theme.backgroundColor}33, ${theme.backgroundColor}33), url(../../api/backgroundImages/${theme.backgroundImage})`,
+						: `linear-gradient(${theme.backgroundColor}33, ${theme.backgroundColor}33), url(../../trigger/api/backgroundImages/${theme.backgroundImage})`,
 			}}
 		>
 			<Outlet />
diff --git a/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx b/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
index c964661..b7cbe6d 100644
--- a/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
+++ b/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
@@ -248,7 +248,7 @@ export function BackgroundModal({
 														style={{
 															aspectRatio: '16/9',
 															width: '100%',
-															backgroundImage: `url(../../api/backgroundImages/thumbs/${background})`,
+															backgroundImage: `url(../../trigger/api/backgroundImages/thumbs/${background})`,
 															backgroundSize: 'cover',
 															backgroundPosition: 'center',
 															backgroundRepeat: 'no-repeat',
diff --git a/src/pages/settings/components/Theming/Backgrounds/components/BackgroundLightbox.tsx b/src/pages/settings/components/Theming/Backgrounds/components/BackgroundLightbox.tsx
index 87547e2..910613c 100644
--- a/src/pages/settings/components/Theming/Backgrounds/components/BackgroundLightbox.tsx
+++ b/src/pages/settings/components/Theming/Backgrounds/components/BackgroundLightbox.tsx
@@ -36,7 +36,7 @@ export function BackgroundLightbox({
 					<Image
 						style={{ cursor: 'zoom-out' }}
 						onClick={close}
-						src={`../../api/backgroundImages/${background}`}
+						src={`../../trigger/api/backgroundImages/${background}`}
 					/>
 				</Modal.Body>
 			</Modal.Content>
diff --git a/src/pages/settings/components/Theming/Backgrounds/components/DeleteBackground.tsx b/src/pages/settings/components/Theming/Backgrounds/components/DeleteBackground.tsx
index 76ac6cd..059e8f2 100644
--- a/src/pages/settings/components/Theming/Backgrounds/components/DeleteBackground.tsx
+++ b/src/pages/settings/components/Theming/Backgrounds/components/DeleteBackground.tsx
@@ -41,7 +41,7 @@ export function DeleteBackground({
 				style={{
 					aspectRatio: '16/9',
 					height: '100%',
-					backgroundImage: `url(../../api/backgroundImages/thumbs/${fileName})`,
+					backgroundImage: `url(../../trigger/api/backgroundImages/thumbs/${fileName})`,
 					backgroundSize: 'cover',
 					backgroundPosition: 'center',
 					backgroundRepeat: 'no-repeat',
diff --git a/src/pages/settings/components/Theming/Backgrounds/components/EditBackground.tsx b/src/pages/settings/components/Theming/Backgrounds/components/EditBackground.tsx
index d9eb5dd..c8f949d 100644
--- a/src/pages/settings/components/Theming/Backgrounds/components/EditBackground.tsx
+++ b/src/pages/settings/components/Theming/Backgrounds/components/EditBackground.tsx
@@ -49,7 +49,7 @@ export function EditBackground({
 							: undefined
 					}
 				/>
-				<Image src={`../../api/backgroundImages/thumbs/${fileName}`} />
+				<Image src={`../../trigger/api/backgroundImages/thumbs/${fileName}`} />
 			</Stack>
 			<Group>
 				<Button
diff --git a/src/pages/settings/components/Theming/ThemePlaylists/components/ThemeSelect.tsx b/src/pages/settings/components/Theming/ThemePlaylists/components/ThemeSelect.tsx
index 33ad686..08822bb 100644
--- a/src/pages/settings/components/Theming/ThemePlaylists/components/ThemeSelect.tsx
+++ b/src/pages/settings/components/Theming/ThemePlaylists/components/ThemeSelect.tsx
@@ -62,7 +62,7 @@ export function ThemeSelect({
 						backgroundImage:
 							theme?.backgroundImage.toLocaleLowerCase() === 'none'
 								? undefined
-								: `linear-gradient(${theme?.backgroundColor}33, ${theme?.backgroundColor}33), url(../../api/backgroundImages/thumbs/${theme?.backgroundImage})`,
+								: `linear-gradient(${theme?.backgroundColor}33, ${theme?.backgroundColor}33), url(../../trigger/api/backgroundImages/thumbs/${theme?.backgroundImage})`,
 						backgroundSize:
 							theme?.backgroundImage.toLocaleLowerCase() === 'none' ? undefined : 'cover',
 						backgroundColor:
@@ -89,7 +89,7 @@ export function ThemeSelect({
 								backgroundImage:
 									theme?.backgroundImage.toLocaleLowerCase() === 'none'
 										? undefined
-										: `linear-gradient(${theme?.backgroundColor}33, ${theme?.backgroundColor}33), url(../../api/backgroundImages/thumbs/${theme?.backgroundImage})`,
+										: `linear-gradient(${theme?.backgroundColor}33, ${theme?.backgroundColor}33), url(../../trigger/api/backgroundImages/thumbs/${theme?.backgroundImage})`,
 								backgroundSize:
 									theme?.backgroundImage.toLocaleLowerCase() === 'none'
 										? undefined
diff --git a/src/pages/settings/components/Theming/Themes/ThemeCard/ThemeCard.tsx b/src/pages/settings/components/Theming/Themes/ThemeCard/ThemeCard.tsx
index 8b0d316..1b6cd52 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeCard/ThemeCard.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeCard/ThemeCard.tsx
@@ -114,7 +114,7 @@ export function ThemeCard({
 					backgroundImage:
 						cardTheme?.backgroundImage.toLocaleLowerCase() === 'none'
 							? undefined
-							: `linear-gradient(${cardTheme?.backgroundColor}33, ${cardTheme?.backgroundColor}33), url(../../api/backgroundImages/thumbs/${cardTheme?.backgroundImage})`,
+							: `linear-gradient(${cardTheme?.backgroundColor}33, ${cardTheme?.backgroundColor}33), url(../../trigger/api/backgroundImages/thumbs/${cardTheme?.backgroundImage})`,
 					backgroundSize:
 						cardTheme?.backgroundImage.toLocaleLowerCase() === 'none'
 							? undefined
diff --git a/src/pages/settings/components/Theming/Themes/ThemeMiniCard.tsx b/src/pages/settings/components/Theming/Themes/ThemeMiniCard.tsx
index f9260af..75284b3 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeMiniCard.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeMiniCard.tsx
@@ -15,7 +15,7 @@ export function ThemeMiniCard({ miniTheme }: { miniTheme: Theme | undefined }) {
 				backgroundImage:
 					miniTheme?.backgroundImage.toLocaleLowerCase() === 'none'
 						? undefined
-						: `linear-gradient(${miniTheme?.backgroundColor}33, ${miniTheme?.backgroundColor}33), url(../../api/backgroundImages/thumbs/${miniTheme?.backgroundImage})`,
+						: `linear-gradient(${miniTheme?.backgroundColor}33, ${miniTheme?.backgroundColor}33), url(../../trigger/api/backgroundImages/thumbs/${miniTheme?.backgroundImage})`,
 				backgroundSize:
 					miniTheme?.backgroundImage.toLocaleLowerCase() === 'none' ? undefined : 'cover',
 				backgroundColor:
diff --git a/src/pages/settings/components/Theming/Themes/ThemeModal/components/BackgroundItem.tsx b/src/pages/settings/components/Theming/Themes/ThemeModal/components/BackgroundItem.tsx
index 623f6d9..866809f 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeModal/components/BackgroundItem.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeModal/components/BackgroundItem.tsx
@@ -24,8 +24,8 @@ export default function BackgroundItem({
 				background:
 					item !== 'none' && item !== 'None'
 						? index === hovered
-							? `linear-gradient(${designerTheme.backgroundColor}88, ${designerTheme.backgroundColor}88), no-repeat center url(../../api/backgroundImages/thumbs/${item})`
-							: `no-repeat center url(../../api/backgroundImages/thumbs/${item})`
+							? `linear-gradient(${designerTheme.backgroundColor}88, ${designerTheme.backgroundColor}88), no-repeat center url(../../trigger/api/backgroundImages/thumbs/${item})`
+							: `no-repeat center url(../../trigger/api/backgroundImages/thumbs/${item})`
 						: 'repeating-linear-gradient(45deg, #33333366, #33333366 10px, #88888866 10px, #88888866 20px)',
 				backgroundSize: item === 'none' ? undefined : 'cover',
 				backgroundColor: item === 'none' ? '#00000088' : undefined,
diff --git a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeChanges.tsx b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeChanges.tsx
index 33008f1..e9592db 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeChanges.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeChanges.tsx
@@ -171,7 +171,7 @@ export default function ThemeChanges({
 																defaultTheme[key as keyof Theme] as string
 															).toLocaleLowerCase() === 'none'
 																? 'https://placehold.co/540x360?text=None'
-																: `../../api/backgroundImages/thumbs/${defaultTheme[key as keyof Theme] as string}`
+																: `../../trigger/api/backgroundImages/thumbs/${defaultTheme[key as keyof Theme] as string}`
 														}
 													/>
 													<Text>→</Text>
@@ -182,7 +182,7 @@ export default function ThemeChanges({
 																designerTheme[key as keyof Theme] as string
 															).toLocaleLowerCase() === 'none'
 																? 'https://placehold.co/540x360?text=None'
-																: `../../api/backgroundImages/thumbs/${designerTheme[key as keyof Theme] as string}`
+																: `../../trigger/api/backgroundImages/thumbs/${designerTheme[key as keyof Theme] as string}`
 														}
 													/>
 												</>
diff --git a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeModalContent.tsx b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeModalContent.tsx
index 009a33e..3e5ba1e 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeModalContent.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeModalContent.tsx
@@ -12,7 +12,7 @@ export function ThemeModalContent({ selectedTheme }: { selectedTheme: Theme }) {
 				backgroundImage:
 					selectedTheme?.backgroundImage.toLocaleLowerCase() === 'none'
 						? undefined
-						: `linear-gradient(${selectedTheme?.backgroundColor}33, ${selectedTheme?.backgroundColor}33), url(../../api/backgroundImages/thumbs/${selectedTheme?.backgroundImage})`,
+						: `linear-gradient(${selectedTheme?.backgroundColor}33, ${selectedTheme?.backgroundColor}33), url(../../trigger/api/backgroundImages/thumbs/${selectedTheme?.backgroundImage})`,
 				backgroundSize:
 					selectedTheme?.backgroundImage.toLocaleLowerCase() === 'none'
 						? undefined
diff --git a/tsconfig.json b/tsconfig.json
index dae6803..b4ddcbb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,16 +2,18 @@
 	"compilerOptions": {
 		"target": "ES2020",
 		"useDefineForClassFields": true,
-		"module": "nodenext",
+		"module": "ESNext",
 		"skipLibCheck": true,
+		"baseUrl": "./src",
 		"rootDir": "./src",
 		"allowJs": false,
+		"esModuleInterop": false,
 		"lib": ["ESNext", "DOM"],
 		"allowSyntheticDefaultImports": true,
 		"types": ["vite/client", "vitest"],
 
 		/* Bundler mode */
-		"moduleResolution": "nodenext",
+		"moduleResolution": "node",
 		"allowImportingTsExtensions": true,
 		"resolveJsonModule": true,
 		"isolatedModules": true,
diff --git a/vite.config.ts b/vite.config.ts
index 52fc6b7..c745b36 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -56,7 +56,7 @@ export default defineConfig(({ mode }) => {
 			port: 3000,
 			host: '0.0.0.0',
 			proxy: {
-				'/api': {
+				api: {
 					target: `${env.VITE_DOMAIN_DEV}/${env.VITE_BASE_URL}`,
 					changeOrigin: false,
 					secure: false,
@@ -68,7 +68,7 @@ export default defineConfig(({ mode }) => {
 			host: '0.0.0.0',
 			proxy: {
 				api: {
-					target: `${env.VITE_DOMAIN_DEV}`,
+					target: `${env.VITE_DOMAIN_DEV}/${env.VITE_BASE_URL}`,
 					changeOrigin: false,
 					secure: false,
 				},