diff --git a/calamares/calamares/branding/peppermint/branding.desc b/calamares/debian/branding/peppermint/branding.desc
similarity index 100%
rename from calamares/calamares/branding/peppermint/branding.desc
rename to calamares/debian/branding/peppermint/branding.desc
diff --git a/calamares/calamares/branding/peppermint/pep-logo.png b/calamares/debian/branding/peppermint/pep-logo.png
similarity index 100%
rename from calamares/calamares/branding/peppermint/pep-logo.png
rename to calamares/debian/branding/peppermint/pep-logo.png
diff --git a/calamares/calamares/branding/peppermint/s5.png b/calamares/debian/branding/peppermint/s5.png
similarity index 100%
rename from calamares/calamares/branding/peppermint/s5.png
rename to calamares/debian/branding/peppermint/s5.png
diff --git a/calamares/calamares/branding/peppermint/show.qml b/calamares/debian/branding/peppermint/show.qml
similarity index 100%
rename from calamares/calamares/branding/peppermint/show.qml
rename to calamares/debian/branding/peppermint/show.qml
diff --git a/calamares/calamares/branding/peppermint/stylesheet.qss b/calamares/debian/branding/peppermint/stylesheet.qss
similarity index 100%
rename from calamares/calamares/branding/peppermint/stylesheet.qss
rename to calamares/debian/branding/peppermint/stylesheet.qss
diff --git a/calamares/calamares/branding/peppermint/welcome.png b/calamares/debian/branding/peppermint/welcome.png
similarity index 100%
rename from calamares/calamares/branding/peppermint/welcome.png
rename to calamares/debian/branding/peppermint/welcome.png
diff --git a/calamares/calamares/modules/bootloader.conf b/calamares/debian/modules/bootloader.conf
similarity index 100%
rename from calamares/calamares/modules/bootloader.conf
rename to calamares/debian/modules/bootloader.conf
diff --git a/calamares/calamares/modules/displaymanager.conf b/calamares/debian/modules/displaymanager.conf
similarity index 100%
rename from calamares/calamares/modules/displaymanager.conf
rename to calamares/debian/modules/displaymanager.conf
diff --git a/calamares/calamares/modules/finished.conf b/calamares/debian/modules/finished.conf
similarity index 100%
rename from calamares/calamares/modules/finished.conf
rename to calamares/debian/modules/finished.conf
diff --git a/calamares/calamares/modules/fstab.conf b/calamares/debian/modules/fstab.conf
similarity index 100%
rename from calamares/calamares/modules/fstab.conf
rename to calamares/debian/modules/fstab.conf
diff --git a/calamares/calamares/modules/locale.conf b/calamares/debian/modules/locale.conf
similarity index 100%
rename from calamares/calamares/modules/locale.conf
rename to calamares/debian/modules/locale.conf
diff --git a/calamares/calamares/modules/luksbootkeyfile.conf b/calamares/debian/modules/luksbootkeyfile.conf
similarity index 100%
rename from calamares/calamares/modules/luksbootkeyfile.conf
rename to calamares/debian/modules/luksbootkeyfile.conf
diff --git a/calamares/calamares/modules/luksopenswaphookcfg.conf b/calamares/debian/modules/luksopenswaphookcfg.conf
similarity index 100%
rename from calamares/calamares/modules/luksopenswaphookcfg.conf
rename to calamares/debian/modules/luksopenswaphookcfg.conf
diff --git a/calamares/calamares/modules/machineid.conf b/calamares/debian/modules/machineid.conf
similarity index 100%
rename from calamares/calamares/modules/machineid.conf
rename to calamares/debian/modules/machineid.conf
diff --git a/calamares/calamares/modules/mount.conf b/calamares/debian/modules/mount.conf
similarity index 100%
rename from calamares/calamares/modules/mount.conf
rename to calamares/debian/modules/mount.conf
diff --git a/calamares/calamares/modules/packages.conf b/calamares/debian/modules/packages.conf
similarity index 100%
rename from calamares/calamares/modules/packages.conf
rename to calamares/debian/modules/packages.conf
diff --git a/calamares/calamares/modules/partition.conf b/calamares/debian/modules/partition.conf
similarity index 100%
rename from calamares/calamares/modules/partition.conf
rename to calamares/debian/modules/partition.conf
diff --git a/calamares/calamares/modules/shellprocess.conf b/calamares/debian/modules/shellprocess.conf
similarity index 100%
rename from calamares/calamares/modules/shellprocess.conf
rename to calamares/debian/modules/shellprocess.conf
diff --git a/calamares/calamares/modules/unpackfs.conf b/calamares/debian/modules/unpackfs.conf
similarity index 100%
rename from calamares/calamares/modules/unpackfs.conf
rename to calamares/debian/modules/unpackfs.conf
diff --git a/calamares/calamares/modules/users.conf b/calamares/debian/modules/users.conf
similarity index 100%
rename from calamares/calamares/modules/users.conf
rename to calamares/debian/modules/users.conf
diff --git a/calamares/calamares/modules/welcome.conf b/calamares/debian/modules/welcome.conf
similarity index 100%
rename from calamares/calamares/modules/welcome.conf
rename to calamares/debian/modules/welcome.conf
diff --git a/calamares/calamares/settings.conf b/calamares/debian/settings.conf
similarity index 100%
rename from calamares/calamares/settings.conf
rename to calamares/debian/settings.conf
diff --git a/calamares/devuan/branding/peppermint/branding.desc b/calamares/devuan/branding/peppermint/branding.desc
new file mode 100644
index 000000000..34a7d3baa
--- /dev/null
+++ b/calamares/devuan/branding/peppermint/branding.desc
@@ -0,0 +1,34 @@
+---
+componentName:   peppermint
+welcomeStyleCalamares: false
+welcomeExpandingLogo: true
+windowExpanding: normal
+windowSize: 700,450
+windowPlacement: center
+
+strings:
+    productName:         Peppermint
+    shortProductName:    Peppermint
+    version:             00
+    shortVersion:        00
+    versionedName:       Peppermint
+    shortVersionedName:  Peppermint
+    bootloaderEntryName: Peppermint
+    productUrl:          https://peppermintos.com
+    supportUrl:          https://sourceforge.net/p/peppermintos/pepos/
+    releaseNotesUrl:     https://peppermintos.com
+
+images:
+    productLogo:         "pep-logo.png"
+    productIcon:         "pep-logo.png"
+    productWelcome:      "welcome.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#C0C0C0"
+   sidebarText:          "#000000"
+   sidebarTextSelect:    "#ffffff"
+   sidebarTextHighlight: "#f62817"
+
+
diff --git a/calamares/devuan/branding/peppermint/pep-logo.png b/calamares/devuan/branding/peppermint/pep-logo.png
new file mode 100644
index 000000000..5a5576247
Binary files /dev/null and b/calamares/devuan/branding/peppermint/pep-logo.png differ
diff --git a/calamares/devuan/branding/peppermint/s5.png b/calamares/devuan/branding/peppermint/s5.png
new file mode 100644
index 000000000..e23926beb
Binary files /dev/null and b/calamares/devuan/branding/peppermint/s5.png differ
diff --git a/calamares/devuan/branding/peppermint/show.qml b/calamares/devuan/branding/peppermint/show.qml
new file mode 100644
index 000000000..c10e12437
--- /dev/null
+++ b/calamares/devuan/branding/peppermint/show.qml
@@ -0,0 +1,40 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
+ *   Copyright 2018-2019, Jonathan Carter <jcc@debian.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, or (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0;
+import calamares.slideshow 1.0;
+
+Presentation
+{
+    id: presentation
+    Timer {
+            interval: 20000
+            running: true
+            repeat: true
+            onTriggered: presentation.goToNextSlide()
+            }
+    Slide {
+        Image {
+                id: background5
+                source: "s5.png"
+                width: 2000; height: 2000
+                fillMode: Image.PreserveAspectFit
+                anchors.centerIn: parent
+                }
+            }
+}
diff --git a/calamares/devuan/branding/peppermint/stylesheet.qss b/calamares/devuan/branding/peppermint/stylesheet.qss
new file mode 100644
index 000000000..d33f5e1db
--- /dev/null
+++ b/calamares/devuan/branding/peppermint/stylesheet.qss
@@ -0,0 +1,163 @@
+/*########Current Calamares Styles##########*/
+/* These "Q's" are master styles for overall colours */
+#mainApp {background-color: #C0C0C0;
+          font-family: Cantarell;
+          font-weight: bold;
+          color: #000000
+          }
+
+/* Set the entire Font and Background color */
+QWidget { color: #000000 ;
+          background-color: #C0C0C0;
+          font-family: Cantarell;
+          font: 14px; }
+
+#globalStorageTab { background-color: #C0C0C0 }
+
+/* Set Drop Down Font and Background color */
+QComboBox { font: 14px ;
+            color: #000000 ;
+            background-color: #ffffff ;
+            padding: 2px ;
+            border-radius: 10px
+            }
+
+#languageWidget { font: 14px ;
+                  color: #111111 ;
+                  background-color: #ffffff ;
+                  text-align: center ;
+                  border-radius: 6px
+                  }
+
+/* Set the inline Text box edit Font and Background color */
+QLineEdit { font: 14px;
+            color: #111111;
+            background-color: #ffffff;
+            border-color: #000000
+            }
+
+/* Set List box Font and Background color */
+QListView { font: 14px;
+            color: #000000;
+            background-color: #ffffff;
+            alternate-background-color: #C0C0C0;
+            padding: 2px;
+            border-radius: 4px
+            }
+
+#layoutSelector {}
+
+/* Set the TreeView Font and Background color */
+QTreeView { color: #000000;
+            background-color: #ffffff;
+            border-radius: 14px
+            }
+
+/* Set buttons Font and Background color */
+QPushButton { font: 14px;
+              color: #000000;
+              background-color: #C0C0C0;
+              border-color: #000000;
+              border-width: 10px;}
+
+#view-button-back { font: 14px;
+                    background-color: #C0C0C0
+                    }
+#view-button-back:hover { font: 14px;
+                          color: #000000;
+                          background-color: #ffffff;
+                          border-color: #000000
+                          }
+#view-button-next { font: 14px;
+                    background-color: #C0C0C0;
+                    border-color: #000000
+                    }
+#view-button-next:hover { font: 14px;
+                          color: #000000;
+                          background-color: #ffffff;
+                          border-color: #000000
+                          }
+#view-button-cancel { font: 14px;
+                      background-color: #C0C0C0;
+                      border-color: #000000
+                      }
+#view-button-cancel:hover { font: 14px;
+                            color: #000000;
+                            background-color: #ffffff;
+                            border-color: #000000;
+                            }
+#view-button-install { font: 14px;
+                       color: #C0C0C0;
+                       border-color: #000000
+                       }
+#view-button-done { font: 14px;
+                    color: #000000;
+                    border-color: #000000
+                   }
+
+/* Set the color in the keyboard selection */
+#layoutSelector { selection-background-color: #F62817 }
+#variantSelector { selection-background-color: #F62817 }
+
+/* Set the CheckBox size and Background color */
+QCheckBox { color: #000000;
+            background-color: #C0C0C0;
+            border-width: 2px;
+            border-color: #000000
+            }
+
+m_encryptCheckBox { font: 14px;
+                    color: #F62817;
+                    background-color: #C0C0C0;
+                    border-radius: 4px;
+                    padding: 6px
+                    }
+
+checkBoxDoAutoLogin { font: 14px;
+                      color: #000000;
+                      background-color: #C0C0C0;
+                      padding: 4px
+                      }
+
+restartCheckBox { font: 14px;
+                  color: #000000;
+                  background-color: #C0C0C0;
+                  border-color: #000000;
+                  border-radius: 8px;
+                  height: 16px;
+                  width: 100px;
+                  padding: 4px
+                  }
+
+#QCheckBox#restartCheckBox::indicator:checked { image: url(/usr/share/pixmaps/ckm.png) }
+
+/* Set the color when selected */
+QRadioButton { color: #000000;
+               background-color: #C0C0C0;
+               padding: 4px;
+               border-radius: 4px
+               }
+QComboBoxPrivateContainer { background-color: #ffffff }
+QComboBoxListView { background-color: #ffffff }
+qt_scrollarea_hcontainer { background-color: #ffffff }
+qt_scrollarea_vcontainer { background-color: #ffffff }
+QRadioButton::indicator { width: 18px ; height: 18px }
+QRadioButton::indicator::checked { image: url(/usr/share/pixmaps/peppermint.png) }
+QRadioButton::indicator::checked:hover { image: url(/usr/share/pixmaps/peppermint-fm-20.png) }
+QRadioButton::indicator::unchecked:hover { image: url(/usr/share/pixmaps/peppermint-inst.png) }
+
+/* Set the tip Font and Background color */
+QToolTip { font: 14px;
+           color: #000000;
+           background-color: #ffffff;
+           padding: 4px;
+           border-radius: 4px
+           }
+
+/* Set the Progress Bar alignment and load color */
+QProgressBar { text-align: center }
+QProgressBar::chunk { background-color: #F62817 }
+
+#debugButton {font: }
+#sidebarMenuApp{ background-color: #C0C0C0 }
+#tabWidget { background-color: #C0C0C0 }
diff --git a/calamares/devuan/branding/peppermint/welcome.png b/calamares/devuan/branding/peppermint/welcome.png
new file mode 100644
index 000000000..4d8d1a416
Binary files /dev/null and b/calamares/devuan/branding/peppermint/welcome.png differ
diff --git a/calamares/devuan/modules/bootloader.conf b/calamares/devuan/modules/bootloader.conf
new file mode 100644
index 000000000..043675185
--- /dev/null
+++ b/calamares/devuan/modules/bootloader.conf
@@ -0,0 +1,54 @@
+# Bootloader configuration. The bootloader is installed to allow
+# the system to start (and pick one of the installed operating
+# systems to run).
+---
+# Define which bootloader you want to use for EFI installations
+# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
+efiBootLoader: "grub"
+
+# systemd-boot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
+kernel: "/vmlinuz-linux"
+img: "/initramfs-linux.img"
+fallback: "/initramfs-linux-fallback.img"
+timeout: "10"
+
+# Optionally set the menu entry name and kernel name to use in systemd-boot.
+# If not specified here, these settings will be taken from branding.desc.
+#
+# bootloaderEntryName: "Generic GNU/Linux"
+# kernelLine: ", with Stable-Kernel"
+# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
+
+# GRUB 2 binary names and boot directory
+# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+# These names are also used when using sb-shim, since that needs some
+# GRUB functionality (notably grub-probe) to work. As needed, you may use
+# complete paths like `/usr/bin/efibootmgr` for the executables.
+#
+grubInstall: "grub-install"
+grubMkconfig: "grub-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+# Optionally set the bootloader ID to use for EFI. This is passed to
+# grub-install --bootloader-id.
+#
+# If not set here, the value from bootloaderEntryName from branding.desc
+# is used, with problematic characters (space and slash) replaced.
+#
+# The ID is also used as a directory name within the EFI environment,
+# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
+# setting the option here, keep in mind that the name is sanitized
+# (problematic characters, see above, are replaced).
+#
+efiBootloaderId: "debian"
+
+# Optionally install a copy of the GRUB EFI bootloader as the EFI
+# fallback loader (either bootia32.efi or bootx64.efi depending on
+# the system). This may be needed on certain systems (Intel DH87MC
+# seems to be the only one). If you set this to false, take care
+# to add another module to optionally install the fallback on those
+# boards that need it.
+installEFIFallback: true
diff --git a/calamares/devuan/modules/displaymanager.conf b/calamares/devuan/modules/displaymanager.conf
new file mode 100644
index 000000000..8f8e9c704
--- /dev/null
+++ b/calamares/devuan/modules/displaymanager.conf
@@ -0,0 +1,28 @@
+# Configure one or more display managers (e.g. SDDM)
+# with a "best effort" approach.
+---
+#The DM module attempts to set up all the DMs found in this list, in that precise order.
+#It also sets up autologin, if the feature is enabled in globalstorage.
+#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
+displaymanagers:
+  - slim
+  - sddm
+  - lightdm
+  - gdm
+  - mdm
+  - lxdm
+  - kdm
+
+#Enable the following settings to force a desktop environment in your displaymanager configuration file:
+#defaultDesktopEnvironment:
+#    executable: "startkde"
+#    desktopFile: "plasma"
+
+#If true, try to ensure that the user, group, /var directory etc. for the
+#display manager are set up correctly. This is normally done by the distribution
+#packages, and best left to them. Therefore, it is disabled by default.
+basicSetup: false
+
+#If true, setup autologin for openSUSE. This only makes sense on openSUSE
+#derivatives or other systems where /etc/sysconfig/displaymanager exists.
+sysconfigSetup: false
diff --git a/calamares/devuan/modules/finished.conf b/calamares/devuan/modules/finished.conf
new file mode 100644
index 000000000..4b0f909d0
--- /dev/null
+++ b/calamares/devuan/modules/finished.conf
@@ -0,0 +1,4 @@
+---
+restartNowEnabled: true
+restartNowChecked: true
+restartNowCommand: "reboot"
diff --git a/calamares/devuan/modules/fstab.conf b/calamares/devuan/modules/fstab.conf
new file mode 100644
index 000000000..29907170d
--- /dev/null
+++ b/calamares/devuan/modules/fstab.conf
@@ -0,0 +1,11 @@
+---
+mountOptions:
+    default: defaults,noatime
+    btrfs: defaults,noatime,space_cache,autodefrag
+ssdExtraMountOptions:
+    ext4: discard
+    jfs: discard
+    xfs: discard
+    swap: discard
+    btrfs: discard,compress=lzo
+crypttabOptions: luks,keyscript=/bin/cat
diff --git a/calamares/devuan/modules/locale.conf b/calamares/devuan/modules/locale.conf
new file mode 100644
index 000000000..01b7a0c8c
--- /dev/null
+++ b/calamares/devuan/modules/locale.conf
@@ -0,0 +1,131 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+---
+# These settings are used to set your default system time zone.
+# Time zones are usually located under /usr/share/zoneinfo and
+# provided by the 'tzdata' package of your Distribution.
+#
+# Distributions using systemd can list available
+# time zones by using the timedatectl command.
+#    timedatectl list-timezones
+#
+# The starting timezone (e.g. the pin-on-the-map) when entering
+# the locale page can be set through keys *region* and *zone*.
+# If either is not set, defaults to America/New_York.
+#
+# Note that useSystemTimezone and GeoIP settings can change the
+# starting time zone.
+#
+region:                     "America"
+zone:                       "New_York"
+
+# Instead of using *region* and *zone* specified above,
+# you can use the system's notion of the timezone, instead.
+# This can help if your system is automatically configured with
+# a sensible TZ rather than chasing a fixed default.
+#
+# The default is false.
+#
+# useSystemTimezone: true
+
+# Should changing the system location (e.g. clicking around on the timezone
+# map) immediately reflect the changed timezone in the live system?
+# By default, installers (with a target system) do, and setup (e.g. OEM
+# configuration) does not, but you can switch it on here (or off, if
+# you think it's annoying in the installer).
+#
+# Note that not all systems support live adjustment.
+#
+# adjustLiveTimezone:   true
+
+# System locales are detected in the following order:
+#
+#  - /usr/share/i18n/SUPPORTED
+#  - localeGenPath (defaults to /etc/locale.gen if not set)
+#  - `locale -a` output
+#
+# Enable only when your Distribution is using a
+# custom path for locale.gen
+#
+localeGenPath:             "/etc/locale.gen"
+
+# GeoIP based Language settings: Leave commented out to disable GeoIP.
+#
+# GeoIP needs a working Internet connection.
+# This can be managed from `welcome.conf` by adding
+# internet to the list of required conditions. (The welcome
+# module can also do its own GeoIP lookups, independently
+# of the lookup done here. The lookup in the welcome module
+# is used to establish language; this one is for timezone).
+#
+# The configuration is in three parts:
+# - a *style*, which can be "json" or "xml" depending on the
+#   kind of data returned by the service, and
+# - a *url* where the data is retrieved, and
+# - an optional *selector*
+#   to pick the right field out of the returned data (e.g. field
+#   name in JSON or element name in XML).
+#
+# The default selector (when the setting is blank) is picked to
+# work with existing JSON providers (which use "time_zone") and
+# Ubiquity's XML providers (which use "TimeZone").
+#
+# If the service configured via *url* uses
+# a different attribute name (e.g. "timezone") in JSON or a
+# different element tag (e.g. "<Time_Zone>") in XML, set the
+# selector to the name or tag to be used.
+#
+# In JSON:
+#  - if the string contains "." characters, this is used as a
+#    multi-level selector, e.g. "a.b" will select the timezone
+#    from data "{a: {b: "Europe/Amsterdam" } }".
+#  - each part of the string split by "." characters is used as
+#    a key into the JSON data.
+# In XML:
+#  - all elements with the named tag (e.g. all TimeZone) elements
+#    from the document are checked; the first one with non-empty
+#    text value is used.
+# Special case:
+#  - the *style* "fixed" is also supported. This ignores the data
+#    returned from the URL (but the URL must still be valid!)
+#    and just returns the value of the *selector*.
+#
+# An HTTP(S) request is made to *url*. The request should return
+# valid data in a suitable format, depending on *style*;
+# generally this includes a string value with the timezone
+# in <region>/<zone> format. For services that return data which
+# does not follow the conventions of "suitable data" described
+# below, *selector* may be used to pick different data.
+#
+# Suitable JSON data looks like
+# ```
+#    {"time_zone":"America/New_York"}
+# ```
+# Suitable XML data looks like
+# ```
+#    <Response><TimeZone>Europe/Brussels</TimeZone></Response>
+# ```
+#
+# To accommodate providers of GeoIP timezone data with peculiar timezone
+# naming conventions, the following cleanups are performed automatically:
+#  - backslashes are removed
+#  - spaces are replaced with _
+#
+# To disable GeoIP checking, either comment-out the entire geoip section,
+# or set the *style* key to an unsupported format (e.g. `none`).
+# Also, note the analogous feature in src/modules/welcome/welcome.conf.
+#
+geoip:
+    style:    "json"
+    url:      "https://geoip.kde.org/v1/calamares"
+    selector: ""  # leave blank for the default
+
+# For testing purposes, you could use *fixed* style, to see how Calamares
+# behaves in a particular zone:
+#
+# geoip:
+#     style:    "fixed"
+#     url:      "https://geoip.kde.org/v1/calamares"  # Still needs to be valid!
+#     selector: "America/Vancouver"  # this is the selected zone
+#
diff --git a/calamares/devuan/modules/luksbootkeyfile.conf b/calamares/devuan/modules/luksbootkeyfile.conf
new file mode 100644
index 000000000..c7a75fe4c
--- /dev/null
+++ b/calamares/devuan/modules/luksbootkeyfile.conf
@@ -0,0 +1,5 @@
+# Writes a keyfile configuration with LUKS settings to the given path
+---
+# Path of the configuration file to write (in the target system)
+#configFilePath: /cryptroot/crypttab
+configFilePath: /etc/crypttab
diff --git a/calamares/devuan/modules/luksopenswaphookcfg.conf b/calamares/devuan/modules/luksopenswaphookcfg.conf
new file mode 100644
index 000000000..f5610cd7c
--- /dev/null
+++ b/calamares/devuan/modules/luksopenswaphookcfg.conf
@@ -0,0 +1,4 @@
+# Writes an openswap configuration with LUKS settings to the given path
+---
+# Path of the configuration file to write (in the target system)
+configFilePath: /etc/openswap.conf
diff --git a/calamares/devuan/modules/machineid.conf b/calamares/devuan/modules/machineid.conf
new file mode 100644
index 000000000..45ab1593e
--- /dev/null
+++ b/calamares/devuan/modules/machineid.conf
@@ -0,0 +1,15 @@
+---
+# Whether to create /etc/machine-id for systemd.
+systemd: false
+# Whether to create /var/lib/dbus/machine-id for D-Bus.
+dbus: true
+# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
+# (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+symlink: true
+# Whether to copy entropy from the host
+entropy-copy: true
+# Which files to write (paths in the target)
+entropy-files:
+    - /var/lib/urandom/random-seed
+#    - /var/lib/systemd/random-seed
+
diff --git a/calamares/devuan/modules/mount.conf b/calamares/devuan/modules/mount.conf
new file mode 100644
index 000000000..bb28eed66
--- /dev/null
+++ b/calamares/devuan/modules/mount.conf
@@ -0,0 +1,36 @@
+# Mount filesystems in the target (generally, before treating the
+# target as a usable chroot / "live" system). Filesystems are
+# automatically mounted from the partitioning module. Filesystems
+# listed here are **extra**. The filesystems listed in *extraMounts*
+# are mounted in all target systems. The filesystems listed in
+# *extraMountsEfi* are mounted in the target system **only** if
+# the host machine uses UEFI.
+---
+# Extra filesystems to mount. The key's value is a list of entries; each
+# entry has four keys:
+#   - device    The device node to mount
+#   - fs        The filesystem type to use
+#   - mountPoint Where to mount the filesystem
+#   - options (optional) Extra options to pass to mount(8)
+#
+extraMounts:
+    - device: proc
+      fs: proc
+      mountPoint: /proc
+    - device: sys
+      fs: sysfs
+      mountPoint: /sys
+    - device: /dev
+      mountPoint: /dev
+      options: bind
+    - device: tmpfs
+      fs: tmpfs
+      mountPoint: /run
+    - device: /run/udev
+      mountPoint: /run/udev
+      options: bind
+
+extraMountsEfi:
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars
diff --git a/calamares/devuan/modules/netinstall-packages.conf b/calamares/devuan/modules/netinstall-packages.conf
new file mode 100644
index 000000000..208eb4816
--- /dev/null
+++ b/calamares/devuan/modules/netinstall-packages.conf
@@ -0,0 +1,56 @@
+---
+# This is the URL that is retrieved to get the netinstall groups-and-packages
+# data (which should be in the format described in netinstall.yaml), e.g.:
+#   groupsUrl: http://example.org/netinstall.php
+# or it can be a locally installed file:
+#   groupsUrl: file:///usr/share/calamares/netinstall.yaml
+#
+# Note that the contents of the groups file is the **important**
+# part of the configuration of this module. It specifies what
+# the user may select and what commands are to be run.
+#
+# The format of the groups file is documented in `README.md`.
+#
+# As a special case, setting *groupsUrl* to the literal string
+# `local` means that the data is obtained from **this** config
+# file, under the key *groups*.
+#
+groupsUrl: file:///etc/calamares/modules/netinstall-packages.yaml
+
+# If the installation can proceed without netinstall (e.g. the Live CD
+# can create a working installed system, but netinstall is preferred
+# to bring it up-to-date or extend functionality) leave this set to
+# false (the default). If set to true, the netinstall data is required.
+#
+# This only has an effect if the netinstall data cannot be retrieved,
+# or is corrupt: having "required" set, means the install cannot proceed.
+required: false
+
+# To support multiple instances of this module,
+# some strings are configurable and translatable here.
+# - *sidebar* This is the name of the module in the progress-tree / sidebar
+#   in Calamares.
+# - *title* This is displayed above the list of packages.
+# If no *sidebar* values are provided, defaults to "Package selection"
+# and existing translations. If no *title* values are provided, no string
+# is displayed.
+#
+# The following strings are already known to Calamares and can be
+# listed here in *untranslated* form (e.g. as value of *sidebar*)
+# without bothering with the translations: they are picked up from
+# the regular translation framework:
+#   - "Package selection"
+#   - "Office software"
+#   - "Office package"
+#   - "Browser software"
+#   - "Browser package"
+#   - "Web browser"
+label:
+    sidebar: "Packages"
+    sidebar[nl]: "Package selection"
+    sidebar[pt]: "Seleção de pacotes"
+    sidebar[ja]: "パッケージの選択"
+    title: "Packages"
+    title[nl]: "Package selection"
+    title[pt]: "Seleção de pacotes"
+    title[ja]: "パッケージの選択"
diff --git a/calamares/devuan/modules/netinstall-packages.yaml b/calamares/devuan/modules/netinstall-packages.yaml
new file mode 100644
index 000000000..8c7ecd09f
--- /dev/null
+++ b/calamares/devuan/modules/netinstall-packages.yaml
@@ -0,0 +1,26 @@
+- name: "  SysVinit Init System"
+  description: "  The original sysv-init, the standard and recommended choice."
+  critical: false
+  hidden: false
+  selected: true
+  expanded: false
+  packages: 
+  - sysvinit-core
+
+- name: "  Runit Init System"
+  description: "  An alternative implementation which provides /sbin/init                 (PID 1)."
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages: 
+  - runit-init
+
+- name: "  Openrc Init System"
+  description: "  A dependency-based service and runlevel management system."
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages: 
+   - openrc
diff --git a/calamares/devuan/modules/packages.conf b/calamares/devuan/modules/packages.conf
new file mode 100644
index 000000000..11877b26d
--- /dev/null
+++ b/calamares/devuan/modules/packages.conf
@@ -0,0 +1,22 @@
+backend: apt
+
+operations:
+  - remove:
+# We need to keep this as refracta uses these to build he live CD's
+      - 'live-boot'
+      - 'live-boot-doc'
+      - 'live-config'
+      - 'live-config-doc'
+      - 'live-config-systemd'
+      - 'live-config-systemd'
+      - 'live-tools'
+#      - 'live-task-localisation'
+#      - 'live-task-recommended'
+#This one we don't need the  users can decide thier own installer
+      - 'calamares-settings-debian'
+      - 'calamares'
+# This section add any other software you want to remove. 
+#      - 'gparted'
+#      - 'bleachbit'
+#      - 'termit'
+
diff --git a/calamares/devuan/modules/partition.conf b/calamares/devuan/modules/partition.conf
new file mode 100644
index 000000000..6f2358a07
--- /dev/null
+++ b/calamares/devuan/modules/partition.conf
@@ -0,0 +1,12 @@
+efiSystemPartition:     "/boot/efi"
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    - file      # To swap file instead of partition
+alwaysShowPartitionLabels: true
+initialPartitioningChoice: erase
+initialSwapChoice: none
+defaultFileSystemType:  "ext4"
+availableFileSystemTypes:  ["ext4","f2fs","xfs"]
+
diff --git a/calamares/devuan/modules/shellprocess.conf b/calamares/devuan/modules/shellprocess.conf
new file mode 100644
index 000000000..9b50e79e1
--- /dev/null
+++ b/calamares/devuan/modules/shellprocess.conf
@@ -0,0 +1,7 @@
+---
+dontChroot: false
+timeout: 999
+script:
+    - "-rm @@ROOT@@/usr/share/applications/Install-peppermint.desktop"
+    - "groupadd sgx"
+	
diff --git a/calamares/devuan/modules/unpackfs.conf b/calamares/devuan/modules/unpackfs.conf
new file mode 100644
index 000000000..833a68bbd
--- /dev/null
+++ b/calamares/devuan/modules/unpackfs.conf
@@ -0,0 +1,5 @@
+---
+unpack:
+    -   source: "/run/live/medium/live/filesystem.squashfs"
+        sourcefs: "squashfs"
+        destination: ""
diff --git a/calamares/devuan/modules/users.conf b/calamares/devuan/modules/users.conf
new file mode 100644
index 000000000..998e7bcc7
--- /dev/null
+++ b/calamares/devuan/modules/users.conf
@@ -0,0 +1,18 @@
+---
+userGroup:       users
+defaultGroups:
+    - cdrom
+    - floppy
+    - sudo
+    - audio
+    - dip
+    - video
+    - plugdev
+    - netdev
+    - lpadmin
+    - scanner
+    - bluetooth
+    - sambashare
+autologinGroup:  autologin
+sudoersGroup:    sudo
+setRootPassword: false
diff --git a/calamares/devuan/modules/welcome.conf b/calamares/devuan/modules/welcome.conf
new file mode 100644
index 000000000..a46e412ec
--- /dev/null
+++ b/calamares/devuan/modules/welcome.conf
@@ -0,0 +1,19 @@
+---
+showSupportUrl:         false
+showKnownIssuesUrl:     false
+showReleaseNotesUrl:    false
+
+requirements:
+    requiredStorage:    10
+    requiredRam:        1.0
+    check:
+        - storage
+        - ram
+        - power
+        - root
+        - internet
+    required:
+        - storage
+        - ram
+        - root
+
diff --git a/calamares/devuan/settings.conf b/calamares/devuan/settings.conf
new file mode 100644
index 000000000..9f0395230
--- /dev/null
+++ b/calamares/devuan/settings.conf
@@ -0,0 +1,108 @@
+# Configuration file for Calamares
+# Syntax is YAML 1.2
+---
+
+# "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
+
+
+sequence:
+
+# Phase 1 - prepare.
+# View modules are shown as UI pages, jobs from job modules
+# are executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - welcome
+  - locale
+  - keyboard
+  - partition
+  - netinstall@packages
+  - users
+  - summary
+
+# Phase 2 - install.
+# View modules are not shown. Only the view modules shown
+# in the previous phase are allowed, their names should be
+# added here as placeholders to specify the order in which
+# view module jobs should be enqueued. Job modules are
+# also allowed.
+- exec:
+  - partition
+  - mount
+  - unpackfs
+  - sources-media
+  - machineid
+  - fstab
+  - locale
+  - keyboard
+  - localecfg
+  - users
+  - displaymanager
+  - networkcfg
+  - hwclock
+  - services-systemd
+  - bootloader-config
+  - grubcfg
+  - bootloader
+  - packages
+  - luksbootkeyfile
+  - luksopenswaphookcfg
+  - plymouthcfg
+  - initramfscfg
+  - initramfs
+  - sources-media-unmount
+  - sources-final
+  - shellprocess
+  - umount
+
+# Phase 3 - postinstall.
+# View modules are shown as UI pages, jobs from job modules are
+# executed immediately in the background.
+# Jobs should be executed sparingly (if at all) in this phase.
+- show:
+  - finished
+
+# A branding component is a directory, either in
+# SHARE/calamares/branding or in /etc/calamares/branding
+# (the latter takes precedence). The directory must contain a
+# YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+# Only the name of the branding component (directory) should be
+# specified here, Calamares then takes care of finding it and
+# loading the contents.
+branding: peppermint
+
+# If this is set to true, Calamares will show an "Are you sure?" prompt right
+# before each execution phase, i.e. at points of no return. If this is set to
+# false, no prompt is shown. Default is false.
+#
+# YAML: boolean.
+prompt-install: false
+
+# If this is set to true, Calamares will execute all target environment
+# commands in the current environment, without chroot. This setting should
+# only be used when setting up Calamares as a post-install configuration tool,
+# as opposed to a full operating system installer.
+#
+# Some official Calamares modules are not expected to function with this
+# setting. (e.g. partitioning seems like a bad idea, since that is expected to
+# have been done already)
+#
+# Default is false (for a normal installer).
+#
+# YAML: boolean.
+dont-chroot: false
+
diff --git a/debian-32/build.sh b/debian-32/build.sh
index 881e3f4ab..f70d0d211 100755
--- a/debian-32/build.sh
+++ b/debian-32/build.sh
@@ -275,7 +275,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/debian/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes
diff --git a/debian-64/build.sh b/debian-64/build.sh
index a63d6ae2e..cfd0ee03d 100755
--- a/debian-64/build.sh
+++ b/debian-64/build.sh
@@ -272,7 +272,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/debian/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes
diff --git a/debian-arm64/build.sh b/debian-arm64/build.sh
index 30227d69d..32e2a6391 100755
--- a/debian-arm64/build.sh
+++ b/debian-arm64/build.sh
@@ -276,7 +276,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/debian/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes
diff --git a/devuan-32/build.sh b/devuan-32/build.sh
index c6fad1faf..1bc3ceac7 100755
--- a/devuan-32/build.sh
+++ b/devuan-32/build.sh
@@ -277,7 +277,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/devuan/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes
diff --git a/devuan-64/build.sh b/devuan-64/build.sh
index f13194cd2..36b968757 100755
--- a/devuan-64/build.sh
+++ b/devuan-64/build.sh
@@ -274,7 +274,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/devuan/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes
diff --git a/devuan-arm64/build.sh b/devuan-arm64/build.sh
index 960296091..4c014d90b 100755
--- a/devuan-arm64/build.sh
+++ b/devuan-arm64/build.sh
@@ -276,7 +276,7 @@ cp $fusato/pepconf/* $fusato/fusato/config/includes.chroot/opt/pepconf
 
 cp -r $fusato/bootloaders/* $fusato/fusato/config/includes.binary
 cp -r $fusato/repos/* $fusato/fusato/config/archives
-cp -r $fusato/calamares/calamares/* $fusato/fusato/config/includes.chroot/etc/calamares
+cp -r $fusato/calamares/calamares/devuan/* $fusato/fusato/config/includes.chroot/etc/calamares
 cp -r $fusato/configs/* $fusato/fusato/config/includes.chroot/etc/
 #cp -r $fusato/packages/* $fusato/fusato/config/packages.chroot
 cp -r $fusato/grub/themes/* $fusato/fusato/config/includes.chroot/boot/grub/themes