diff --git a/scripts/build_declarations.sh b/scripts/build_declarations.sh
index 90aa81c7..e2fe9a1b 100755
--- a/scripts/build_declarations.sh
+++ b/scripts/build_declarations.sh
@@ -24,12 +24,12 @@ cd "$BASEDIR/../"
 #Note: For the client we have to use the given file
 
 #Web
-execute_tsc -p web/tsconfig/tsdeclaration.json
+npm run dtsgen -- --config web/tsconfig/dtsconfig.json -v
 replace_tribble web/declarations/exports.d.ts
 echo "Generated web declarations"
 
 #Shared
-execute_tsc -p shared/tsconfig/tsdeclaration.json
+npm run dtsgen -- --config shared/tsconfig/dtsconfig.json -v
 replace_tribble shared/declarations/exports.d.ts
 echo "Generated shared declarations"
 
diff --git a/shared/generate_packed.sh b/shared/generate_packed.sh
index 0e0a9bcc..71caef62 100755
--- a/shared/generate_packed.sh
+++ b/shared/generate_packed.sh
@@ -12,7 +12,7 @@ if [ -e ${LOADER_FILE} ]; then
         echo "Failed to remove loader file!\nThis could be critical later!"
     fi
 fi
-result=$(execute_tsc -p tsconfig/tsdeclaration_loader.json)
+npm run dtsgen -- --config $(pwd)/tsconfig/dtsconfig_loader.json -v
 if [ ! -e ${LOADER_FILE} ]; then
     echo "Failed to generate definitions"
     echo "$result"
diff --git a/shared/tsconfig/dtsconfig.json b/shared/tsconfig/dtsconfig.json
new file mode 100644
index 00000000..35f45234
--- /dev/null
+++ b/shared/tsconfig/dtsconfig.json
@@ -0,0 +1,9 @@
+{
+  "source_files": [
+    "../js/**/*.ts"
+  ],
+  "exclude": [
+    "../js/workers/**/*.ts"
+  ],
+  "target_file": "../declarations/exports.d.ts"
+}
\ No newline at end of file
diff --git a/shared/tsconfig/dtsconfig_loader.json b/shared/tsconfig/dtsconfig_loader.json
new file mode 100644
index 00000000..6ab9e9de
--- /dev/null
+++ b/shared/tsconfig/dtsconfig_loader.json
@@ -0,0 +1,6 @@
+{
+  "source_files": [
+    "../js/load.ts"
+  ],
+  "target_file": "../declarations/exports_loader.d.ts"
+}
\ No newline at end of file
diff --git a/shared/tsconfig/tsdeclaration.json b/shared/tsconfig/tsdeclaration.json
deleted file mode 100644
index d0441ab2..00000000
--- a/shared/tsconfig/tsdeclaration.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "listFiles": true,
-    "module": "system",
-    "target": "es6",
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "allowJs": false,
-    "checkJs": false,
-
-    "outFile": "../declarations/exports"
-  },
-  "include": [
-    "../js/**/*.ts"
-  ],
-  "exclude": [
-    "../js/workers/**/*.ts"
-  ]
-}
\ No newline at end of file
diff --git a/shared/tsconfig/tsdeclaration_loader.json b/shared/tsconfig/tsdeclaration_loader.json
deleted file mode 100644
index 4a953313..00000000
--- a/shared/tsconfig/tsdeclaration_loader.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "listFiles": true,
-    "module": "system",
-    "target": "es6",
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "allowJs": false,
-    "checkJs": false,
-
-    "outFile": "../declarations/exports_loader"
-  },
-  "include": [
-    "../js/load.ts"
-  ]
-}
\ No newline at end of file
diff --git a/web/tsconfig/dtsconfig.json b/web/tsconfig/dtsconfig.json
new file mode 100644
index 00000000..638d0b08
--- /dev/null
+++ b/web/tsconfig/dtsconfig.json
@@ -0,0 +1,6 @@
+{
+  "source_files": [
+    "../js/**/*.ts"
+  ],
+  "target_file": "../declarations/exports.d.ts"
+}
\ No newline at end of file
diff --git a/web/tsconfig/tsdeclaration.json b/web/tsconfig/tsdeclaration.json
deleted file mode 100644
index c420f0b0..00000000
--- a/web/tsconfig/tsdeclaration.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "listFiles": true,
-    "module": "system",
-    "target": "es6",
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "allowJs": false,
-    "checkJs": false,
-
-    "outFile": "../declarations/exports"
-  },
-  "include": [
-    "../js/**/*.ts"
-  ]
-}
\ No newline at end of file