diff --git a/calamares/modules/netinstall-filemanagers.conf b/calamares/modules/netinstall-filemanagers.conf
index 1de27d1..c9b27a2 100644
--- a/calamares/modules/netinstall-filemanagers.conf
+++ b/calamares/modules/netinstall-filemanagers.conf
@@ -76,8 +76,8 @@
 
 # Net-based package list, with fallback to local file
 groupsUrl:
-  - http://example.com/calamares/netinstall.yaml
-  - file:///etc/calamares/modules/netinstall.yaml
+  - https://raw.githubusercontent.com/Snigdha-OS/snigdhaos-calamares-config/master/calamares/modules/netinstall-filemanagers.yaml
+  - file:///etc/calamares/modules/netinstall-filemanagers.yaml
 
 
 
diff --git a/calamares/modules/netinstall-gaming.conf b/calamares/modules/netinstall-gaming.conf
deleted file mode 100644
index 1de27d1..0000000
--- a/calamares/modules/netinstall-gaming.conf
+++ /dev/null
@@ -1,220 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-### Netinstall module
-#
-# The netinstall module allows distribution maintainers to ship minimal ISOs
-# with only a basic set of preinstalled packages. At installation time, the
-# user is presented with the choice to install groups of packages from a
-# predefined list.
-#
-# Calamares will then use the *packages* module to install the packages.
-# Without a *packages* module in the exec phase somewhere **after**
-# this netinstall, nothing will actually get installed. The packages
-# module must be correctly configured **and** the package manager must
-# be runnable from within the installed system at the point where it
-# is invoked, otherwise you'll get nothing.
-#
-# There are two basic deployment schemes:
-#  - static package lists; the packages do not change for this release.
-#    In this case, the package list file may be on the ISO-image itself
-#    as a separate file, **or** included in this configuration file.
-#    Either will do; separate file is easier to update independently
-#    of the Calamares configuration, while merged configurations use
-#    fewer files overall and are closer to self-documenting.
-#  - online package lists; the package list is fetched from a remote
-#    URL and handled otherwise like a static list. This can be useful
-#    if the package list needs updating during the lifetime of an ISO-
-#    image, e.g. packages are added or renamed.
-#
-# There is only one required key for this module, *groupsUrl*.
-#
-# This module supports multiple instances through the *label* key,
-# which allows you to distinguish them in the UI.
----
-# The *groupsUrl* determines where the data for the netinstall groups-and-
-# packages comes from. The value of the key may be:
-#
-# - a single string (this is treated as a list with just that string in it)
-# - a list of strings
-#
-# Each string is treated as a URL (see below for special cases. The
-# list is examined **in order** and each URL is tried in turn. The
-# first URL to load successfully -- even if it yields 0 packages --
-# ends the process. This allows using a network URL and a (fallback)
-# local URL for package lists, or for using multiple mirrors of
-# netinstall data.
-#
-# The URL must point to a YAML file that follows the format described
-# below at the key *groups* -- except for the special case URL "local".
-# Note that the contents of the groups file is the **important**
-# part of the configuration of this module. It specifies what
-# groups and packages the user may select (and so what commands are to
-# be run to install them).
-#
-# The format of the groups file is the same as the format of the
-# *groups* key described below, **except** that a stand-alone
-# groups file does not have to have the top-level *groups* key.
-# (It **may** have one, though, for instance when you copy
-# this configuration file to `netinstall.yaml` and key *groups*
-# must have a list-of-groups as value; if the file does not have
-# a top-level key *groups*, then the file must contain only a list of groups.
-#
-# Each item in the list *groupsUrl* may be:
-# - A remote URL like `http://example.org/netinstall.php`
-# - A local file URL like `file:///usr/share/calamares/netinstall.yaml`
-# - The special-case literal string `local`
-#
-# Non-special case URLs are loaded as YAML; if the load succeeds, then
-# they are interpreted like the *groups* key below. The special case
-# `local` loads the data directly from **this** file.
-#
-# groupsUrl: local
-
-# Alternate form:
-# groupsUrl: [ local ]
-
-# Net-based package list, with fallback to local file
-groupsUrl:
-  - http://example.com/calamares/netinstall.yaml
-  - file:///etc/calamares/modules/netinstall.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.
-# For local or file: type *groupsUrl* settings, this setting is not
-# really meaningful.
-required: false
-
-# To support multiple instances of this module,
-# some strings are configurable and translatable here.
-# Sub-keys under *label* are used for the user interface.
-#  - *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.
-#
-# Translations are handled through `[ll]` notation, much like in
-# `.desktop` files. The string associated with `key[ll]` is used for
-# *key* when when the language *ll* (language-code, like *nl* or *en_GB*
-# or *ja*) is used.
-#
-# 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"
-#  - "Kernel"
-#  - "Services"
-#  - "Login"
-#  - "Desktop"
-#  - "Applications"
-#  - "Communication"
-#  - "Development"
-#  - "Office"
-#  - "Multimedia"
-#  - "Internet"
-#  - "Theming"
-#  - "Gaming"
-#  - "Utilities"
-# Other strings should follow the translations format.
-label:
-    sidebar: "Package selection"
-    # sidebar[nl]: "Pakketkeuze"
-    # sidebar[en_GB]: "Package choice"
-    # sidebar[ja]: "知りません"  # "I don't know"
-    title: "Office Package"
-    # title[nl]: "Kantoorsoftware"
-
-# If, and only if, *groupsUrl* is set to the literal string `local`,
-# groups data is read from this file. The value of *groups* must be
-# a list. Each item in the list is a group (of packages, or subgroups,
-# or both). A standalone groups file contains just the list,
-# (without the top-level *groups* key, or just the top-level *groups*
-# key and with the list as its value, like in this file).
-#
-# Using `local` is recommended only for small static package lists.
-# Here it is used for documentation purposes.
-#
-#
-### Groups Format
-#
-# Each item in the list describes one group. The following keys are
-# required for each group:
-#
-#  - *name* of the group; short and human-readable. Shown in the first
-#    column of the UI.
-#  - *description* of the group; longer and human-readable. Shown in the
-#    second column of the UI. This is one of the things that visually
-#    distinguishes groups (with descriptions) from packages (without).
-#  - *packages*, a list of packages that belong to this group.
-#    The items of the *packages* list are actual package names
-#    as passed to the package manager (e.g. `qt5-creator-dev`).
-#    This list may be empty (e.g. if your group contains only
-#    subgroups). This key isn't **really** required, either --
-#    one of *subgroups* or *packages* is.
-#
-# The following keys are **optional** for a group:
-#
-#  - *hidden*: if true, do not show the group on the page. Defaults to false.
-#  - *selected*: if true, display the group as selected. Defaults to the
-#    parent group's value, if there is a parent group; top-level groups
-#    are set to true by default.
-#  - *critical*: if true, make the installation process fail if installing
-#    any of the packages in the group fails. Otherwise, just log a warning.
-#    Defaults to false. If not set in a subgroup (see below), inherits from
-#    the parent group.
-#  - *immutable*: if true, the state of the group (and all its subgroups)
-#    cannot be changed; no packages can be selected or deselected. No
-#    checkboxes are show for the group. Setting *immutable* to true
-#    really only makes sense in combination with *selected* set to true,
-#    so that the packages will be installed. (Setting a group to immutable
-#    can be seen as removing it from the user-interface.)
-#  - *noncheckable*: if true, the entire group cannot be selected or
-#    deselected by a single click. This does not affect any subgroups 
-#    or child packages 
-#  - *expanded*: if true, the group is shown in an expanded form (that is,
-#    not-collapsed) in the treeview on start. This only affects the user-
-#    interface. Only top-level groups are show expanded-initially.
-#  - *subgroups*: if present this follows the same structure as the top level
-#    groups, allowing sub-groups of packages to an arbitary depth.
-#  - *pre-install*: an optional command to run within the new system before
-#    the group's packages are installed. It will run before **each** package in
-#    the group is installed.
-#  - *post-install*: an optional command to run within the new system after
-#    the group's packages are installed. It will run after **each** package in
-#    the group is installed.
-#
-# If you set both *hidden* and *selected* for a top-level group, you are
-# creating a "default" group of packages which will always be installed
-# in the user's system. Hidden selected subgroups are installed if their
-# parent is selected. Setting *hidden* to true without *selected*, or with
-# *selected* set to false, is kind of pointless and will generate a warning.
-#
-# The *pre-install* and *post-install* commands are **not** passed to
-# a shell; see the **packages** module configuration (i.e. `packages.conf`)
-# for details. To use a full shell pipeline, call the shell explicitly.
-#
-# Non-critical groups are installed by calling the package manager
-# individually, once for each package (and ignoring errors), while
-# critical packages are installed in one single call to the package
-# manager (and errors cause the installation to terminate).
-#
-#
-#
-# The *groups* key below contains some common patterns for packages
-# and sub-groups, with documentation.
-
diff --git a/calamares/modules/netinstall-gaming.yaml b/calamares/modules/netinstall-gaming.yaml
deleted file mode 100644
index ffc978d..0000000
--- a/calamares/modules/netinstall-gaming.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- name: "Games"
-  description: "Gaming software"
-  critical: false
-  hidden: false
-  selected: false
-  expanded: true
-  packages:
-    - aisleriot
-    - armagetronad
-    - astromenace
-    - chromium-bsu
-    - extremetuxracer
-    - freeciv
-    - gnome-chess
-    - gnuchess
-    - hedgewars
-    - kbreakout
-    - knights
-    - mari0
-    - minecraft-launcher
-    - multimc-git
-    - neverball
-    - sauerbraten
-    - sauerbraten-data
-    - supertux
-    - supertuxkart
-    - warsow
-    - wesnoth
-    - xonotic
-    - xonotic-data
-- name: "Game utilities"
-  description: "Game utilities"
-  critical: false
-  hidden: false
-  selected: false
-  expanded: true
-  packages:
-    - arcolinux-meta-steam-amd
-    - arcolinux-meta-steam-intel
-    - arcolinux-meta-steam-nvidia
-    - gamehub-bin
-    - gamemode
-    - game-devices-udev
-    - goverlay-bin
-    - heroic-games-launcher-bin
-    - itch
-    - legendary
-    - lutris
-    - mangohud
-    - minigalaxy
-    - playonlinux
-    - proton-community-updater
-    - proton-ge-custom-bin
-    - protontricks
-    - protontricks-git
-    - protonup-qt-bin
-    - protonup-git
-    - rare
-    - replay-sorcery
-    - supergfxctl
-    - steam-buddy
-    - steam-tweaks
-    - steamtinkerlaunch
-    - vkbasalt
diff --git a/calamares/modules/netinstall-internet.yaml b/calamares/modules/netinstall-internet.yaml
index cc5a04f..a67a004 100644
--- a/calamares/modules/netinstall-internet.yaml
+++ b/calamares/modules/netinstall-internet.yaml
@@ -5,24 +5,11 @@
   selected: false
   expanded: true
   packages:
