diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh
index d7e9f3dbb..950ac086c 100755
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -14,12 +14,14 @@ rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
 rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
 rm -r $SRC_DIR/node_modules/giflossy/vendor/*
 rm -r $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/*
+rm -r $SRC_DIR/node_modules/keyboard-layout/build/Release/*
 
 cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
 cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
 cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
 cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
 cp bin/deps/mac-x64/spellchecker/* $SRC_DIR/node_modules/@felixrieseberg/spellchecker/build/Release/
+cp bin/deps/mac-x64/keyboard-layout-manager.node $SRC_DIR/node_modules/keyboard-layout/build/Release/
 
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 
diff --git a/bin/build-server.sh b/bin/build-server.sh
index e327ba30f..d180f0528 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PKG_DIR=dist/trilium-linux-x64-server-src
+PKG_DIR=dist/trilium-linux-x64-server
 NODE_VERSION=12.12.0
 
 if [ "$1" != "DONTCOPY" ]
@@ -29,4 +29,4 @@ VERSION=`jq -r ".version" package.json`
 
 cd dist
 
-tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server-src
+tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
diff --git a/bin/build.sh b/bin/build.sh
index fd78d0570..1842e541f 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -10,7 +10,7 @@ bin/copy-trilium.sh $SRC_DIR
 
 # we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
 cp -r $SRC_DIR ./dist/trilium-linux-x64-src
-cp -r $SRC_DIR ./dist/trilium-linux-x64-server-src
+cp -r $SRC_DIR ./dist/trilium-linux-x64-server
 cp -r $SRC_DIR ./dist/trilium-windows-x64-src
 cp -r $SRC_DIR ./dist/trilium-mac-x64-src
 
diff --git a/bin/deps/mac-x64/keyboard-layout-manager.node b/bin/deps/mac-x64/keyboard-layout-manager.node
new file mode 100644
index 000000000..3c2882dcc
Binary files /dev/null and b/bin/deps/mac-x64/keyboard-layout-manager.node differ