diff --git a/bootloader-config/bootloader-config b/bootloader-config/bootloader-config
index 0dbae957..521dc5b9 100755
--- a/bootloader-config/bootloader-config
+++ b/bootloader-config/bootloader-config
@@ -2,20 +2,48 @@
 
 CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
 
-# Set secure permissions for the initramfs if we're configuring
+# Install luks utilities if needed.
+# Also, set secure permissions for the initramfs if we're configuring
 # full-disk-encryption. The initramfs is re-generated later in the
 # installation process so we only set the permissions snippet without
 # regenerating the initramfs right now:
 if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then
     echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions
+    chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils
 fi
 
+# Update packages in the repos
+chroot $CHROOT apt-get update
+
 echo "Running bootloader-config..."
 
-if [ -d /sys/firmware/efi/efivars ]; then
-    echo " * Installing grub-efi (uefi)..."
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils
-else
-    echo " * install grub... (bios)"
-    DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
-fi
+# Detect architecture and install the appropriate GRUB package
+ARCH=$(uname -m)
+case "$ARCH" in
+    x86_64)
+        if [ -d /sys/firmware/efi/efivars ]; then
+            echo " * Installing grub-efi (uefi)..."
+            DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64
+        else
+            echo " * Installing grub-pc (bios)..."
+            DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
+        fi
+        ;;
+    i686)
+        echo " * Installing grub-efi-ia32 (uefi 32-bit)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
+        ;;
+    aarch64)
+        echo " * Installing grub-efi-arm64 (uefi arm64)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-arm64
+        ;;
+    *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+esac
+
+# Re-enable os-prober:
+sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
+chroot $CHROOT /usr/sbin/update-grub
+
diff --git a/calamares/branding/my-distro/1.png b/calamares/calamares/branding/my-distro/1.png
similarity index 100%
rename from calamares/branding/my-distro/1.png
rename to calamares/calamares/branding/my-distro/1.png
diff --git a/calamares/branding/my-distro/2.png b/calamares/calamares/branding/my-distro/2.png
similarity index 100%
rename from calamares/branding/my-distro/2.png
rename to calamares/calamares/branding/my-distro/2.png
diff --git a/calamares/branding/my-distro/3.png b/calamares/calamares/branding/my-distro/3.png
similarity index 100%
rename from calamares/branding/my-distro/3.png
rename to calamares/calamares/branding/my-distro/3.png
diff --git a/calamares/branding/my-distro/4.png b/calamares/calamares/branding/my-distro/4.png
similarity index 100%
rename from calamares/branding/my-distro/4.png
rename to calamares/calamares/branding/my-distro/4.png
diff --git a/calamares/branding/my-distro/5.png b/calamares/calamares/branding/my-distro/5.png
similarity index 100%
rename from calamares/branding/my-distro/5.png
rename to calamares/calamares/branding/my-distro/5.png
diff --git a/calamares/branding/my-distro/6.png b/calamares/calamares/branding/my-distro/6.png
similarity index 100%
rename from calamares/branding/my-distro/6.png
rename to calamares/calamares/branding/my-distro/6.png
diff --git a/calamares/branding/my-distro/branding.desc b/calamares/calamares/branding/my-distro/branding.desc
similarity index 100%
rename from calamares/branding/my-distro/branding.desc
rename to calamares/calamares/branding/my-distro/branding.desc
diff --git a/calamares/branding/my-distro/debian-logo.png b/calamares/calamares/branding/my-distro/debian-logo.png
similarity index 100%
rename from calamares/branding/my-distro/debian-logo.png
rename to calamares/calamares/branding/my-distro/debian-logo.png
diff --git a/calamares/branding/my-distro/languages.png b/calamares/calamares/branding/my-distro/languages.png
similarity index 100%
rename from calamares/branding/my-distro/languages.png
rename to calamares/calamares/branding/my-distro/languages.png
diff --git a/calamares/branding/my-distro/show.qml b/calamares/calamares/branding/my-distro/show.qml
similarity index 100%
rename from calamares/branding/my-distro/show.qml
rename to calamares/calamares/branding/my-distro/show.qml
diff --git a/calamares/modules/bootloader.conf b/calamares/calamares/modules/bootloader.conf
similarity index 100%
rename from calamares/modules/bootloader.conf
rename to calamares/calamares/modules/bootloader.conf
diff --git a/calamares/modules/displaymanager.conf b/calamares/calamares/modules/displaymanager.conf
similarity index 100%
rename from calamares/modules/displaymanager.conf
rename to calamares/calamares/modules/displaymanager.conf
diff --git a/calamares/modules/finished.conf b/calamares/calamares/modules/finished.conf
similarity index 100%
rename from calamares/modules/finished.conf
rename to calamares/calamares/modules/finished.conf
diff --git a/calamares/modules/fstab.conf b/calamares/calamares/modules/fstab.conf
similarity index 100%
rename from calamares/modules/fstab.conf
rename to calamares/calamares/modules/fstab.conf
diff --git a/calamares/modules/locale.conf b/calamares/calamares/modules/locale.conf
similarity index 100%
rename from calamares/modules/locale.conf
rename to calamares/calamares/modules/locale.conf
diff --git a/calamares/modules/luksopenswaphookcfg.conf b/calamares/calamares/modules/luksopenswaphookcfg.conf
similarity index 100%
rename from calamares/modules/luksopenswaphookcfg.conf
rename to calamares/calamares/modules/luksopenswaphookcfg.conf
diff --git a/calamares/modules/machineid.conf b/calamares/calamares/modules/machineid.conf
similarity index 100%
rename from calamares/modules/machineid.conf
rename to calamares/calamares/modules/machineid.conf
diff --git a/calamares/modules/mount.conf b/calamares/calamares/modules/mount.conf
similarity index 100%
rename from calamares/modules/mount.conf
rename to calamares/calamares/modules/mount.conf
diff --git a/calamares/modules/openrcdmcryptcfg.conf b/calamares/calamares/modules/openrcdmcryptcfg.conf
similarity index 100%
rename from calamares/modules/openrcdmcryptcfg.conf
rename to calamares/calamares/modules/openrcdmcryptcfg.conf
diff --git a/calamares/modules/packages.conf b/calamares/calamares/modules/packages.conf
similarity index 100%
rename from calamares/modules/packages.conf
rename to calamares/calamares/modules/packages.conf
diff --git a/calamares/modules/partition.conf b/calamares/calamares/modules/partition.conf
similarity index 100%
rename from calamares/modules/partition.conf
rename to calamares/calamares/modules/partition.conf
diff --git a/calamares/modules/services-systemd.conf b/calamares/calamares/modules/services-systemd.conf
similarity index 100%
rename from calamares/modules/services-systemd.conf
rename to calamares/calamares/modules/services-systemd.conf
diff --git a/calamares/modules/unpackfs.conf b/calamares/calamares/modules/unpackfs.conf
similarity index 100%
rename from calamares/modules/unpackfs.conf
rename to calamares/calamares/modules/unpackfs.conf
diff --git a/calamares/modules/users.conf b/calamares/calamares/modules/users.conf
similarity index 100%
rename from calamares/modules/users.conf
rename to calamares/calamares/modules/users.conf
diff --git a/calamares/modules/welcome.conf b/calamares/calamares/modules/welcome.conf
similarity index 100%
rename from calamares/modules/welcome.conf
rename to calamares/calamares/modules/welcome.conf
diff --git a/calamares/settings.conf b/calamares/calamares/settings.conf
similarity index 98%
rename from calamares/settings.conf
rename to calamares/calamares/settings.conf
index 3c96f0e8..36325dfb 100644
--- a/calamares/settings.conf
+++ b/calamares/calamares/settings.conf
@@ -76,13 +76,16 @@ sequence:
   - bootloader-config
   - grubcfg
   - bootloader