-    - brave-bin
-    - chrome-gnome-shell
-    - chromium
-    - chromium-widevine
-    - falkon
-    - firefox
-    - firefox-adblock-plus
-    - firefox-ublock-origin
-    - google-chrome
-    - icecat
-    - librewolf-bin
-    - netsurf
-    - opera
-    - qutebrowser
-    - torbrowser-launcher
-    - vivaldi
-    - vivaldi-ffmpeg-codecs
-    - vivaldi-widevine
+    - snigdhaos-brave-config
+    - snigdhaos-chrome-config
+    - snigdhaos-firefox-config
+    - snigdhaos-firefox-esr
+    - snigdhaos-waterfox-config
 - name: "Downloaders"
   description: "Downloaders"
   critical: false
diff --git a/calamares/modules/netinstall-kernel.conf b/calamares/modules/netinstall-kernel.conf
deleted file mode 100644
index 1de27d1..0000000
--- a/calamares/modules/netinstall-kernel.conf
+++ /dev/null
@@ -1,220 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-### Netinstall module
-#
-# The netinstall module allows distribution maintainers to ship minimal ISOs
-# with only a basic set of preinstalled packages. At installation time, the
-# user is presented with the choice to install groups of packages from a
-# predefined list.
-#
-# Calamares will then use the *packages* module to install the packages.
-# Without a *packages* module in the exec phase somewhere **after**
-# this netinstall, nothing will actually get installed. The packages
-# module must be correctly configured **and** the package manager must
-# be runnable from within the installed system at the point where it
-# is invoked, otherwise you'll get nothing.
-#
-# There are two basic deployment schemes:
-#  - static package lists; the packages do not change for this release.
-#    In this case, the package list file may be on the ISO-image itself
-#    as a separate file, **or** included in this configuration file.
-#    Either will do; separate file is easier to update independently
-#    of the Calamares configuration, while merged configurations use
-#    fewer files overall and are closer to self-documenting.
-#  - online package lists; the package list is fetched from a remote
-#    URL and handled otherwise like a static list. This can be useful
-#    if the package list needs updating during the lifetime of an ISO-
-#    image, e.g. packages are added or renamed.
-#
-# There is only one required key for this module, *groupsUrl*.
-#
-# This module supports multiple instances through the *label* key,
-# which allows you to distinguish them in the UI.
----
-# The *groupsUrl* determines where the data for the netinstall groups-and-
-# packages comes from. The value of the key may be:
-#
-# - a single string (this is treated as a list with just that string in it)
-# - a list of strings
-#
-# Each string is treated as a URL (see below for special cases. The
-# list is examined **in order** and each URL is tried in turn. The
-# first URL to load successfully -- even if it yields 0 packages --
-# ends the process. This allows using a network URL and a (fallback)
-# local URL for package lists, or for using multiple mirrors of
-# netinstall data.
-#
-# The URL must point to a YAML file that follows the format described
-# below at the key *groups* -- except for the special case URL "local".
-# Note that the contents of the groups file is the **important**
-# part of the configuration of this module. It specifies what
-# groups and packages the user may select (and so what commands are to
-# be run to install them).
-#
-# The format of the groups file is the same as the format of the
-# *groups* key described below, **except** that a stand-alone
-# groups file does not have to have the top-level *groups* key.
-# (It **may** have one, though, for instance when you copy
-# this configuration file to `netinstall.yaml` and key *groups*
-# must have a list-of-groups as value; if the file does not have
-# a top-level key *groups*, then the file must contain only a list of groups.
-#
-# Each item in the list *groupsUrl* may be:
-# - A remote URL like `http://example.org/netinstall.php`
-# - A local file URL like `file:///usr/share/calamares/netinstall.yaml`
-# - The special-case literal string `local`
-#
-# Non-special case URLs are loaded as YAML; if the load succeeds, then
-# they are interpreted like the *groups* key below. The special case
-# `local` loads the data directly from **this** file.
-#
-# groupsUrl: local
-
-# Alternate form:
-# groupsUrl: [ local ]
-
-# Net-based package list, with fallback to local file
-groupsUrl:
-  - http://example.com/calamares/netinstall.yaml
-  - file:///etc/calamares/modules/netinstall.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.
-# For local or file: type *groupsUrl* settings, this setting is not
-# really meaningful.
-required: false
-
-# To support multiple instances of this module,
-# some strings are configurable and translatable here.
-# Sub-keys under *label* are used for the user interface.
-#  - *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.
-#
-# Translations are handled through `[ll]` notation, much like in
-# `.desktop` files. The string associated with `key[ll]` is used for
-# *key* when when the language *ll* (language-code, like *nl* or *en_GB*
-# or *ja*) is used.
-#
-# 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"
-#  - "Kernel"
-#  - "Services"
-#  - "Login"
-#  - "Desktop"
-#  - "Applications"
-#  - "Communication"
-#  - "Development"
-#  - "Office"
-#  - "Multimedia"
-#  - "Internet"
-#  - "Theming"
-#  - "Gaming"
-#  - "Utilities"
-# Other strings should follow the translations format.
-label:
-    sidebar: "Package selection"
-    # sidebar[nl]: "Pakketkeuze"
-    # sidebar[en_GB]: "Package choice"
-    # sidebar[ja]: "知りません"  # "I don't know"
-    title: "Office Package"
-    # title[nl]: "Kantoorsoftware"
-
-# If, and only if, *groupsUrl* is set to the literal string `local`,
-# groups data is read from this file. The value of *groups* must be
-# a list. Each item in the list is a group (of packages, or subgroups,
-# or both). A standalone groups file contains just the list,
-# (without the top-level *groups* key, or just the top-level *groups*
-# key and with the list as its value, like in this file).
-#
-# Using `local` is recommended only for small static package lists.
-# Here it is used for documentation purposes.
-#
-#
-### Groups Format
-#
-# Each item in the list describes one group. The following keys are
-# required for each group:
-#
-#  - *name* of the group; short and human-readable. Shown in the first
-#    column of the UI.
-#  - *description* of the group; longer and human-readable. Shown in the
-#    second column of the UI. This is one of the things that visually
-#    distinguishes groups (with descriptions) from packages (without).
-#  - *packages*, a list of packages that belong to this group.
-#    The items of the *packages* list are actual package names
-#    as passed to the package manager (e.g. `qt5-creator-dev`).
-#    This list may be empty (e.g. if your group contains only
-#    subgroups). This key isn't **really** required, either --
-#    one of *subgroups* or *packages* is.
-#
-# The following keys are **optional** for a group:
-#
-#  - *hidden*: if true, do not show the group on the page. Defaults to false.
-#  - *selected*: if true, display the group as selected. Defaults to the
-#    parent group's value, if there is a parent group; top-level groups
-#    are set to true by default.
-#  - *critical*: if true, make the installation process fail if installing
-#    any of the packages in the group fails. Otherwise, just log a warning.
-#    Defaults to false. If not set in a subgroup (see below), inherits from
-#    the parent group.
-#  - *immutable*: if true, the state of the group (and all its subgroups)
-#    cannot be changed; no packages can be selected or deselected. No
-#    checkboxes are show for the group. Setting *immutable* to true
-#    really only makes sense in combination with *selected* set to true,
-#    so that the packages will be installed. (Setting a group to immutable
-#    can be seen as removing it from the user-interface.)
-#  - *noncheckable*: if true, the entire group cannot be selected or
-#    deselected by a single click. This does not affect any subgroups 
-#    or child packages 
-#  - *expanded*: if true, the group is shown in an expanded form (that is,
-#    not-collapsed) in the treeview on start. This only affects the user-
-#    interface. Only top-level groups are show expanded-initially.
-#  - *subgroups*: if present this follows the same structure as the top level
-#    groups, allowing sub-groups of packages to an arbitary depth.
-#  - *pre-install*: an optional command to run within the new system before
-#    the group's packages are installed. It will run before **each** package in
-#    the group is installed.
-#  - *post-install*: an optional command to run within the new system after
-#    the group's packages are installed. It will run after **each** package in
-#    the group is installed.
-#
-# If you set both *hidden* and *selected* for a top-level group, you are
-# creating a "default" group of packages which will always be installed
-# in the user's system. Hidden selected subgroups are installed if their
-# parent is selected. Setting *hidden* to true without *selected*, or with
-# *selected* set to false, is kind of pointless and will generate a warning.
-#
-# The *pre-install* and *post-install* commands are **not** passed to
-# a shell; see the **packages** module configuration (i.e. `packages.conf`)
-# for details. To use a full shell pipeline, call the shell explicitly.
-#
-# Non-critical groups are installed by calling the package manager
-# individually, once for each package (and ignoring errors), while
-# critical packages are installed in one single call to the package
-# manager (and errors cause the installation to terminate).
-#
-#
-#
-# The *groups* key below contains some common patterns for packages
-# and sub-groups, with documentation.
-
diff --git a/calamares/modules/netinstall-kernel.yaml b/calamares/modules/netinstall-kernel.yaml
deleted file mode 100644
index 339bb8e..0000000
--- a/calamares/modules/netinstall-kernel.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- name: "Linux kernel"
-  description: "Installs the latest linux kernel"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - linux
-    - linux-headers
-- name: "Linux-lts kernel"
-  description: "Installs the linux-lts kernel"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - linux-lts
-    - linux-lts-headers
-- name: "Linux-hardened kernel"
-  description: "Installs the linux-hardened kernel"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - linux-hardened
-    - linux-hardened-headers
-- name: "Linux-zen kernel"
-  description: "Installs the linux-zen kernel"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - linux-zen
-    - linux-zen-headers
-- name: "Intel-ucode"
-  description: "Installs intel-ucode"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - intel-ucode
-- name: "Amd-ucode"
-  description: "Installs amd-ucode"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - amd-ucode
diff --git a/calamares/modules/netinstall-login.conf b/calamares/modules/netinstall-login.conf
deleted file mode 100644
index 1de27d1..0000000
--- a/calamares/modules/netinstall-login.conf
+++ /dev/null
@@ -1,220 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-### Netinstall module
-#
-# The netinstall module allows distribution maintainers to ship minimal ISOs
-# with only a basic set of preinstalled packages. At installation time, the
-# user is presented with the choice to install groups of packages from a
-# predefined list.
-#
-# Calamares will then use the *packages* module to install the packages.
-# Without a *packages* module in the exec phase somewhere **after**
-# this netinstall, nothing will actually get installed. The packages
-# module must be correctly configured **and** the package manager must
-# be runnable from within the installed system at the point where it
-# is invoked, otherwise you'll get nothing.
-#
-# There are two basic deployment schemes:
-#  - static package lists; the packages do not change for this release.
-#    In this case, the package list file may be on the ISO-image itself
-#    as a separate file, **or** included in this configuration file.
-#    Either will do; separate file is easier to update independently
-#    of the Calamares configuration, while merged configurations use
-#    fewer files overall and are closer to self-documenting.
-#  - online package lists; the package list is fetched from a remote
-#    URL and handled otherwise like a static list. This can be useful
-#    if the package list needs updating during the lifetime of an ISO-
-#    image, e.g. packages are added or renamed.
-#
-# There is only one required key for this module, *groupsUrl*.
-#
-# This module supports multiple instances through the *label* key,
-# which allows you to distinguish them in the UI.
----
-# The *groupsUrl* determines where the data for the netinstall groups-and-
-# packages comes from. The value of the key may be:
-#
-# - a single string (this is treated as a list with just that string in it)
-# - a list of strings
-#
-# Each string is treated as a URL (see below for special cases. The
-# list is examined **in order** and each URL is tried in turn. The
-# first URL to load successfully -- even if it yields 0 packages --
-# ends the process. This allows using a network URL and a (fallback)
-# local URL for package lists, or for using multiple mirrors of
-# netinstall data.
-#
-# The URL must point to a YAML file that follows the format described
-# below at the key *groups* -- except for the special case URL "local".
-# Note that the contents of the groups file is the **important**
-# part of the configuration of this module. It specifies what
-# groups and packages the user may select (and so what commands are to
-# be run to install them).
-#
-# The format of the groups file is the same as the format of the
-# *groups* key described below, **except** that a stand-alone
-# groups file does not have to have the top-level *groups* key.
-# (It **may** have one, though, for instance when you copy
-# this configuration file to `netinstall.yaml` and key *groups*
-# must have a list-of-groups as value; if the file does not have
-# a top-level key *groups*, then the file must contain only a list of groups.
-#
-# Each item in the list *groupsUrl* may be:
-# - A remote URL like `http://example.org/netinstall.php`
-# - A local file URL like `file:///usr/share/calamares/netinstall.yaml`
-# - The special-case literal string `local`
-#
-# Non-special case URLs are loaded as YAML; if the load succeeds, then
-# they are interpreted like the *groups* key below. The special case
-# `local` loads the data directly from **this** file.
-#
-# groupsUrl: local
-
-# Alternate form:
-# groupsUrl: [ local ]
-
-# Net-based package list, with fallback to local file
-groupsUrl:
-  - http://example.com/calamares/netinstall.yaml
-  - file:///etc/calamares/modules/netinstall.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.
-# For local or file: type *groupsUrl* settings, this setting is not
-# really meaningful.
-required: false
-
-# To support multiple instances of this module,
-# some strings are configurable and translatable here.
-# Sub-keys under *label* are used for the user interface.
-#  - *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.
-#
-# Translations are handled through `[ll]` notation, much like in
-# `.desktop` files. The string associated with `key[ll]` is used for
-# *key* when when the language *ll* (language-code, like *nl* or *en_GB*
-# or *ja*) is used.
-#
-# 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"
-#  - "Kernel"
-#  - "Services"
-#  - "Login"
-#  - "Desktop"
-#  - "Applications"
-#  - "Communication"
-#  - "Development"
-#  - "Office"
-#  - "Multimedia"
-#  - "Internet"
-#  - "Theming"
-#  - "Gaming"
-#  - "Utilities"
-# Other strings should follow the translations format.
-label:
-    sidebar: "Package selection"
-    # sidebar[nl]: "Pakketkeuze"
-    # sidebar[en_GB]: "Package choice"
-    # sidebar[ja]: "知りません"  # "I don't know"
-    title: "Office Package"
-    # title[nl]: "Kantoorsoftware"
-
-# If, and only if, *groupsUrl* is set to the literal string `local`,
-# groups data is read from this file. The value of *groups* must be
-# a list. Each item in the list is a group (of packages, or subgroups,
-# or both). A standalone groups file contains just the list,
-# (without the top-level *groups* key, or just the top-level *groups*
-# key and with the list as its value, like in this file).
-#
-# Using `local` is recommended only for small static package lists.
-# Here it is used for documentation purposes.
-#
-#
-### Groups Format
-#
-# Each item in the list describes one group. The following keys are
-# required for each group:
-#
-#  - *name* of the group; short and human-readable. Shown in the first
-#    column of the UI.
-#  - *description* of the group; longer and human-readable. Shown in the
-#    second column of the UI. This is one of the things that visually
-#    distinguishes groups (with descriptions) from packages (without).
-#  - *packages*, a list of packages that belong to this group.
-#    The items of the *packages* list are actual package names
-#    as passed to the package manager (e.g. `qt5-creator-dev`).
-#    This list may be empty (e.g. if your group contains only
-#    subgroups). This key isn't **really** required, either --
-#    one of *subgroups* or *packages* is.
-#
-# The following keys are **optional** for a group:
-#
-#  - *hidden*: if true, do not show the group on the page. Defaults to false.
-#  - *selected*: if true, display the group as selected. Defaults to the
-#    parent group's value, if there is a parent group; top-level groups
-#    are set to true by default.
-#  - *critical*: if true, make the installation process fail if installing
-#    any of the packages in the group fails. Otherwise, just log a warning.
-#    Defaults to false. If not set in a subgroup (see below), inherits from
-#    the parent group.
-#  - *immutable*: if true, the state of the group (and all its subgroups)
-#    cannot be changed; no packages can be selected or deselected. No
-#    checkboxes are show for the group. Setting *immutable* to true
-#    really only makes sense in combination with *selected* set to true,
-#    so that the packages will be installed. (Setting a group to immutable
-#    can be seen as removing it from the user-interface.)
-#  - *noncheckable*: if true, the entire group cannot be selected or
-#    deselected by a single click. This does not affect any subgroups 
-#    or child packages 
-#  - *expanded*: if true, the group is shown in an expanded form (that is,
-#    not-collapsed) in the treeview on start. This only affects the user-
-#    interface. Only top-level groups are show expanded-initially.
-#  - *subgroups*: if present this follows the same structure as the top level
-#    groups, allowing sub-groups of packages to an arbitary depth.
-#  - *pre-install*: an optional command to run within the new system before
-#    the group's packages are installed. It will run before **each** package in
-#    the group is installed.
-#  - *post-install*: an optional command to run within the new system after
-#    the group's packages are installed. It will run after **each** package in
-#    the group is installed.
-#
-# If you set both *hidden* and *selected* for a top-level group, you are
-# creating a "default" group of packages which will always be installed
-# in the user's system. Hidden selected subgroups are installed if their
-# parent is selected. Setting *hidden* to true without *selected*, or with
-# *selected* set to false, is kind of pointless and will generate a warning.
-#
-# The *pre-install* and *post-install* commands are **not** passed to
-# a shell; see the **packages** module configuration (i.e. `packages.conf`)
-# for details. To use a full shell pipeline, call the shell explicitly.
-#
-# Non-critical groups are installed by calling the package manager
-# individually, once for each package (and ignoring errors), while
-# critical packages are installed in one single call to the package
-# manager (and errors cause the installation to terminate).
-#
-#
-#
-# The *groups* key below contains some common patterns for packages
-# and sub-groups, with documentation.
-
diff --git a/calamares/modules/netinstall-login.yaml b/calamares/modules/netinstall-login.yaml
deleted file mode 100644
index ed12c49..0000000
--- a/calamares/modules/netinstall-login.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-- name: "Login Manager: Sddm"
-  description: "Installs sddm"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - sddm
-    - arcolinux-sddm-futuristic-git
-    - arcolinux-sddm-materia-git
-    - arcolinux-sddm-simplicity-git
-    - arcolinux-sddm-slice-git
-    - arcolinux-sddm-sugar-candy-git
-    - arcolinux-sddm-urbanlifestyle-git
-- name: "Login Manager: Lightdm"
-  description: "Installs lightdm"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - lightdm
-    - lightdm-gtk-greeter
-    - lightdm-gtk-greeter-settings
-    - lightdm-webkit-theme-aether
-    - lightdm-webkit2-theme-reactive
-    - arcolinux-wallpapers-git
-    - lightdm-slick-greeter
-- name: "Login Manager: Gdm"
-  description: "Installs gdm"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - gdm
-    - arcolinux-wallpapers-git
-- name: "Login Manager: Lxdm"
-  description: "Installs lxdm"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - lxdm
-    - arcolinux-wallpapers-git
-- name: "Login Manager: Ly"
-  description: "Installs ly"
-  critical: false
-  hidden: false
-  selected: false
-  packages:
-    - ly
-    - arcolinux-wallpapers-git
diff --git a/calamares/modules/netinstall-nvidia.conf b/calamares/modules/netinstall-nvidia.conf
deleted file mode 100644
index 1de27d1..0000000
--- a/calamares/modules/netinstall-nvidia.conf
+++ /dev/null
@@ -1,220 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-### Netinstall module
-#
-# The netinstall module allows distribution maintainers to ship minimal ISOs
-# with only a basic set of preinstalled packages. At installation time, the
-# user is presented with the choice to install groups of packages from a
-# predefined list.
-#
-# Calamares will then use the *packages* module to install the packages.
-# Without a *packages* module in the exec phase somewhere **after**
-# this netinstall, nothing will actually get installed. The packages
-# module must be correctly configured **and** the package manager must
-# be runnable from within the installed system at the point where it
-# is invoked, otherwise you'll get nothing.
-#
-# There are two basic deployment schemes:
-#  - static package lists; the packages do not change for this release.
-#    In this case, the package list file may be on the ISO-image itself
-#    as a separate file, **or** included in this configuration file.
-#    Either will do; separate file is easier to update independently
-#    of the Calamares configuration, while merged configurations use
-#    fewer files overall and are closer to self-documenting.
-#  - online package lists; the package list is fetched from a remote
-#    URL and handled otherwise like a static list. This can be useful
-#    if the package list needs updating during the lifetime of an ISO-
-#    image, e.g. packages are added or renamed.
-#
-# There is only one required key for this module, *groupsUrl*.
-#
-# This module supports multiple instances through the *label* key,
-# which allows you to distinguish them in the UI.
----
-# The *groupsUrl* determines where the data for the netinstall groups-and-
-# packages comes from. The value of the key may be:
-#
-# - a single string (this is treated as a list with just that string in it)
-# - a list of strings
-#
-# Each string is treated as a URL (see below for special cases. The
-# list is examined **in order** and each URL is tried in turn. The
-# first URL to load successfully -- even if it yields 0 packages --
-# ends the process. This allows using a network URL and a (fallback)
-# local URL for package lists, or for using multiple mirrors of
-# netinstall data.
-#
-# The URL must point to a YAML file that follows the format described
-# below at the key *groups* -- except for the special case URL "local".
-# Note that the contents of the groups file is the **important**
-# part of the configuration of this module. It specifies what
-# groups and packages the user may select (and so what commands are to
-# be run to install them).
-#
-# The format of the groups file is the same as the format of the
-# *groups* key described below, **except** that a stand-alone
-# groups file does not have to have the top-level *groups* key.
-# (It **may** have one, though, for instance when you copy
-# this configuration file to `netinstall.yaml` and key *groups*
-# must have a list-of-groups as value; if the file does not have
-# a top-level key *groups*, then the file must contain only a list of groups.
-#
-# Each item in the list *groupsUrl* may be:
-# - A remote URL like `http://example.org/netinstall.php`
-# - A local file URL like `file:///usr/share/calamares/netinstall.yaml`
-# - The special-case literal string `local`
-#
-# Non-special case URLs are loaded as YAML; if the load succeeds, then
-# they are interpreted like the *groups* key below. The special case
-# `local` loads the data directly from **this** file.
-#
-# groupsUrl: local
-
-# Alternate form:
-# groupsUrl: [ local ]
-
-# Net-based package list, with fallback to local file
-groupsUrl:
-  - http://example.com/calamares/netinstall.yaml
-  - file:///etc/calamares/modules/netinstall.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.
-# For local or file: type *groupsUrl* settings, this setting is not
-# really meaningful.
-required: false
-
-# To support multiple instances of this module,
-# some strings are configurable and translatable here.
-# Sub-keys under *label* are used for the user interface.
-#  - *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.
-#
-# Translations are handled through `[ll]` notation, much like in
-# `.desktop` files. The string associated with `key[ll]` is used for
-# *key* when when the language *ll* (language-code, like *nl* or *en_GB*
-# or *ja*) is used.
-#
-# 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"
-#  - "Kernel"
-#  - "Services"
-#  - "Login"
-#  - "Desktop"
-#  - "Applications"
-#  - "Communication"
-#  - "Development"
-#  - "Office"
-#  - "Multimedia"
-#  - "Internet"
-#  - "Theming"
-#  - "Gaming"
-#  - "Utilities"
-# Other strings should follow the translations format.
-label:
-    sidebar: "Package selection"
-    # sidebar[nl]: "Pakketkeuze"
-    # sidebar[en_GB]: "Package choice"
-    # sidebar[ja]: "知りません"  # "I don't know"
-    title: "Office Package"
-    # title[nl]: "Kantoorsoftware"
-
-# If, and only if, *groupsUrl* is set to the literal string `local`,
-# groups data is read from this file. The value of *groups* must be
-# a list. Each item in the list is a group (of packages, or subgroups,
-# or both). A standalone groups file contains just the list,
-# (without the top-level *groups* key, or just the top-level *groups*
-# key and with the list as its value, like in this file).
-#
-# Using `local` is recommended only for small static package lists.
-# Here it is used for documentation purposes.
-#
-#
-### Groups Format
-#
-# Each item in the list describes one group. The following keys are
-# required for each group:
-#
-#  - *name* of the group; short and human-readable. Shown in the first
-#    column of the UI.
-#  - *description* of the group; longer and human-readable. Shown in the
-#    second column of the UI. This is one of the things that visually
-#    distinguishes groups (with descriptions) from packages (without).
-#  - *packages*, a list of packages that belong to this group.
-#    The items of the *packages* list are actual package names
-#    as passed to the package manager (e.g. `qt5-creator-dev`).
-#    This list may be empty (e.g. if your group contains only
-#    subgroups). This key isn't **really** required, either --
-#    one of *subgroups* or *packages* is.
-#
-# The following keys are **optional** for a group:
-#
-#  - *hidden*: if true, do not show the group on the page. Defaults to false.
-#  - *selected*: if true, display the group as selected. Defaults to the
-#    parent group's value, if there is a parent group; top-level groups
-#    are set to true by default.
-#  - *critical*: if true, make the installation process fail if installing
-#    any of the packages in the group fails. Otherwise, just log a warning.
-#    Defaults to false. If not set in a subgroup (see below), inherits from
-#    the parent group.
-#  - *immutable*: if true, the state of the group (and all its subgroups)
-#    cannot be changed; no packages can be selected or deselected. No
-#    checkboxes are show for the group. Setting *immutable* to true
-#    really only makes sense in combination with *selected* set to true,
-#    so that the packages will be installed. (Setting a group to immutable
-#    can be seen as removing it from the user-interface.)
-#  - *noncheckable*: if true, the entire group cannot be selected or
-#    deselected by a single click. This does not affect any subgroups 
-#    or child packages 
-#  - *expanded*: if true, the group is shown in an expanded form (that is,
-#    not-collapsed) in the treeview on start. This only affects the user-
-#    interface. Only top-level groups are show expanded-initially.
-#  - *subgroups*: if present this follows the same structure as the top level
-#    groups, allowing sub-groups of packages to an arbitary depth.
-#  - *pre-install*: an optional command to run within the new system before
-#    the group's packages are installed. It will run before **each** package in
-#    the group is installed.
-#  - *post-install*: an optional command to run within the new system after
-#    the group's packages are installed. It will run after **each** package in
-#    the group is installed.
-#
-# If you set both *hidden* and *selected* for a top-level group, you are
-# creating a "default" group of packages which will always be installed
-# in the user's system. Hidden selected subgroups are installed if their
-# parent is selected. Setting *hidden* to true without *selected*, or with
-# *selected* set to false, is kind of pointless and will generate a warning.
-#
-# The *pre-install* and *post-install* commands are **not** passed to
-# a shell; see the **packages** module configuration (i.e. `packages.conf`)
-# for details. To use a full shell pipeline, call the shell explicitly.
-#
-# Non-critical groups are installed by calling the package manager
-# individually, once for each package (and ignoring errors), while
-# critical packages are installed in one single call to the package
-# manager (and errors cause the installation to terminate).
-#
-#
-#
-# The *groups* key below contains some common patterns for packages
-# and sub-groups, with documentation.
-
diff --git a/calamares/modules/netinstall-nvidia.yaml b/calamares/modules/netinstall-nvidia.yaml
deleted file mode 100644
index 4a2fa6f..0000000
--- a/calamares/modules/netinstall-nvidia.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- name: "Nvidia-dkms for linux kernel - installed by default"
-  description: "Installs nvidia-dkms for linux kernel"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - linux
-    - linux-headers
-    - nvidia-dkms
-    - nvidia-settings
-    - nvidia-utils
-- name: "Nvidia-dkms for linux-lts kernel"
-  description: "Installs nvidia-dkms for linux-lts kernel"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - linux-lts
-    - linux-lts-headers
-    - nvidia-dkms
-    - nvidia-settings
-    - nvidia-utils
-- name: "Nvidia-dkms for linux-hardened kernel"
-  description: "Installs nvidia-dkms for linux-hardened kernel"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - linux-hardened
-    - linux-hardened-headers
-    - nvidia-dkms
-    - nvidia-settings
-    - nvidia-utils
-- name: "Nvidia-dkms for linux-zen kernel"
-  description: "Installs nvidia-dkms for linux-zen kernel"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - linux-zen
-    - linux-zen-headers
-    - nvidia-dkms
-    - nvidia-settings
-    - nvidia-utils
-- name: "Nvidia Related"
-  description: "Nvidia related applications"
-  critical: false
-  hidden: false
-  selected: false
-  immutable: false
-  expanded: false
-  packages:
-    - bumblebee
-    - bumblebee-status
-    - bumblebee-status-git
-    - cuda
-    - envycontrol
-    - gwe
-    - nvflash
-    - nvidia
-    - nvidia-lts
-    - nvidia-prime
-    - nvidia-xrun
-    - nvtop
-    - optimus-manager
-    - optimus-manager-qt
diff --git a/calamares/modules/netinstall-terminals.yaml b/calamares/modules/netinstall-terminals.yaml
index 28c8ae2..3fd36c1 100644
--- a/calamares/modules/netinstall-terminals.yaml
+++ b/calamares/modules/netinstall-terminals.yaml
@@ -77,8 +77,6 @@
     - toilet
     - tty-clock
     - tty-clock-git
