diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfeb2076..9cc4a8ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+### Changed
+
+- `Makefile` build commands re-arrange with groups
+
 ## [Bibata v1.1.1] - 26 Mar 2021
 
 ### Added
diff --git a/Makefile b/Makefile
index b1f17f1b..1e53e53f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,46 @@
 all: clean render build
 
+.PHONY: all
+
+# Default
+clean:
+	@rm -rf bitmaps themes
+
+render: bitmapper svg
+	@cd bitmapper && make install render_modern render_original
+
+build: bitmaps
+	@cd builder && make setup build clean
+
+
+# Specific platform build
 unix: clean render bitmaps
 	@cd builder && make setup build_unix
 
 windows: clean render bitmaps
 	@cd builder && make setup build_windows
 
-.PHONY: all
-
-clean:
-	@rm -rf bitmaps themes
-	
+# Bibata Modern
 modern: clean render_modern build_modern
-original:clean render_original build_original
-
-#
-# Render Bibata Bitmaps
-#
-
-render: bitmapper svg
-	@cd bitmapper && make install render_modern render_original
-
-render_original: bitmapper svg
-	@cd bitmapper && make install render_original
 
 render_modern: bitmapper svg
 	@cd bitmapper && make install render_modern
 
-#
-# Build Bibata Unix & Windows cursors
-#
-
-build: bitmaps
-	@cd builder && make setup build clean
-
-build_unix: bitmaps
-	@rm -rf themes
-	@cd builder && make setup build_unix clean
-
-build_windows: bitmaps
-	@rm -rf themes
-	@cd builder && make setup build_windows clean
-
 build_modern: bitmaps
 	@cd builder && make setup build_modern clean
 
+
+# Bibata Original
+original:clean render_original build_original
+
+render_original: bitmapper svg
+	@cd bitmapper && make install render_original
+
 build_original: bitmaps
 	@cd builder && make setup build_original clean
 
-#
-# Installation
-#
 
+# Installation
 .ONESHELL:
 SHELL:=/bin/bash