diff --git a/Makefile b/Makefile
index 183d4b75..8f175e87 100644
--- a/Makefile
+++ b/Makefile
@@ -12,27 +12,49 @@
 
 PY_PATH = ~/bubbles/python_modules
 
-dev64:
-	python3 ${PY_PATH}/dev_64.py
+## 64 bit ISOs
 
-deb64:
-	python3 ${PY_PATH}/deb_64.py
+dev64xfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-dev64
+deb64xfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-deb64
+deb64gfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-deb64
+dev64gfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-dev64
+deb64opb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-deb64
+dev64opb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-dev64
 
-deb32:
-	python3 ${PY_PATH}/deb_32.py
-
-debarm:
-	python3 ${PY_PATH}/deb_arm.py
-
-dev32:
-	python3 ${PY_PATH}/dev_32.py
-
-devarm:
-	python3 ${PY_PATH}/dev_arm.py
-
-nightly:
-	python3 ${PY_PATH}/nightly.py
+## 32 bit ISOs
+deb32xfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-deb32
+dev32xfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-dev32
+deb32gfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-deb32
+dev32gfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-dev32
+deb32opb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-deb32
+dev32opb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-dev32
 
+## arm ISOs
+debarmxfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-debarm
+devarmxfce:
+	python3 ${PY_PATH}/build_iso.py set e-xfce b-devarm
+debarmgfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-debarm
+devarmgfb:
+	python3 ${PY_PATH}/build_iso.py set e-gnomefb b-devarm
+debarmopb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-debarm
+devarmopb:
+	python3 ${PY_PATH}/build_iso.py set e-openbox b-devarm
+	
 release:
 	python3 ${PY_PATH}/release.py