-  - packages
   - luksbootkeyfile
+  - luksopenswaphookcfg
   - plymouthcfg
   - initramfscfg
   - initramfs
   - sources-media-unmount
   - sources-final
+  - update-system
+  - grub-defaults
+  - shellprocess
   - umount
 
 # Phase 3 - postinstall.
diff --git a/calamares/modules/grub-defaults/module.desc b/calamares/modules/grub-defaults/module.desc
new file mode 100644
index 00000000..391d6a06
--- /dev/null
+++ b/calamares/modules/grub-defaults/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "grub-defaults"
+interface:  "process"
+command:    "/usr/sbin/grub-defaults"
+timeout:    600
diff --git a/calamares/modules/update-system/module.desc b/calamares/modules/update-system/module.desc
new file mode 100644
index 00000000..15b918dc
--- /dev/null
+++ b/calamares/modules/update-system/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "update-system"
+interface:  "process"
+command:    "/usr/sbin/update-system"
+timeout:    600
diff --git a/calamares/scripts/grub-defaults b/calamares/scripts/grub-defaults
new file mode 100755
index 00000000..35bd4cad
--- /dev/null
+++ b/calamares/scripts/grub-defaults
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppermintOS Team  (peppermintosteam@proton.me)
+
+# This script configures grub defaults after Debian installation.
+
+# Define CHROOT
+  CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+
+# Sets GRUB configuration.
+# Writes the configuration to the /etc/default/grub file.
+# Updates the bootloader.
+
+# Check if CHROOT is set
+if [ -z "$CHROOT" ]; then
+    echo "CHROOT not set. Exiting."
+    exit 1
+fi
+
+# Defines the variables
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Peppermint"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX=""
+GRUB_GFXMODE=1360x768
+GRUB_THEME="/boot/grub/themes/peppermint/theme.txt"
+GRUB_DISABLE_OS_PROBER=false
+
+# GRUB configuration file path
+GRUB_CONFIG_FILE="$CHROOT/etc/default/grub"
+
+# Modify the GRUB file
+sed -i "s/^GRUB_DEFAULT=.*/GRUB_DEFAULT=$GRUB_DEFAULT/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_TIMEOUT=.*/GRUB_TIMEOUT=$GRUB_TIMEOUT/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"$GRUB_DISTRIBUTOR\"/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"$GRUB_CMDLINE_LINUX_DEFAULT\"/" $GRUB_CONFIG_FILE
+sed -i "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"$GRUB_CMDLINE_LINUX\"/" $GRUB_CONFIG_FILE
+sed -i "s/^#GRUB_GFXMODE=.*/GRUB_GFXMODE=$GRUB_GFXMODE/" $GRUB_CONFIG_FILE
+# Add GRUB_THEME if it doesn't exist
+if ! grep -q "^GRUB_THEME=" $GRUB_CONFIG_FILE; then
+    echo "GRUB_THEME=\"$GRUB_THEME\"" >> $GRUB_CONFIG_FILE
+else
+    sed -i "s#^GRUB_THEME=.*#GRUB_THEME=\"$GRUB_THEME\"#" $GRUB_CONFIG_FILE
+fi
+sed -i "s/^#GRUB_DISABLE_OS_PROBER=.*/GRUB_DISABLE_OS_PROBER=$GRUB_DISABLE_OS_PROBER/" $GRUB_CONFIG_FILE
+
+# Run update-grub after modifying the file
+chroot $CHROOT update-grub
+
+
diff --git a/calamares/scripts/update-system b/calamares/scripts/update-system
new file mode 100755
index 00000000..98838b84
--- /dev/null
+++ b/calamares/scripts/update-system
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Apply updates to the system
+
+# Function to update the system
+function update_system() {
+  # Define CHROOT
+  CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
+  
+  # Verifying CHROOT
+  if [ -z "$CHROOT" ]; then
+    echo "Error: CHROOT is not set."
+    exit 1
+  fi
+
+  echo "Updating the system..."
+  
+  # Update the package list
+  chroot $CHROOT /usr/bin/apt update
+  
+  # Update installed packages
+  chroot $CHROOT /usr/bin/apt upgrade -y
+  
+  # Remove unnecessary packages
+  chroot $CHROOT /usr/bin/apt autoremove -y
+  
+  # Clean the APT cache
+  chroot $CHROOT /usr/bin/apt clean
+  
+  echo "System successfully updated!"
+}
+
+# Run the function to update the system
+update_system
+
diff --git a/hooks/normal/install-firefox-latest.hook.chroot b/hooks/normal/install-firefox-latest.hook.chroot
new file mode 100644
index 00000000..c17a63df
--- /dev/null
+++ b/hooks/normal/install-firefox-latest.hook.chroot
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# Script to be used as a hook in Debian Live-Build
+# to install Firefox from the official Mozilla repository along with all available language packs
+
+# Function to set up the Mozilla repository and GPG key
+setup_repository_and_key() {
+    echo "Setting up Mozilla repository and GPG key for Firefox..."
+
+    # Create directory to store the APT repository keyring if it doesn't exist
+    install -d -m 0755 /etc/apt/keyrings
+
+    # Import the Mozilla APT repository authentication key
+    wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null
+
+    # Verify the GPG key fingerprint
+    expected_fingerprint="35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3"
+    actual_fingerprint=$(gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); print $0}')
+
+    if [ "$actual_fingerprint" == "$expected_fingerprint" ]; then
+        echo "The GPG key fingerprint matches: $actual_fingerprint."
+    else
+        echo "Verification failed: the GPG key fingerprint ($actual_fingerprint) does not match the expected one ($expected_fingerprint)."
+        exit 1
+    fi
+
+    # Add the Mozilla APT repository to the sources list
+    echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list
+
+    # Configure APT to prioritize packages from the Mozilla repository
+    echo '
+Package: *
+Pin: origin packages.mozilla.org
+Pin-Priority: 1000
+' > /etc/apt/preferences.d/mozilla
+
+    # Update the package list
+    apt-get update
+}
+
+# Function to install Firefox and available language packs
+install_firefox() {
+    echo "Installing Firefox and its language packs..."
+
+    # Install Firefox
+    apt-get install -y firefox
+
+    # Install all available Firefox language packs
+    apt-get install -y $(apt-cache search firefox-l10n | awk '{print $1}')
+}
+
+# Main execution of the script
+main() {
+    setup_repository_and_key
+    install_firefox
+
+    echo "Firefox installation completed."
+}
+
+# Execute the main function
+main
+
diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh
index d7035d25..7f85fc33 100755
--- a/my-distro-debian-32-pae/build.sh
+++ b/my-distro-debian-32-pae/build.sh
@@ -200,6 +200,9 @@ tumbler
 tumbler-plugins-extra
 ffmpegthumbnailer
 xterm