-    - ufetch-git
-    - ufetch-arco-git
     - unimatrix-git
     - wttr
 - name: "Zsh"
@@ -96,6 +94,5 @@
     - zsh-syntax-highlighting
     - zsh-syntax-highlighting-git
     - zsh-theme-powerlevel10k-git
-    - arcolinux-zsh-git
     - oh-my-zsh-git
     - oh-my-zsh-powerline-theme-git
diff --git a/calamares/modules/netinstall-theming.yaml b/calamares/modules/netinstall-theming.yaml
index b22820d..0753d07 100644
--- a/calamares/modules/netinstall-theming.yaml
+++ b/calamares/modules/netinstall-theming.yaml
@@ -7,8 +7,6 @@
   packages:
     - adapta-gtk-theme
     - arc-darkest-theme-git
-    - arcolinux-arc-kde
-    - arcolinux-sweet-mars-git
     - ayu-theme
     - breeze
     - dracula-gtk-theme
@@ -64,36 +62,6 @@
     - papirus-linux-universe
     - papirus-nord
     - qogir-icon-theme
-    - sardi-icons
-    - sardi-colora-variations-icons-git
-    - sardi-flat-colora-variations-icons-git
-    - sardi-flat-mint-y-icons-git
-    - sardi-flat-mixing-icons-git
-    - sardi-flexible-colora-variations-icons-git
-    - sardi-flexible-luv-colora-variations-icons-git
-    - sardi-flexible-mint-y-icons-git
-    - sardi-flexible-mixing-icons-git
-    - sardi-flexible-variations-icons-git
-    - sardi-ghost-flexible-colora-variations-icons-git
-    - sardi-ghost-flexible-mint-y-icons-git
-    - sardi-ghost-flexible-mixing-icons-git
-    - sardi-ghost-flexible-variations-icons-git
-    - sardi-mint-y-icons-git
-    - sardi-mixing-icons-git
-    - sardi-mono-colora-variations-icons-git
-    - sardi-mono-mint-y-icons-git
-    - sardi-mono-mixing-icons-git
-    - sardi-mono-numix-colora-variations-icons-git
-    - sardi-mono-papirus-colora-variations-icons-git
-    - sardi-orb-colora-mint-y-icons-git
-    - sardi-orb-colora-mixing-icons-git
-    - sardi-orb-colora-variations-icons-git
-    - surfn-icons-git
-    - surfn-arc-breeze-icons-git
-    - surfn-mint-y-icons-git
-    - surfn-plasma-dark-icons-git
-    - surfn-plasma-light-icons-git
-    - tela-circle-icon-theme-git
     - vimix-icon-theme-git
     - we10x-icon-theme-git
     - whitesur-icon-theme-git