diff --git a/premake5.lua b/premake5.lua
index 1cc4402c5..8eb0d7014 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -778,6 +778,11 @@ workspace "eepp"
 	filter "platforms:x86_64"
 		architecture "x86_64"
 
+	filter { "platforms:x86_64", "system:macosx" }
+		architecture "x86_64"
+		buildoptions { "-arch x86_64" }
+		linkoptions { "-arch x86_64" }
+
 	filter "system:macosx"
 		defines { "GL_SILENCE_DEPRECATION" }
 
diff --git a/projects/macos/ecode/cross.build.app.sh b/projects/macos/ecode/cross.build.app.sh
index 32356baba..a63e76bcf 100755
--- a/projects/macos/ecode/cross.build.app.sh
+++ b/projects/macos/ecode/cross.build.app.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 premake5 --file=../../../premake5.lua --use-frameworks gmake2 || exit
-make -C ../../../make/macosx/ -j$(nproc) -e verbose=true -e config=release_arm64 ecode || exit
+make -C ../../../make/macosx/ -j$(sysctl -n hw.ncpu) -e verbose=true -e config=release_x86_64 ecode || exit
 rm -rf ./ecode.app
 mkdir -p ecode.app/Contents/MacOS/
 mkdir -p ecode.app/Contents/Resources/
@@ -15,25 +15,32 @@ cp Info.plist ecode.app/Contents/
 rm Info.plist
 chmod +x run.sh
 cp run.sh ecode.app/Contents/MacOS
-cp ../../../libs/macosx/arm64/libeepp.dylib ecode.app/Contents/MacOS
+cp ../../../libs/macosx/x86_64/libeepp.dylib ecode.app/Contents/MacOS
 cp ../../../bin/ecode ecode.app/Contents/MacOS
 SDL2_LIB_PATH="/Library/SDL2.framework/Versions/A/"
 cp "$SDL2_LIB_PATH/SDL2" ecode.app/Contents/MacOS/SDL2
 install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/SDL2 ecode.app/Contents/MacOS/libeepp.dylib
 codesign --force -s - ecode.app/Contents/MacOS/SDL2
 install_name_tool -change @rpath/libeepp.dylib @executable_path/libeepp.dylib ecode.app/Contents/MacOS/ecode
+
 #cp -r ../../../bin/assets ecode.app/Contents/MacOS/assets
 mkdir -p ecode.app/Contents/MacOS/assets/colorschemes
 cp -r ../../../bin/assets/colorschemes/ ecode.app/Contents/MacOS/assets/colorschemes/
 #cp -r ../../../bin/assets/fonts ecode.app/Contents/MacOS/assets/
 mkdir -p ecode.app/Contents/MacOS/assets/fonts
 cp -r ../../../bin/assets/fonts/DejaVuSansMono.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/DejaVuSansMono-Bold.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/DejaVuSansMono-Oblique.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/DejaVuSansMono-BoldOblique.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/DejaVuSansMonoNerdFontComplete.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/nonicons.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/codicon.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/NotoSans-Regular.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/remixicon.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/NotoEmoji-Regular.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/NotoSans-Bold.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/NotoSans-Italic.ttf ecode.app/Contents/MacOS/assets/fonts/
+cp -r ../../../bin/assets/fonts/NotoSans-BoldItalic.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/NotoColorEmoji.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/fonts/DroidSansFallbackFull.ttf ecode.app/Contents/MacOS/assets/fonts/
 cp -r ../../../bin/assets/plugins ecode.app/Contents/MacOS/assets/
diff --git a/projects/macos/ecode/cross.create.dmg.sh b/projects/macos/ecode/cross.create.dmg.sh
new file mode 100755
index 000000000..e99dd7c93
--- /dev/null
+++ b/projects/macos/ecode/cross.create.dmg.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# brew install create-dmg
+
+VERSIONPATH=../../../src/tools/ecode/version.hpp
+ECODE_MAJOR_VERSION=$(grep "define ECODE_MAJOR_VERSION" $VERSIONPATH | awk '{print $3}')
+ECODE_MINOR_VERSION=$(grep "define ECODE_MINOR_VERSION" $VERSIONPATH | awk '{print $3}')
+ECODE_PATCH_LEVEL=$(grep "define ECODE_PATCH_LEVEL" $VERSIONPATH | awk '{print $3}')
+
+rm -f ./*.dmg
+create-dmg --icon ecode 0 16 --window-size 256 256 --app-drop-link 0 80 --icon-size 32 --text-size 12 --volicon ../../../bin/assets/icon/ecode.icns ecode-macos-"$ECODE_MAJOR_VERSION"."$ECODE_MINOR_VERSION"."$ECODE_PATCH_LEVEL"-x86_64.dmg ecode.app