+git
+curl
+wget
 grub-pc
 spice-vdagent
 console-setup
@@ -246,10 +249,12 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
-mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
+mkdir -p $build/build/config/includes.chroot/etc/default
+mkdir -p $build/build/config/includes.chroot/boot/grub
 
 # Copy Configs to the chroot
 cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d
@@ -258,6 +263,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
 cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
@@ -265,14 +271,15 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 #cp -r $build/packages/* $build/build/config/packages.chroot
-cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
+cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 
 # build the ISO #
 lb build  #--debug --verbose 
diff --git a/my-distro-debian-32-pae/packages b/my-distro-debian-32-pae/packages
new file mode 120000
index 00000000..a16c4050
--- /dev/null
+++ b/my-distro-debian-32-pae/packages
@@ -0,0 +1 @@
+../packages
\ No newline at end of file
diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh
index 576bde7e..94963e9a 100755
--- a/my-distro-debian-32/build.sh
+++ b/my-distro-debian-32/build.sh
@@ -200,6 +200,9 @@ tumbler
 tumbler-plugins-extra
 ffmpegthumbnailer
 xterm
+git
+curl
+wget
 grub-pc
 spice-vdagent
 console-setup
@@ -247,8 +250,10 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
+mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
 mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/boot/grub
 
@@ -259,6 +264,7 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
 cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
@@ -266,7 +272,7 @@ cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
@@ -274,6 +280,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 #cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 
 # build the ISO #
 lb build  #--debug --verbose 
diff --git a/my-distro-debian-32/packages b/my-distro-debian-32/packages
new file mode 120000
index 00000000..a16c4050
--- /dev/null
+++ b/my-distro-debian-32/packages
@@ -0,0 +1 @@
+../packages
\ No newline at end of file
diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh
index ee21c5a4..c6b41c49 100755
--- a/my-distro-debian-64/build.sh
+++ b/my-distro-debian-64/build.sh
@@ -242,14 +242,17 @@ mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds
 mkdir -p $build/build/config/includes.chroot/etc/calamares
 mkdir -p $build/build/config/includes.chroot/usr/share/icons
 mkdir -p $build/build/config/includes.chroot/usr/share/themes
+mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
-mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
+#mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
-mkdir -p $build/build/config/includes.chroot/etc/default
 mkdir -p $build/build/config/includes.chroot/boot/grub/themes
+mkdir -p $build/build/config/includes.chroot/usr/lib/calamares
+mkdir -p $build/build/config/includes.chroot/etc/default
+mkdir -p $build/build/config/includes.chroot/boot/grub
 
 # Copy Configs to the chroot
 cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d
@@ -258,20 +261,23 @@ cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
+cp $build/calamares/scripts/* $build/build/config/includes.chroot/usr/sbin
+cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
 cp $build/grub/grub $build/build/config/includes.chroot/etc/default
 
 cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm
 cp -r $build/bootloaders/* $build/build/config/includes.binary
 cp -r $build/repos/* $build/build/config/archives
 cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
-cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
+cp -r $build/calamares/calamares/* $build/build/config/includes.chroot/etc/calamares
 cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 #cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
 #cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
-cp -r $build/packages/* $build/build/config/packages.chroot
-cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
+#cp -r $build/packages/* $build/build/config/packages.chroot
+cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub
+cp -r $build/calamares/modules/* $build/build/config/includes.chroot/usr/lib/calamares
 
 # Build the ISO #
 lb build  #--debug --verbose 
diff --git a/my-distro-debian-64/packages b/my-distro-debian-64/packages
new file mode 120000
index 00000000..a16c4050
--- /dev/null
+++ b/my-distro-debian-64/packages
@@ -0,0 +1 @@
+../packages
\ No newline at end of file
diff --git a/my-distro-debian-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb b/my-distro-debian-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb
deleted file mode 100644
index da9133c7..00000000
Binary files a/my-distro-debian-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb and /dev/null differ