diff --git a/Makefile b/Makefile
index c897a74..b7a2b70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,4 @@
-theme := macOSBigSur
-src := ./themes/$(theme)
-
-local := ~/.icons
-local_dest := $(local)/$(theme)
-
-root := /usr/share/icons
-root_dest := $(root)/$(theme)
-
 all: clean render build
-
-unix: clean render bitmaps
-	@cd builder && make build_unix
-
-windows: clean render bitmaps
-	@cd builder && make build_windows
-
 .PHONY: all
 
 clean:
@@ -24,12 +8,30 @@ render: bitmapper svg
 	@cd bitmapper && $(MAKE)
 
 build: bitmaps
-	@cd builder && $(MAKE)
+	@cd builder && make build && make clean
+
+
+unix: clean render bitmaps
+	@cd builder && make build_unix && make clean
+
+windows: clean render bitmaps
+	@cd builder && make build_windows && make clean
+
+
+
+# Installation
+theme := macOSBigSur
+src := ./themes/$(theme)
+
+local := ~/.icons
+local_dest := $(local)/$(theme)
+
+root := /usr/share/icons
+root_dest := $(root)/$(theme)
 
 .ONESHELL:
 SHELL:=/bin/bash
 
-
 install: $(src)
 	@if [[ $EUID -ne 0 ]]; then
 		@echo "> Installing '$(theme)' cursors inside $(local)/..."
diff --git a/builder/Makefile b/builder/Makefile
index fbb2ed7..f401995 100644
--- a/builder/Makefile
+++ b/builder/Makefile
@@ -1,6 +1,4 @@
-
 all: setup build
-
 .PHONY: all
 
 .ONESHELL:
@@ -23,11 +21,11 @@ clean:
 setup: clean setup.py
 	@python3 setup.py install --user --record files.txt
 
-build: setup build.py clean
+build: setup build.py
 	@python3 build.py --xsizes $(X_SIZES) --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE)
 
-build_unix: setup build.py clean
+build_unix: setup build.py
 	@python3 build.py unix --xsizes $(X_SIZES)
 
-build_windows: setup build.py clean
+build_windows: setup build.py
 	@python3 build.py windows --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE)