diff --git a/etc/calamares/modules/packages.conf b/etc/calamares/modules/packages.conf
index 861e32a..dde0e73 100644
--- a/etc/calamares/modules/packages.conf
+++ b/etc/calamares/modules/packages.conf
@@ -5,7 +5,7 @@
 backend: pacman
 
 skip_if_no_internet: false
-update_db: true
+update_db: false
 update_system: false
 
 num_retries: 0
@@ -17,6 +17,7 @@ operations:
   - try_remove:
     - calamares
     - parchlinux-cala-config
+    - calamares-parch
     - kconfig
     - kcoreaddons
     - kiconthemes
diff --git a/etc/calamares/modules/users.conf b/etc/calamares/modules/users.conf
deleted file mode 100644
index 726df55..0000000
--- a/etc/calamares/modules/users.conf
+++ /dev/null
@@ -1,181 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Configuration for the one-user-system user module.
-#
-# Besides these settings, the users module also places the following
-# keys into the Global Storage area, based on user input in the view step.
-#
-# - hostname
-# - username
-# - password (obscured)
-# - autologinUser (if enabled, set to username)
-#
-# These Global Storage keys are set when the configuration for this module
-# is read and when they are modified in the UI.
----
-# Used as default groups for the created user.
-# Adjust to your Distribution defaults.
-#
-# Each entry in the *defaultGroups* list is either:
-#   - a string, naming a group; this is a **non**-system group
-#     which does not need to exist in the target system; if it
-#     does not exist, it will be created.
-#   - an entry with subkeys *name*, *must_exist* and *system*;
-#     if the group *must_exist* and does not, an error is thrown
-#     and the installation fails.
-#
-#     The group is created if it does not exist, and it is
-#     created as a system group (GID < 1000) or user group
-#     (GID >= 1000) depending on the value of *system*.
-defaultGroups:
-    - name: users
-      must_exist: true
-      system: true
-    - lp
-    - video
-    - network
-    - storage
-    - name: wheel
-      must_exist: false
-      system: true
-    - audio
-    - name: rfkill
-      must_exist: false
-      system: true
-    # Adding user to 'rfkill' allows unpriveleged user to 
-    # turn bluetooth on/off with bluetooth frontends.
-    - power
-    # On some systems, suspend (sleep) does not work well 
-    # if the unpriveleged user initiating suspend is not in 'power' group.
-
-# Some Distributions require a 'autologin' group for the user.
-# Autologin causes a user to become automatically logged in to
-# the desktop environment on boot.
-# Disable when your Distribution does not require such a group.
-autologinGroup:  autologin
-# You can control the initial state for the 'autologin checkbox' here.
-# Possible values are:
-#  - true to check or
-#  - false to uncheck
-# These set the **initial** state of the checkbox.
-doAutologin:     false
-
-# When *sudoersGroup* is set to a non-empty string, Calamares creates a
-# sudoers file for the user. This file is located at:
-#     `/etc/sudoers.d/10-installer`
-# Remember to add the (value of) *sudoersGroup* to *defaultGroups*.
-#
-# If your Distribution already sets up a group of sudoers in its packaging,
-# remove this setting (delete or comment out the line below). Otherwise,
-# the setting will be duplicated in the `/etc/sudoers.d/10-installer` file,
-# potentially confusing users.
-sudoersGroup:    wheel
-
-# Setting this to false, causes the root account to be disabled.
-# When disabled, hides the "Use the same password for administrator"
-# checkbox. Also hides the "Choose a password" and associated text-inputs.
-setRootPassword: true
-
-# You can control the initial state for the 'reuse password for root'
-# checkbox here. Possible values are:
-#  - true to check or
-#  - false to uncheck
-#
-# When checked, the user password is used for the root account too.
-#
-# NOTE: *doReusePassword* requires *setRootPassword* to be enabled.
-doReusePassword: false
-
-# These are optional password-requirements that a distro can enforce
-# on the user. The values given in this sample file set only very weak
-# validation settings.
-#
-# - nonempty rejects empty passwords
-# - there are no length validations
-# - libpwquality (if it is enabled at all) has no length of class
-#   restrictions, although it will still reject palindromes and
-#   dictionary words with these settings.
-#
-# Checks may be listed multiple times; each is checked separately,
-# and no effort is done to ensure that the checks are consistent
-# (e.g. specifying a maximum length less than the minimum length
-# will annoy users).
-#
-# The libpwquality check relies on the (optional) libpwquality library.
-# Its value is a list of configuration statements that could also
-# be found in pwquality.conf, and these are handed off to the
-# libpwquality parser for evaluation. The check is ignored if
-# libpwquality is not available at build time (generates a warning in
-# the log). The Calamares password check rejects passwords with a
-# score of < 40 with the given libpwquality settings.
-#
-# (additional checks may be implemented in CheckPWQuality.cpp and
-# wired into UsersPage.cpp)
-#
-#  - To disable specific password validations:
-#    comment out the relevant 'passwordRequirements' keys below.
-#  - To disable all password validations:
-#    set both 'allowWeakPasswords' and 'allowWeakPasswordsDefault' to true.
-#    (That will show the box *Allow weak passwords* in the user-
-#    interface, and check it by default).
-
-passwordRequirements:
-    nonempty: true
-    minLength: 1  # Password at least this many characters
-    maxLength: -1  # Password at most this many characters
-    #libpwquality:
-     #   - minlen=0
-     #   - minclass=0
-    allowWeakPasswords: true
-    allowWeakPasswordsDefault: true
-
-# You can control the visibility of the 'strong passwords' checkbox here.
-# Possible values are:
-#  - true to show or
-#  - false to hide  (default)
-# the checkbox. This checkbox allows the user to choose to disable
-# password-strength-checks. By default the box is **hidden**, so
-# that you have to pick a password that satisfies the checks.
-allowWeakPasswords: false
-# You can control the initial state for the 'strong passwords' checkbox here.
-# Possible values are:
-#  - true to uncheck or
-#  - false to check (default)
-# the checkbox by default. Since the box is labeled to enforce strong
-# passwords, in order to **allow** weak ones by default, the box needs
-# to be unchecked.
-allowWeakPasswordsDefault: false
-
-# Shell to be used for the regular user of the target system.
-# There are three possible kinds of settings:
-#  - unset (i.e. commented out, the default), act as if set to /bin/bash
-#  - empty (explicit), don't pass shell information to useradd at all
-#    and rely on a correct configuration file in /etc/default/useradd
-#  - set, non-empty, use that path as shell. No validation is done
-#    that the shell actually exists or is executable.
-userShell: /bin/bash
-
-# Hostname setting
-#
-# The user can enter a hostname; this is configured into the system
-# in some way; pick one of:
-#   - *None*, to not set the hostname at all
-#   - *EtcFile*, to write to `/etc/hostname` directly
-#   - *Hostnamed*, to use systemd hostnamed(1) over DBus
-# The default is *EtcFile*.
-setHostname: EtcFile
-
-# Should /etc/hosts be written with a hostname for this machine
-# (also adds localhost and some ipv6 standard entries).
-# Defaults to *true*.
-writeHostsFile: true
-
-presets:
-    fullName:
-        # value: "OEM User"
-        editable: true
-    loginName:
-        # value: "oem"
-        editable: true
-
diff --git a/etc/calamares/modules/usersq.conf b/etc/calamares/modules/usersq.conf
index c394ae5..f766671 100644
--- a/etc/calamares/modules/usersq.conf
+++ b/etc/calamares/modules/usersq.conf
@@ -26,7 +26,7 @@ libpwquality:
     - minlen: 8
     - minclass: 4
 
-allowWeakPasswords: false
+allowWeakPasswords: true
 allowWeakPasswordsDefault: false
 
 # Explicitly set the shell instead of deferring to Calamares. We have a platform
diff --git a/etc/calamares/modules/welcome.conf b/etc/calamares/modules/welcome.conf
deleted file mode 100644
index 9664882..0000000
--- a/etc/calamares/modules/welcome.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Configuration for the welcome module. The welcome page
-# displays some information from the branding file.
-# Which parts it displays can be configured through
-# the show* variables.
-#
-# In addition to displaying the welcome page, this module
-# can check requirements for installation.
----
-# Display settings for various buttons on the welcome page.
-# The URLs themselves come from `branding.desc`. Each button
-# is show if the corresponding *show<buttonname>* setting
-# here is "true". If the setting is "false", the button is hidden.
-# Empty or not-set is interpreted as "false".
-#
-# TODO:3.3 Remove the URL fallback here; URLs only in `branding.desc`
-#
-# The setting can also be a full URL which will then be used
-# instead of the one from the branding file.
-#showSupportUrl:         true
-#showKnownIssuesUrl:     true
-#showReleaseNotesUrl:    false
-# TODO:3.3 Move to branding, keep only a bool here
-#showDonateUrl:          https://kde.org/community/donations/
-
-# Requirements checking. These are general, generic, things
-# that are checked. They may not match with the actual requirements
-# imposed by other modules in the system.
-requirements:
-    # Amount of available disk, in GiB. Floating-point is allowed here.
-    # Note that this does not account for *usable* disk, so it is possible
-    # to satisfy this requirement, yet have no space to install to.
-    requiredStorage:    5.5
-
-    # Amount of available RAM, in GiB. Floating-point is allowed here.
-    requiredRam:        1.0
-
-    # To check for internet connectivity, Calamares does a HTTP GET
-    # on this URL; on success (e.g. HTTP code 200) internet is OK.
-    # Use a privacy-respecting URL here, preferably in your distro's domain.
-    #
-    # The URL is only used if "internet" is in the *check* list below.
-    internetCheckUrl:   http://example.com
-
-    # List conditions to check. Each listed condition will be
-    # probed in some way, and yields true or false according to
-    # the host system satisfying the condition.
-    #
-    # This sample file lists all the conditions that are known.
-    check:
-        - storage
-        - ram
-        - power
-        #- internet
-        - root
-        - screen
-    # List conditions that **must** be satisfied (from the list
-    # of conditions, above) for installation to proceed.
-    # If any of these conditions are not met, the user cannot
-    # continue past the welcome page.
-    required:
-        # - storage
-        - ram
-        # - root
-
-# GeoIP checking
-#
-# This can be used to pre-select a language based on the country
-# the user is currently in. It *assumes* that there's internet
-# connectivity, though. Configuration is like in the locale module,
-# but remember to use a URL that returns full data **and** to
-# use a selector that will pick the country, not the timezone.
-#
-# 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/locale/locale.conf`,
-# which is where you will find complete documentation.
-#
-# For testing, the *style* may be set to `fixed`, any URL that
-# returns data (e.g. `http://example.com`) and then *selector*
-# sets the data that is actually returned (e.g. "DE" to simulate
-# the machine being in Germany).
-#
-# NOTE: the *selector* must pick the country code from the GeoIP
-#       data. Timezone, city, or other data will not be recognized.
-#
-geoip:
-    style:    "none"
-    url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
-    selector: "CountryCode"  # blank uses default, which is wrong
-
-# User interface
-#
-# The "select language" icon is an international standard, but it
-# might not theme very well with your desktop environment.
-# Fill in an icon name (following FreeDesktop standards) to
-# use that named icon instead of the usual one.
-#
-# Leave blank or unset to use the international standard.
-#
-# Known icons in this space are "set-language" and "config-language".
-#
-# languageIcon: set-language
diff --git a/etc/calamares/modules/welcomeq.conf b/etc/calamares/modules/welcomeq.conf
index 6126042..f5ba69e 100644
--- a/etc/calamares/modules/welcomeq.conf
+++ b/etc/calamares/modules/welcomeq.conf
@@ -33,7 +33,6 @@ requirements:
         - root
         - storage
         - ram
-        - internet
 
 geoip:
     style:    "xml"
diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf
index b3f2082..cb04d77 100644
--- a/etc/calamares/settings.conf
+++ b/etc/calamares/settings.conf
@@ -21,15 +21,15 @@ sequence:
   - keyboardq
   - partition
   - usersq
-  - summaryq
+  - summary
 - exec:
   - partition
   - mount
   - unpackfs
   - machineid
   - fstab
-  - locale
-  - keyboard
+  - localeq
+  - keybordq
   - localecfg
   - luksbootkeyfile
   - luksopenswaphookcfg
@@ -37,7 +37,7 @@ sequence:
   - initcpiocfg
   - initcpio
   - removeuser
-  - users
+  - usersq
   - displaymanager
   - networkcfg
   - hwclock
@@ -48,7 +48,7 @@ sequence:
   - shellprocess@remove-livecd
   - umount
 - show:
-  - finished
+  - finishedq
 
 
 branding: parchlinux