diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c39ddd7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tibi-types"]
+	path = tibi-types
+	url = ../tibi-types.git
diff --git a/package.json b/package.json
index ed2ed15..72f333b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "author": "Sebastian Frank <sebastian@webmakers.de>",
     "license": "MIT",
     "scripts": {
-        "validate": "svelte-check --tsconfig ./tsconfig.validate.json && tsc --noEmit -p ./tsconfig.validate.json",
+        "validate": "svelte-check --tsconfig ./tsconfig.validate.json --fail-on-warnings && tsc --noEmit -p ./tsconfig.validate.json",
         "dev": "node scripts/esbuild-wrapper.js watch",
         "start": "node scripts/esbuild-wrapper.js start",
         "start:mock": "MOCK=1 node scripts/esbuild-wrapper.js start",
diff --git a/tibi-types b/tibi-types
new file mode 160000
index 0000000..5e04a1c
--- /dev/null
+++ b/tibi-types
@@ -0,0 +1 @@
+Subproject commit 5e04a1ca3a58a4c219162726e2289486e6d3f2aa
diff --git a/tsconfig.json b/tsconfig.json
index 5d003f8..3d05cd0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,8 @@
 {
     "extends": "@tsconfig/svelte/tsconfig.json",
 
-    "include": ["frontend/src/**/*", "types/**/*", "./../../cms/tibi-types", "api/**/*"],
-    "exclude": ["**/app.server.js", "**/app.server.js.map", "_temp/**", "./../../cms/tibi-types/scripts"],
+    "include": ["frontend/src/**/*", "types/**/*", "./../../cms/tibi-types", "./tibi-types", "api/**/*"],
+    "exclude": ["**/app.server.js", "**/app.server.js.map", "_temp/**", "./../../cms/tibi-types/scripts", "./tibi-types/scripts"],
     "compilerOptions": {
         "module": "esnext",
         "typeRoots": ["./node_modules/@types", "./types"],
diff --git a/tsconfig.validate.json b/tsconfig.validate.json
index 6b726d5..f096aeb 100644
--- a/tsconfig.validate.json
+++ b/tsconfig.validate.json
@@ -1,6 +1,6 @@
 {
     "extends": "./tsconfig.json",
-    "include": ["frontend/src/**/*", "types/**/*", "api/**/*", "./../../cms/tibi-types/index.d.ts"],
+    "include": ["frontend/src/**/*", "types/**/*", "api/**/*", "./../../cms/tibi-types/index.d.ts", "./tibi-types/index.d.ts"],
     "exclude": [
         "_temp/**",
         "api/hooks/lib/app.server.js",