diff --git a/iso_configs/calamares_settings/shared_structure/usr/bin/install-peppermint b/iso_configs/calamares_settings/shared_structure/usr/bin/install-peppermint
new file mode 100755
index 00000000..272cb6ef
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/bin/install-peppermint
@@ -0,0 +1,16 @@
+#!/bin/sh
+###
+# Wrapper for running calamares on Peppermint live media
+###
+
+# Stale file left behind by live-build that messes with partitioning
+sudo mv /etc/fstab /etc/fstab.orig.calamares
+
+# Access control to run calamares as root for xwayland
+#xhost +si:localuser:root
+pkexec calamares
+#pkexec calamares --debug | sudo tee /var/log/Calamares-Install.log
+xhost -si:localuser:root
+
+# Restore stale fstab, for what it's worth
+sudo mv /etc/fstab.orig.calamares /etc/fstab
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/bootloader-config/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/bootloader-config/module.desc
new file mode 100644
index 00000000..ace4c06f
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/bootloader-config/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "bootloader-config"
+interface:  "process"
+command:    "/usr/sbin/bootloader-config"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io-undo/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io-undo/module.desc
new file mode 100644
index 00000000..15f80f81
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io-undo/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io-undo"
+interface:  "process"
+command:    "/usr/sbin/dpkg-unsafe-io -u"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io/module.desc
new file mode 100644
index 00000000..aea96250
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/dpkg-unsafe-io/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "dpkg-unsafe-io"
+interface:  "process"
+command:    "/usr/sbin/dpkg-unsafe-io"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/grub-defaults/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/grub-defaults/module.desc
new file mode 100644
index 00000000..391d6a06
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/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/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-final/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-final/module.desc
new file mode 100644
index 00000000..4ff75eba
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-final/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-final"
+interface:  "process"
+command:    "/usr/sbin/sources-final"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media-unmount/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media-unmount/module.desc
new file mode 100644
index 00000000..0df415bc
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media-unmount/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-media-unmount"
+interface:  "process"
+command:    "/usr/sbin/sources-media -u"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media/module.desc
new file mode 100644
index 00000000..16432f13
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/sources-media/module.desc
@@ -0,0 +1,6 @@
+---
+type:       "job"
+name:       "sources-media"
+interface:  "process"
+command:    "/usr/sbin/sources-media"
+timeout:    600
diff --git a/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/update-system/module.desc b/iso_configs/calamares_settings/shared_structure/usr/lib/calamares/modules/update-system/module.desc
new file mode 100644
index 00000000..15b918dc
--- /dev/null
+++ b/iso_configs/calamares_settings/shared_structure/usr/lib/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/python_modules/conf.py b/python_modules/conf.py
index 8ec3032a..83d2eb3c 100644
--- a/python_modules/conf.py
+++ b/python_modules/conf.py
@@ -287,7 +287,7 @@ LOADED_LIST = ('xfce4\n'
                'xdg-user-dirs-gtk\n'
                'squashfs-tools\n'
                #'calamares\n' ## These are in the GENERAL_SHARED_LIST
-               #'calamares-settings-debian\n' ## in the GENERAL_SHARED_LIST
+               'calamares-settings-debian\n' ## in the GENERAL_SHARED_LIST
             )
 
 SERVER_LIST = ('zonefstoolspep\n'