diff --git a/Makefile b/Makefile
index 54b8ab2..1d0e70f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 #!/usr/bin/make
+Customization?=Default
 .DEFAULT_GOAL := list 
 
 list: #Shows this list
@@ -6,6 +7,7 @@ list: #Shows this list
 	@grep '^[^#[:space:]].*:' Makefile | grep -v := | sed -e "s/:[^|]*#/: /g"
 
 prep_buildenv: #Preperation for build (setting file permissons, etc)
+	cp -rf customization/${Customization}/* config
 	chmod 600 config/includes.chroot/etc/NetworkManager/system-connections/*.nmconnection
 
 install_buildenv: # Install packages required to build the image
@@ -42,7 +44,9 @@ clean_env: #Clear all caches and archives
 	sudo TargetArch=i386 lb clean --all
 	make -f Makefile.extra clean
 	rm -f config/hooks/normal/0899-install-dkms-drivers.chroot
+	#Remove customization
+	rm -f config/bootloaders/grub-pc/splash.png config/bootloaders/isolinux/splash.png config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection
+	rm -rf config/includes.chroot/opt/custom
 
 clean_iso: #Removes genereated iso's
-	rm -f Custom-image-amd64.iso Custom-image-i386.iso
-
+	rm -f Custom-image-amd64.iso Custom-image-i386.iso
\ No newline at end of file
diff --git a/config/bootloaders/grub-pc/splash.png b/customization/Default/bootloaders/grub-pc/splash.png
similarity index 100%
rename from config/bootloaders/grub-pc/splash.png
rename to customization/Default/bootloaders/grub-pc/splash.png
diff --git a/config/bootloaders/isolinux/splash.png b/customization/Default/bootloaders/isolinux/splash.png
similarity index 100%
rename from config/bootloaders/isolinux/splash.png
rename to customization/Default/bootloaders/isolinux/splash.png
diff --git a/config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection b/customization/Default/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection
similarity index 100%
rename from config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection
rename to customization/Default/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection
diff --git a/config/includes.chroot/opt/custom/CustomBG.png b/customization/Default/includes.chroot/opt/custom/CustomBG.png
similarity index 100%
rename from config/includes.chroot/opt/custom/CustomBG.png
rename to customization/Default/includes.chroot/opt/custom/CustomBG.png