diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index c849936ec..b69c4201a 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,21 +1,27 @@
 module.exports = {
     root: true,
     parser: '@typescript-eslint/parser',
-    extends: [  'eslint:recommended', 'plugin:svelte/recommended','prettier'],
+    extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:svelte/recommended',
+        'prettier'
+    ],
     ignorePatterns: ['*.cjs'],
     overrides: [
         {
             files: ['*.svelte'],
             parser: 'svelte-eslint-parser',
+            parserOptions: {
+                parser: '@typescript-eslint/parser',
+                sourceType: 'module',
+                ecmaVersion: 2020
+            },
             rules: {
                 'no-redeclare': 'off'
             }
         }
     ],
-    parserOptions: {
-        sourceType: 'module',
-        ecmaVersion: 2020
-    },
     env: {
         browser: true,
         es2017: true,
diff --git a/.prettierrc b/.prettierrc
index 376006219..b0db280df 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -5,5 +5,6 @@
     "trailingComma": "none",
     "printWidth": 100,
     "bracketSameLine": true,
+    "plugins": ["prettier-plugin-svelte"],
     "svelteSortOrder": "scripts-options-markup-styles"
 }
diff --git a/package.json b/package.json
index c756ec3aa..d16a8e9ee 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,8 @@
         "sync": "svelte-kit sync",
         "check": "svelte-check --tsconfig ./tsconfig.json --fail-on-warnings --threshold warning",
         "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-        "lint": "prettier --ignore-path .gitignore --check --plugin-search-dir=. . && eslint .",
-        "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. .",
+        "lint": "prettier --ignore-path .gitignore --check --plugin prettier-plugin-svelte . && eslint .",
+        "format": "prettier --ignore-path .gitignore --write --plugin prettier-plugin-svelte .",
         "test": "vitest run",
         "test:ui": "vitest --ui",
         "test:watch": "vitest watch",
diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte
index 1c3576682..09af315b4 100644
--- a/src/lib/components/code.svelte
+++ b/src/lib/components/code.svelte
@@ -189,7 +189,6 @@
                 color: #62aed2;
             }
         }
-        &.prism-regex,
         &.prism-important,
         &.prism-variable {
             color: #a1c4ff;
@@ -197,5 +196,11 @@
                 color: #62aed2;
             }
         }
+        &.prism-regex {
+            color: #a1c4ff;
+            body.theme-light & {
+                color: #62aed2;
+            }
+        }
     }
 </style>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7c6669763..176ff043b 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -199,8 +199,12 @@
         border-radius: var(--border-radius);
         border: var(--border-size) solid transparent;
         background: var(--border-gradient) border-box;
-        mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
-        -webkit-mask: linear-gradient(#fff 0 0) padding-box, linear-gradient(#fff 0 0);
+        mask:
+            linear-gradient(#fff 0 0) padding-box,
+            linear-gradient(#fff 0 0);
+        -webkit-mask:
+            linear-gradient(#fff 0 0) padding-box,
+            linear-gradient(#fff 0 0);
         -webkit-mask-composite: destination-out;
         mask-composite: exclude;
         pointer-events: none;
diff --git a/src/routes/card/[uid]/+page.svelte b/src/routes/card/[uid]/+page.svelte
index 81aa0c12e..f64a69985 100644
--- a/src/routes/card/[uid]/+page.svelte
+++ b/src/routes/card/[uid]/+page.svelte
@@ -176,8 +176,7 @@
             }}
             transition:fade
             role="button"
-            tabindex="0"
-            />
+            tabindex="0" />
     {/if}
     <div class="controls" class:invisible={!cardActive}>
         <button
diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte
index cb64e5e54..083135880 100644
--- a/src/routes/console/(migration-wizard)/resource-form.svelte
+++ b/src/routes/console/(migration-wizard)/resource-form.svelte
@@ -138,7 +138,7 @@
             error = true;
         }
 
-            isOpen = false;
+        isOpen = false;
     });
 
     $: resources = providerResources[$provider.provider];
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index c7e0bda5a..c74b1bf4d 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -148,7 +148,7 @@
                     },
                     group: 'security',
                     icon: 'pencil'
-                } as const)
+                }) as const
         ),
         // Settings
         {
diff --git a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
index 3a99e683d..d5cfb2664 100644
--- a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
+++ b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
@@ -90,8 +90,7 @@
                     on:click={() => (isLimited = true)}
                     on:keyup|self={clickOnEnter}
                     role="button"
-                    tabindex="0"
-                    >
+                    tabindex="0">
                     <input
                         type="number"
                         name="limit"
diff --git a/src/routes/console/project-[project]/overview/keys/checkbox.svelte b/src/routes/console/project-[project]/overview/keys/checkbox.svelte
index 5664b3080..953d4b8fd 100644
--- a/src/routes/console/project-[project]/overview/keys/checkbox.svelte
+++ b/src/routes/console/project-[project]/overview/keys/checkbox.svelte
@@ -1,17 +1,11 @@
 <script lang="ts">
-export let indeterminate: boolean = false;
-export let checked: boolean = false;
-
-interface $$Props extends Partial<HTMLInputElement> {
-    indeterminate?: boolean;
-    checked?: boolean;
-}
+    export let indeterminate: boolean = false;
+    export let checked: boolean = false;
 
+    interface $$Props extends Partial<HTMLInputElement> {
+        indeterminate?: boolean;
+        checked?: boolean;
+    }
 </script>
-   
-   <input
-        type="checkbox"
-        bind:checked
-        {...$$restProps}
-        bind:indeterminate
-        on:change />
\ No newline at end of file
+
+<input type="checkbox" bind:checked {...$$restProps} bind:indeterminate on:change />
diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte
index 584a4b911..a5ec2115e 100644
--- a/src/routes/console/project-[project]/overview/keys/scopes.svelte
+++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte
@@ -49,13 +49,12 @@
         }
     }
 
-    function onCategoryChange(
-        event: Event,
-        category: Category
-    ) {
+    function onCategoryChange(event: Event, category: Category) {
         allScopes.forEach((s) => {
             if (s.category === category) {
-                activeScopes[s.scope] = (event.currentTarget as EventTarget & HTMLInputElement ).checked;
+                activeScopes[s.scope] = (
+                    event.currentTarget as EventTarget & HTMLInputElement
+                ).checked;
             }
         });
     }
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index 2aca3d859..2a49e7e3d 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -39,7 +39,7 @@
     };
 
     onMount(async () => {
-         sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
+        sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
             if (response.events.includes('migrations.*')) {
                 invalidate(Dependencies.MIGRATIONS);
             }