diff --git a/bootloader-config/bootloader-config b/bootloader-config/bootloader-config
index 521dc5b9..d95b0017 100755
--- a/bootloader-config/bootloader-config
+++ b/bootloader-config/bootloader-config
@@ -29,9 +29,14 @@ case "$ARCH" in
             DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
         fi
         ;;
-    i686)
+i686)
+    if [ -d /sys/firmware/efi/efivars ]; then
         echo " * Installing grub-efi-ia32 (uefi 32-bit)..."
         DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32
+    else
+        echo " * Installing grub-pc (bios 32-bit)..."
+        DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc
+    fi
         ;;
     aarch64)
         echo " * Installing grub-efi-arm64 (uefi arm64)..."
diff --git a/calamares/debian/calamares/settings.conf b/calamares/debian/calamares/settings.conf
index 36325dfb..a600ff86 100644
--- a/calamares/debian/calamares/settings.conf
+++ b/calamares/debian/calamares/settings.conf
@@ -76,6 +76,7 @@ sequence:
   - bootloader-config
   - grubcfg
   - bootloader
+  - packages
   - luksbootkeyfile
   - luksopenswaphookcfg
   - plymouthcfg
diff --git a/calamares/devuan/calamares/settings.conf b/calamares/devuan/calamares/settings.conf
index c69a10e8..a600ff86 100644
--- a/calamares/devuan/calamares/settings.conf
+++ b/calamares/devuan/calamares/settings.conf
@@ -5,18 +5,6 @@
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
 modules-search: [ local, /usr/lib/calamares/modules ]
 
-# YAML: list of maps of string:string key-value pairs.
-instances:
-- id:       packages
-  module:   netinstall
-  config:   netinstall-packages.conf
-- id:       system
-  module:   netinstall
-  config:   netinstall-system.conf
-- id:       pkgs
-  module:   netinstall
-  config:   netinstall-pkgs.conf
-
 # If this is set to true, Calamares refers to itself as a "setup program"
 # rather than an "installer". Defaults to the value of dont-chroot, but
 # Calamares will complain if this is not explicitly set.
@@ -61,7 +49,6 @@ sequence:
   - locale
   - keyboard
   - partition
-  - netinstall@packages
   - users
   - summary
 
diff --git a/calamares/scripts/grub-defaults b/calamares/scripts/grub-defaults
index 35bd4cad..f9131aef 100755
--- a/calamares/scripts/grub-defaults
+++ b/calamares/scripts/grub-defaults
@@ -22,11 +22,11 @@ fi
 # Defines the variables
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Peppermint"
+GRUB_DISTRIBUTOR="My-distro"
 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
 GRUB_CMDLINE_LINUX=""
-GRUB_GFXMODE=1360x768
-GRUB_THEME="/boot/grub/themes/peppermint/theme.txt"
+GRUB_GFXMODE=1440x900
+GRUB_THEME="/boot/grub/themes/my-distro/theme.txt"
 GRUB_DISABLE_OS_PROBER=false
 
 # GRUB configuration file path
diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh
index 94556ca2..c6650101 100755
--- a/my-distro-debian-32/build.sh
+++ b/my-distro-debian-32/build.sh
@@ -230,7 +230,6 @@ mkdir -p $build/build/config/archives
 mkdir -p $build/build/config/includes.binary
 mkdir -p $build/build/config/hooks/live
 mkdir -p $build/build/config/hooks/normal
-mkdir -p $build/build/config/bootloaders
 mkdir -p $build/build/config/packages.chroot
 mkdir -p $build/build/config/includes.chroot/etc
 mkdir -p $build/build/config/includes.chroot/usr/lib/live/config
@@ -244,8 +243,8 @@ 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/plymouth/themes
+#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/modules