diff --git a/lmde-expert.sh b/lmde-expert.sh
index a9ffb24..903ad0f 100755
--- a/lmde-expert.sh
+++ b/lmde-expert.sh
@@ -51,6 +51,32 @@ function create_luks() {
 	${cmd} cryptsetup luksOpen "$RootPart" luksvol
 }
 
+function prepare_format() {
+	if [[ "$DEBUG" ]]; then
+		local cmd="echo"
+	else
+		local cmd=""
+		echo "WARNING: Not in Debug mode, exiting now"
+		exit 254
+	fi
+
+	echo "Formatting EFI: $EFIPart"
+	${cmd} mkfs.fat -F32 -n "EFI" "$EFIPart"
+  
+  if [[ "$BootPart" != "@boot" ]]; then
+  	echo "Formatting Boot: $BootPart"
+  	${cmd} mkfs.ext4 -FF -L boot "$BootPart"
+  fi
+
+  if [[ "$ENCRYPTION" ]]; then
+  	echo "Formatting Root: /dev/mapper/luksvol"
+  	${cmd} mkfs.btrfs -L root /dev/mapper/luksvol
+  else
+  	echo "Formatting Root: $RootPart"
+  	${cmd} mkfs.btrfs -L root "$RootPart"
+  fi
+}
+
 function create_subvolumes() {
 	local -a subvols=("@")
 
@@ -205,6 +231,10 @@ function install_normal() {
 		create_luks
 	fi
 
+	echo
+	echo "Formatting Filesystems..."
+	prepare_format
+
 	echo
 	echo "Preparing Subvolumes..."
 	create_subvolumes