diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec5ac6ae..ed31af18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Bibata Zebra](https://github.com/ful1e5/Bibata-Zebra-Cursor) link added inside README.md
 - [Bibata Bee](https://github.com/ful1e5/Bibata-Bee-Cursor) link added inside README.md
 - tidy docs inside `README.md`
+- make commands are more readable inside `builder/Makefile`
 
 ### Changed
 
diff --git a/builder/Makefile b/builder/Makefile
index 330d5c4c..7df7d87c 100644
--- a/builder/Makefile
+++ b/builder/Makefile
@@ -1,42 +1,36 @@
 all: setup build
-
-bitmaps_dir = "../bitmaps"
-
 .PHONY: all
 
 .ONESHELL:
 SHELL:=/bin/bash
 
-THEMES = Amber Classic Ice
+bitmaps_dir = "../bitmaps"
+
 X_SIZES ?= 22 24 28 32 40 48 56 64 72 80 88 96
 WIN_CANVAS_SIZE ?= 32
 WIN_SIZE ?= 24
 
+THEMES = Amber Classic Ice
+
 setup:
 	@python3 -m pip install clickgen --user
 
 build: build_modern build_original
-
 build_modern: build.py
 	@$(foreach theme,$(THEMES), python3 build.py -p "$(bitmaps_dir)/Bibata-Modern-$(theme)" --xsizes $(X_SIZES) --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE);)
-
 build_original: build.py
 	@$(foreach theme,$(THEMES), python3 build.py -p "$(bitmaps_dir)/Bibata-Original-$(theme)" --xsizes $(X_SIZES) --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE);)
 
 
 build_unix: build_modern_unix build_original_unix
-
 build_modern_unix: build.py
 	@$(foreach theme,$(THEMES), python3 build.py unix -p "$(bitmaps_dir)/Bibata-Modern-$(theme)" --xsizes $(X_SIZES);)
-
 build_original_unix: build.py
 	@$(foreach theme,$(THEMES), python3 build.py unix -p "$(bitmaps_dir)/Bibata-Original-$(theme)" --xsizes $(X_SIZES);)
 
 
 build_windows: build_modern_windows build_original_windows
-
 build_modern_windows: build.py
 	@$(foreach theme,$(THEMES), python3 build.py windows -p "$(bitmaps_dir)/Bibata-Modern-$(theme)" --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE);)
-
 build_original_windows: build.py
 	@$(foreach theme,$(THEMES), python3 build.py windows -p "$(bitmaps_dir)/Bibata-Original-$(theme)" --win-size $(WIN_SIZE) --win-canvas-size $(WIN_CANVAS_SIZE);)