diff --git a/Makefile b/Makefile
index 940c4c2..add20ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,30 @@
-.PHONY: release debug clean mrproper pull-assets keystore
+.PHONY: release release-with-assets debug debug-with-assets clean mrproper pull-emu48plus pull-assets keystore
 
 release:
 	./gradlew assembleRelease assembleReleaseUnitTest
 	find . -name \*.apk
 
+release-with-assets: pull-assets release
+
 debug:
 	./gradlew assembleDebug assembleDebugUnitTest
 	find . -name \*.apk
 
+debug-with-assets: pull-assets debug
+
 clean:
 	./gradlew clean
-	[ -e ./app/src/main/cpp/emu48plus.bkp ] && rm -fr ./app/src/main/cpp/emu48plus.bkp
-	[ -e ./app/src/main/assets/calculators.bkp ] && rm -fr ./app/src/main/assets/calculators.bkp
+	-rm -fr ./app/src/main/cpp/emu48plus.bkp
+	-rm -fr ./app/src/main/assets/calculators.bkp
 
 mrproper: clean
+	-rm -fr ./app/src/main/assets/calculators/*
+
+pull-emu48plus:
+	zsh ./pull-emu48plus-sources.sh
 
 pull-assets:
 	bash ./pull-KMLs-and-ROMs.sh
-	zsh ./pull-emu48plus-sources.sh
 
 keystore:
 	bash ./gen-keystore.sh