diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh
index adec284..4ee85f5 100755
--- a/PepDeb32/pepbld.sh
+++ b/PepDeb32/pepbld.sh
@@ -154,6 +154,7 @@ cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh
index b4c86b9..24be948 100755
--- a/PepDeb64/pepbld.sh
+++ b/PepDeb64/pepbld.sh
@@ -155,6 +155,7 @@ cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh
index d15b131..70e1092 100755
--- a/PepDeb_arm64/pepbld.sh
+++ b/PepDeb_arm64/pepbld.sh
@@ -158,6 +158,7 @@ cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh
index ccb6560..2403915 100755
--- a/PepDev32/pepbld.sh
+++ b/PepDev32/pepbld.sh
@@ -167,6 +167,7 @@ cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/pres
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh
index 4d5f900..23bb943 100755
--- a/PepDev64/pepbld.sh
+++ b/PepDev64/pepbld.sh
@@ -167,6 +167,7 @@ cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/pres
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh
index 0433bf7..86f4cd6 100755
--- a/PepDev_arm64/pepbld.sh
+++ b/PepDev_arm64/pepbld.sh
@@ -171,6 +171,7 @@ cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/pres
 cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final
+cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/repos
 cp $uchinanchu/pepkeyrings/* $uchinanchu/fusato/config/includes.installer/preseed/keyrings
 cp $uchinanchu/polkit/* $uchinanchu/fusato/config/includes.installer/preseed/polkit
 cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/preseed/apps
diff --git a/pepscripts/copy-files-to-chroot.sh b/pepscripts/copy-files-to-chroot.sh
index e450abf..ef69154 100755
--- a/pepscripts/copy-files-to-chroot.sh
+++ b/pepscripts/copy-files-to-chroot.sh
@@ -7,9 +7,9 @@
 # This script copies a file to the chroot and runs commands during the Debian installation process.
 
 # setup a folder structure
-mkdir /target/etc/skel/.local/share/pmostools
-mkdir /target/opt/pepconf
-mkdir /target/opt/pypep/dbpep
+mkdir -p /target/etc/skel/.local/share/pmostools
+mkdir -p  /target/opt/pepconf
+mkdir -p /target/opt/pypep/dbpep
 
 
 # Copy files to the chroot directory
@@ -30,10 +30,10 @@ cp /preseed/pixmaps/* /target/usr/share/pixmaps
 
 
 # Copy recursive files and sub-directories
-cp -r  /preseed/protools/* /target/usr/local/bin
+cp -r /preseed/protools/* /target/usr/local/bin
 cp -r /preseed/py/* /target/usr/lib/python3/dist-packages
 cp -r /preseed/grub-themes/themes /target/boot/grub
-cp -r /preseed/tools* /target/etc/skel/.local/share/pmostools
+cp -r /preseed/tools/* /target/etc/skel/.local/share/pmostools
 
 # Run a commands in the chroot
 chroot /target update-initramfs -u
@@ -44,15 +44,15 @@ ln -s Debian.mirrors Peppermint.mirrors
 cd /target/usr/share/distro-info/
 ln -s debian.csv peppermint.csv
 cd /target/usr/share/
-ln -s -r icons pepicons
-ln -s -r themes pepthemes
-ls -s -r backgrounds pepwallpaper
+ln -s icons pepicons
+ln -s themes pepthemes
+ln -s backgrounds pepwallpaper
 chmod 777 pepicons
 chmod 777 pepthemes
 chmod 777 pepwallpaper
 
 # Install hblock
-in-target /bin/bash -c curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \
+chroot /target curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \
   && echo 'bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647  /tmp/hblock' | shasum -c \
   && sudo mv /tmp/hblock /usr/local/bin/hblock \
   && sudo chown 0:0 /usr/local/bin/hblock \
diff --git a/pepscriptsdev/copy-files-to-chroot.sh b/pepscriptsdev/copy-files-to-chroot.sh
index 22266c0..99898f3 100755
--- a/pepscriptsdev/copy-files-to-chroot.sh
+++ b/pepscriptsdev/copy-files-to-chroot.sh
@@ -8,9 +8,9 @@
 
 
 # setup a folder structure
-mkdir /target/etc/skel/.local/share/pmostools
-mkdir /target/opt/pepconf
-mkdir /target/opt/pypep/dbpep
+mkdir -p /target/etc/skel/.local/share/pmostools
+mkdir -p /target/opt/pepconf
+mkdir -p /target/opt/pypep/dbpep
 
 
 # Copy files to the chroot directory
@@ -45,15 +45,15 @@ ln -s Devuan.mirrors Peppermint.mirrors
 cd /target/usr/share/distro-info/
 ln -s devuan.csv peppermint.csv
 cd /target/usr/share/
-ln -s -r icons pepicons
-ln -s -r themes pepthemes
-ls -s -r backgrounds pepwallpaper
+ln -s icons pepicons
+ln -s themes pepthemes
+ln -s backgrounds pepwallpaper
 chmod 777 pepicons
 chmod 777 pepthemes
 chmod 777 pepwallpaper
 
 # Install hblock
-in-target /bin/bash -c curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \
+chroot /target curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \
   && echo 'bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647  /tmp/hblock' | shasum -c \
   && sudo mv /tmp/hblock /usr/local/bin/hblock \
   && sudo chown 0:0 /usr/local/bin/hblock \