diff --git a/calamares/etc/calamares/modules/dummypython.conf b/calamares/etc/calamares/modules/dummypython.conf
deleted file mode 100644
index fc98508..0000000
--- a/calamares/etc/calamares/modules/dummypython.conf
+++ /dev/null
@@ -1,18 +0,0 @@
----
-syntax: "YAML map of anything"
-example:
-    whats_this: "module-specific configuration"
-    from_where: "dummypython.conf"
-a_list:
-    - "item1"
-    - "item2"
-    - "item3"
-    - "item4"
-a_list_of_maps:
-    - name: "an Item"
-      contents:
-        - "an element"
-        - "another element"
-    - name: "another item"
-      contents:
-        - "not much"
\ No newline at end of file
diff --git a/calamares/etc/calamares/modules/mount.conf b/calamares/etc/calamares/modules/mount.conf
index 5da4367..68e214e 100644
--- a/calamares/etc/calamares/modules/mount.conf
+++ b/calamares/etc/calamares/modules/mount.conf
@@ -14,7 +14,6 @@ extraMounts:
       mountPoint: /run
 
 extraMountsEfi:
-    - device: /sys/firmware/efi
-      mountPoint: /sys/firmware/efi
-      options: bind
-
+    - device: efivarfs
+      fs: efivarfs
+      mountPoint: /sys/firmware/efi/efivars
diff --git a/calamares/etc/calamares/modules/prepare.conf b/calamares/etc/calamares/modules/prepare.conf
deleted file mode 100644
index b1d755c..0000000
--- a/calamares/etc/calamares/modules/prepare.conf
+++ /dev/null
@@ -1,11 +0,0 @@
----
-requiredStorage:    5.0
-requiredRam:        0.5
-check:
-    - storage
-    - ram
-    - power
-#    - internet
-required:
-#    - storage
-    - ram
diff --git a/calamares/etc/calamares/modules/removeuser.conf b/calamares/etc/calamares/modules/removeuser.conf
new file mode 100644
index 0000000..97ffbec
--- /dev/null
+++ b/calamares/etc/calamares/modules/removeuser.conf
@@ -0,0 +1,2 @@
+---
+username: liveuser
diff --git a/calamares/etc/calamares/modules/users.conf b/calamares/etc/calamares/modules/users.conf
index 2c00e4f..2c60a6d 100644
--- a/calamares/etc/calamares/modules/users.conf
+++ b/calamares/etc/calamares/modules/users.conf
@@ -1,5 +1,5 @@
 ---
-userGroup:      users
+userGroup:       users
 defaultGroups:
     - lp
     - video
@@ -9,5 +9,6 @@ defaultGroups:
     - packager
     - nopermfs
     - lpadmin
-autologinGroup: autologin
-sudoersGroup:   wheel
+autologinGroup:  autologin
+sudoersGroup:    sysadmin
+setRootPassword: true
diff --git a/calamares/etc/calamares/modules/welcome.conf b/calamares/etc/calamares/modules/welcome.conf
new file mode 100644
index 0000000..d1f9f64
--- /dev/null
+++ b/calamares/etc/calamares/modules/welcome.conf
@@ -0,0 +1,18 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    5.0
+    requiredRam:        0.5
+    check:
+        - storage
+        - ram
+        - power
+#        - internet
+        - root
+    required:
+#        - storage
+        - ram
+        - root