diff --git a/Makefile b/Makefile
index ece12200..df7613b7 100644
--- a/Makefile
+++ b/Makefile
@@ -74,38 +74,29 @@ uninstall:
 reinstall: uninstall install
 
 # generates binaries
-# TODO: We can do it better
+THEMES = Amber Classic Ice
 BIN_DIR = ../bin
 prepare: bitmaps themes
 	# Bitmaps
 	@rm -rf bin && mkdir bin
 	@cd bitmaps && zip -r $(BIN_DIR)/bitmaps.zip * && cd ..
-	# themes
 	@cd themes
 	#
 	# Bibata-Original
 	#
-	@tar -czvf $(BIN_DIR)/Bibata-Modern-Amber.tar.gz Bibata-Modern-Amber
-	@zip -r $(BIN_DIR)/Bibata-Modern-Amber-Windows.zip Bibata-Modern-Amber-Windows
-	@tar -czvf $(BIN_DIR)/Bibata-Modern-Classic.tar.gz Bibata-Modern-Classic
-	@zip -r $(BIN_DIR)/Bibata-Modern-Classic-Windows.zip Bibata-Modern-Classic-Windows
-	@tar -czvf $(BIN_DIR)/Bibata-Modern-Ice.tar.gz Bibata-Modern-Ice
-	@zip -r $(BIN_DIR)/Bibata-Modern-Ice-Windows.zip Bibata-Modern-Ice-Windows
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/Bibata-Modern-$(theme).tar.gz Bibata-Modern-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/Bibata-Modern-$(theme)-Windows.zip Bibata-Modern-$(theme)-Windows;)
 	@tar -czvf $(BIN_DIR)/Bibata-Modern.tar.gz Bibata-Modern-Amber Bibata-Modern-Classic Bibata-Modern-Ice
 	@zip -r $(BIN_DIR)/Bibata-Modern-Windows.zip Bibata-Modern-Amber-Windows Bibata-Modern-Classic-Windows Bibata-Modern-Ice-Windows
 	#
 	# Bibata-Original
 	#
-	@tar -czvf $(BIN_DIR)/Bibata-Original-Amber.tar.gz Bibata-Original-Amber
-	@zip -r $(BIN_DIR)/Bibata-Original-Amber-Windows.zip Bibata-Original-Amber-Windows
-	@tar -czvf $(BIN_DIR)/Bibata-Original-Classic.tar.gz Bibata-Original-Classi/
-	@zip -r $(BIN_DIR)/Bibata-Original-Classic-Windows.zip Bibata-Original-Classic-Windows
-	@tar -czvf $(BIN_DIR)/Bibata-Original-Ice.tar.gz Bibata-Original-Ice
-	@zip -r $(BIN_DIR)/Bibata-Original-Ice-Windows.zip Bibata-Original-Ice-Windows
+	@$(foreach theme,$(THEMES), tar -czvf $(BIN_DIR)/Bibata-Original-$(theme).tar.gz Bibata-Original-$(theme);)
+	@$(foreach theme,$(THEMES), zip -r $(BIN_DIR)/Bibata-Original-$(theme)-Windows.zip Bibata-Original-$(theme)-Windows;)
 	@tar -czvf $(BIN_DIR)/Bibata-Original.tar.gz Bibata-Original-Amber Bibata-Original-Classic Bibata-Original-Ice
 	@zip -r $(BIN_DIR)/Bibata-Original-Windows.zip Bibata-Original-Amber-Windows Bibata-Original-Classic-Windows Bibata-Original-Ice-Windows
 	#
-	# Bibata Unix
+	# Bibata.tar.gz
 	#
-	@tar -czvf $(BIN_DIR)/Bibata.tar.gz Bibata-Modern-Amber Bibata-Modern-Classic Bibata-Modern-Ice Bibata-Original-Amber Bibata-Original-Classic Bibata-Original-Ice
+	@tar -czvf $(BIN_DIR)/Bibata.tar.gz --exclude='*-Windows' *
 	@cd ..