diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh
index 7e551e9..76346d4 100755
--- a/.ci/macos/deploy.sh
+++ b/.ci/macos/deploy.sh
@@ -5,9 +5,7 @@ set -e
 # Add Qt binaries to path
 PATH=/usr/local/opt/qt/bin/:${PATH}
 
-cp -fp ./build/nheko dist/MacOS/Nheko.app/Contents/MacOS
-
-sudo macdeployqt dist/MacOS/Nheko.app -dmg
+sudo macdeployqt build/nheko.app -dmg
 user=$(id -nu)
-sudo chown ${user} dist/MacOS/Nheko.dmg
-mv dist/MacOS/Nheko.dmg .
+sudo chown ${user} build/nheko.dmg
+mv build/nheko.dmg .
diff --git a/.travis.yml b/.travis.yml
index 22e28c7..78d7ee7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ deploy:
       provider: releases
       api_key:
           secure: oprXzESukFiXBeF2BXkXUlegsAQc95Ub4kc/OkoNFaYBvqpA+IGpWHmHCx5JPny/OT3Kc2Urpe2JUeGSWDHZ7UCKDjH+NzGP3uN82fHh/HiszG/Srw7+hWEHm1ve+gMK9GS8pr+yUsUrPP0UfVXlPoI4pBWa4zGi2Ndb/SqvjCgIHFLtGyoBo6CydKQ/AyWiXSMKDfJL+Dx4JLIPP4RTCBJy8ZrZ8m/a5Tgy4Ij6+djjrgYCZCEhGxSYw7xDIT/9SV8g9NkrbisqBDrILzAH8Yhe4XMRMXo88OAxV5+Vb9Rw1hrqczez6lpFDbJetv8MjofND+pSoAFwtjaL1wTFK9Ud6w4O9AuHlEQH9cGVdvsxFcosRwJVh58x51JM9ptoktqhx/HHJBTuCHCYYlHwtRwbwqnMYdLzKZG5FnujT8DG+9mcva1fL6tzW/XD505VPMWwXFC/2/pvolgAkTFFXYSALAwZlK3IgoXU8Gok/3B4iHofzQsFf6Yq3BI/88x7tVASUqiYhoKrO50+gb6pNIRCyWgGUiBEVXBp6Ziq3ORQPyQJg7i9HHUGTUu74yvGLHWLwjNQzZP/hxJZK3VlJxzyXntdOxiJc8iOzNrU+rPKBAlAaE6bQDOoniIysEgdD5BXHTLFzPvts4P1n2Ckor5/rNJ+qXR8GU+/y7e1GKU=
-      file: Nheko.dmg
+      file: nheko.dmg
       on:
           condition: $TRAVIS_OS_NAME == osx
           repo: mujx/nheko
diff --git a/Makefile b/Makefile
index a7565ee..cb0e6d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,4 @@
-APP_NAME = nheko
 
-MAC_DIST_DIR = dist/MacOS
-APP_TEMPLATE = $(MAC_DIST_DIR)/Nheko.app
-
-# Linux specific helpers
 debug:
 	@cmake -DBUILD_TESTS=OFF -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Debug
 	@cmake --build build
@@ -20,19 +15,11 @@ test:
 linux-appimage:
 	@./.ci/linux/deploy.sh
 
-app: release-debug $(APP_TEMPLATE)
-	@cp -fp ./build/$(APP_NAME) $(APP_TEMPLATE)/Contents/MacOS
-	@echo "Created '$(APP_NAME).app' in '$(APP_TEMPLATE)'"
-
-app-install: app
-	cp -Rf $(APP_TEMPLATE) /Applications/
+macos-app: release-debug
+	@./.ci/macos/deploy.sh
 
-dmg: app
-	hdiutil create $(MAC_DIST_DIR)/Nheko.dmg \
-		-volname "$(APP_NAME)" \
-		-fs HFS+ \
-		-srcfolder $(MAC_DIST_DIR) \
-		-ov -format UDZO
+macos-app-install:
+	cp -Rf build/nheko.app /Applications
 
 run:
 	@./build/nheko
diff --git a/appveyor.yml b/appveyor.yml
index 31a1df7..7c832a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -97,7 +97,7 @@ deploy:
     provider: GitHub
     auth_token:
       secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7
-    artifact: nheko_setup.exe
+    artifact: .\%DIST%-installer.exe
     force_update: true
     prerelease: true
     on:
diff --git a/dist/MacOS/nheko.app/Contents/Info.plist b/dist/MacOS/nheko.app/Contents/Info.plist
deleted file mode 100644
index 59a123b..0000000
--- a/dist/MacOS/nheko.app/Contents/Info.plist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundleDisplayName</key>
-        <string>Nheko</string>
-        <key>CFBundleExecutable</key>
-        <string>nheko</string>
-        <key>CFBundleIdentifier</key>
-        <string>nheko</string>
-        <key>CFBundleName</key>
-        <string>Nheko</string>
-        <key>CFBundleIconFile</key>
-        <string>nheko.icns</string>
-        <key>CFBundleShortVersionString</key>
-        <string>0.1.0</string>
-        <key>CFBundleVersion</key>
-        <string>0.1.0</string>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>en</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>NSHighResolutionCapable</key>
-        <true />
-        <key>NSMainNibFile</key>
-        <string></string>
-        <key>NSSupportsAutomaticGraphicsSwitching</key>
-        <true />
-    </dict>
-</plist>
diff --git a/dist/MacOS/nheko.app/Contents/MacOS/.gitkeep b/dist/MacOS/nheko.app/Contents/MacOS/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/dist/MacOS/nheko.app/Contents/Resources/nheko.icns b/dist/MacOS/nheko.app/Contents/Resources/nheko.icns
deleted file mode 100644
index ecb66b6..0000000
Binary files a/dist/MacOS/nheko.app/Contents/Resources/nheko.icns and /dev/null differ