diff --git a/packages/twenty-front/project.json b/packages/twenty-front/project.json
index 15ccfd01a054..06f26ee0e111 100644
--- a/packages/twenty-front/project.json
+++ b/packages/twenty-front/project.json
@@ -29,10 +29,10 @@
       "options": {
         "cwd": "{projectRoot}",
         "command": "tsc -b tsconfig.json",
-        "incremental": true
+        "args": ["--incremental"]
       },
       "configurations": {
-        "ci": { "incremental": false },
+        "ci": { "args": [] },
         "watch": { "watch": true }
       }
     },
diff --git a/packages/twenty-front/src/emotion.d.ts b/packages/twenty-front/src/emotion.d.ts
new file mode 100644
index 000000000000..90e71e26b633
--- /dev/null
+++ b/packages/twenty-front/src/emotion.d.ts
@@ -0,0 +1,5 @@
+import { ThemeType } from 'twenty-ui';
+
+declare module '@emotion/react' {
+  export interface Theme extends ThemeType {}
+}
diff --git a/packages/twenty-front/src/index.tsx b/packages/twenty-front/src/index.tsx
index 1f17ce21fe74..83e4c55e5629 100644
--- a/packages/twenty-front/src/index.tsx
+++ b/packages/twenty-front/src/index.tsx
@@ -21,7 +21,6 @@ import { DialogManagerScope } from '@/ui/feedback/dialog-manager/scopes/DialogMa
 import { SnackBarProvider } from '@/ui/feedback/snack-bar-manager/components/SnackBarProvider';
 import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
 import { AppThemeProvider } from '@/ui/theme/components/AppThemeProvider';
-import { ThemeType } from '@/ui/theme/constants/ThemeLight';
 import { UserProvider } from '@/users/components/UserProvider';
 import { UserProviderEffect } from '@/users/components/UserProviderEffect';
 import { PageChangeEffect } from '~/effect-components/PageChangeEffect';
@@ -82,7 +81,3 @@ root.render(
     </AppErrorBoundary>
   </RecoilRoot>,
 );
-
-declare module '@emotion/react' {
-  export interface Theme extends ThemeType {}
-}
diff --git a/packages/twenty-front/tsconfig.app.json b/packages/twenty-front/tsconfig.app.json
index b3fe1c1eea5e..7a17e21fdea8 100644
--- a/packages/twenty-front/tsconfig.app.json
+++ b/packages/twenty-front/tsconfig.app.json
@@ -12,5 +12,11 @@
     "**/*.test.ts",
     "**/*.test.tsx"
   ],
-  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+  "include": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.d.ts",
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ]
 }
diff --git a/packages/twenty-front/tsconfig.spec.json b/packages/twenty-front/tsconfig.spec.json
index a966b82bf500..7b115f8bbc82 100644
--- a/packages/twenty-front/tsconfig.spec.json
+++ b/packages/twenty-front/tsconfig.spec.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "commonjs",
     "types": ["jest", "node"]
   },
   "include": [