diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
index 888720a19..0a43766f6 100755
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -7,6 +7,7 @@ SRC_DIR=./dist/trilium-linux-x64-src
 rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
 
 echo "Copying required linux-x64 binaries"
+mkdir -p /dist/trilium-linux-x64-src/node_modules/better-sqlite3/build/Release/
 cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node "$SRC_DIR"/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 echo "Packaging linux x64 electron build"
diff --git a/bin/build-server.sh b/bin/build-server.sh
index d01f05d44..b21997c77 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -21,7 +21,7 @@ rm -r $PKG_DIR/node/include/node
 
 rm -r $PKG_DIR/node_modules/electron*
 rm -r $PKG_DIR/webpack*
-rm -r $PKG_DIR/electron.js
+rm -r $PKG_DIR/electron.ts
 
 mkdir -p $PKG_DIR/node_modules/better-sqlite3/build/Release/
 cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index 24b994079..5f4bab948 100755
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -21,7 +21,7 @@ echo "Copying Trilium to build directory $DIR"
 for d in 'images' 'libraries' 'src' 'db'; do
     cp -r "$d" "$DIR"/
 done
-for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample.ini' 'electron.js'; do
+for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample.ini' 'electron.ts'; do
     cp "$f" "$DIR"/
 done
 cp webpack-* "$DIR"/      # here warning because there is no 'webpack-*', but webpack.config.js only
diff --git a/package.json b/package.json
index c7216197d..408c1a529 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
     "description": "Trilium Notes",
     "version": "0.63.5",
     "license": "AGPL-3.0-only",
-    "main": "electron.js",
+    "main": "electron.ts",
     "bin": {
-        "trilium": "src/www.js"
+        "trilium": "src/www.ts"
     },
     "repository": {
         "type": "git",
@@ -16,7 +16,7 @@
         "start-server": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
         "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
         "qstart-server": "npm run qswitch-server && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
-        "start-electron": "rimraf ./dist && tsc && ts-node ./bin/copy-dist.ts && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron.js --inspect=5858 .",
+        "start-electron": "rimraf ./dist && tsc && ts-node ./bin/copy-dist.ts && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron.ts --inspect=5858 .",
         "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .",
         "qstart-electron": "npm run qswitch-electron && TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron --inspect=5858 .",
         "start-test-server": "npm run qswitch-server; rm -rf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/www.ts",