diff --git a/03_make.sh b/03_make.sh
index 38eeda0..abbcb20 100755
--- a/03_make.sh
+++ b/03_make.sh
@@ -5,10 +5,14 @@ sudo ./mkarchiso_last_my -v "."
 date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 
-gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
-sha1sum     "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha1"
-sha256sum   "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha256"
 cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
+gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
+
+
+cd "../boot/iso/"
+
+sha1sum     "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha1"
+sha256sum   "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha256"
 
 notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
diff --git a/04_sign.sh b/04_sign.sh
index 86a9db0..842a622 100755
--- a/04_sign.sh
+++ b/04_sign.sh
@@ -5,11 +5,15 @@
 date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 
-gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
-sha1sum     "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha1"
-sha256sum   "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha256"
 cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
+gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
 
-notify-send -a "$(basename $(pwd)): Sign" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
+
+cd "../boot/iso/"
+
+sha1sum     "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha1"
+sha256sum   "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha256"
+
+notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"
diff --git a/airootfs/etc/pacman-cache.conf b/airootfs/etc/pacman-cache.conf
index 89c154e..71d6e4e 100644
--- a/airootfs/etc/pacman-cache.conf
+++ b/airootfs/etc/pacman-cache.conf
@@ -1,55 +1,89 @@
+# 
 # /etc/pacman.conf
-#
-#
+# 
+# 
 # See the pacman.conf(5) manpage for option and repository directives
-#
+# 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-#
+# 
 # GENERAL OPTIONS
-#
+# 
 [options]
-# RootDir = /
-# DBPath = /var/lib/pacman/
-# CacheDir = /var/cache/pacman/pkg/
-# LogFile = /var/log/pacman.log
-# GPGDir = /etc/pacman.d/gnupg/
-# HookDir = /etc/pacman.d/hooks/
-HoldPkg = base base-devel pacman glibc
-# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+# RootDir     = /
+# DBPath      = /var/lib/pacman/
+# CacheDir    = /var/cache/pacman/pkg/
+# LogFile     = /var/log/pacman.log
+# GPGDir      = /etc/pacman.d/gnupg/
+# HookDir     = /etc/pacman.d/hooks/
+HoldPkg      = base base-devel pacman glibc
+# XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 # CleanMethod = KeepInstalled
 Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
-# IgnoreGroup =
-# NoUpgrade =
-# NoExtract =
-# UseSyslog
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
 Color
 ILoveCandy
 # NoProgressBar
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 8
-SigLevel = Required DatabaseOptional
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 # RemoteFileSigLevel = Required
 
-#[core]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
 
-#[main]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
 
-#[apps]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# [core]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [main]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [apps]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
 
 
-#[kde-unstable]
-#Include = /etc/pacman.d/mirrorlist
+# [kde-unstable]
+# Include = /etc/pacman.d/mirrorlist
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -61,6 +95,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 SigLevel = Optional
 Server = http://192.168.1.250/$repo/$arch
 
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
 # [core-testing]
 # Include = /etc/pacman.d/mirrorlist
 
@@ -73,12 +111,21 @@ Include = /etc/pacman.d/mirrorlist
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
 # [multilib-testing]
 # Include = /etc/pacman.d/mirrorlist
 
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
 
diff --git a/airootfs/etc/pacman-std.conf b/airootfs/etc/pacman-std.conf
index 1d66ab7..594244d 100644
--- a/airootfs/etc/pacman-std.conf
+++ b/airootfs/etc/pacman-std.conf
@@ -1,55 +1,89 @@
+# 
 # /etc/pacman.conf
-#
-#
+# 
+# 
 # See the pacman.conf(5) manpage for option and repository directives
-#
+# 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-#
+# 
 # GENERAL OPTIONS
-#
+# 
 [options]
-# RootDir = /
-# DBPath = /var/lib/pacman/
-# CacheDir = /var/cache/pacman/pkg/
-# LogFile = /var/log/pacman.log
-# GPGDir = /etc/pacman.d/gnupg/
-# HookDir = /etc/pacman.d/hooks/
-HoldPkg = base base-devel pacman glibc
-# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+# RootDir     = /
+# DBPath      = /var/lib/pacman/
+# CacheDir    = /var/cache/pacman/pkg/
+# LogFile     = /var/log/pacman.log
+# GPGDir      = /etc/pacman.d/gnupg/
+# HookDir     = /etc/pacman.d/hooks/
+HoldPkg      = base base-devel pacman glibc
+# XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 # CleanMethod = KeepInstalled
 Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
-# IgnoreGroup =
-# NoUpgrade =
-# NoExtract =
-# UseSyslog
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
 Color
 ILoveCandy
 # NoProgressBar
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 8
-SigLevel = Required DatabaseOptional
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 # RemoteFileSigLevel = Required
 
-#[core]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
 
-#[main]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
 
-#[apps]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# [core]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [main]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [apps]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
 
 
-#[kde-unstable]
-#Include = /etc/pacman.d/mirrorlist
+# [kde-unstable]
+# Include = /etc/pacman.d/mirrorlist
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -61,6 +95,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 # SigLevel = Optional
 # Server = http://192.168.1.250/$repo/$arch
 
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
 # [core-testing]
 # Include = /etc/pacman.d/mirrorlist
 
@@ -73,12 +111,21 @@ Include = /etc/pacman.d/mirrorlist
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
 # [multilib-testing]
 # Include = /etc/pacman.d/mirrorlist
 
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
 
diff --git a/airootfs/etc/pacman.conf b/airootfs/etc/pacman.conf
index 1d66ab7..594244d 100644
--- a/airootfs/etc/pacman.conf
+++ b/airootfs/etc/pacman.conf
@@ -1,55 +1,89 @@
+# 
 # /etc/pacman.conf
-#
-#
+# 
+# 
 # See the pacman.conf(5) manpage for option and repository directives
-#
+# 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-#
+# 
 # GENERAL OPTIONS
-#
+# 
 [options]
-# RootDir = /
-# DBPath = /var/lib/pacman/
-# CacheDir = /var/cache/pacman/pkg/
-# LogFile = /var/log/pacman.log
-# GPGDir = /etc/pacman.d/gnupg/
-# HookDir = /etc/pacman.d/hooks/
-HoldPkg = base base-devel pacman glibc
-# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+# RootDir     = /
+# DBPath      = /var/lib/pacman/
+# CacheDir    = /var/cache/pacman/pkg/
+# LogFile     = /var/log/pacman.log
+# GPGDir      = /etc/pacman.d/gnupg/
+# HookDir     = /etc/pacman.d/hooks/
+HoldPkg      = base base-devel pacman glibc
+# XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 # XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 # CleanMethod = KeepInstalled
 Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
-# IgnoreGroup =
-# NoUpgrade =
-# NoExtract =
-# UseSyslog
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
 Color
 ILoveCandy
 # NoProgressBar
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 8
-SigLevel = Required DatabaseOptional
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
 # RemoteFileSigLevel = Required
 
-#[core]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
 
-#[main]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
 
-#[apps]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
+# [core]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [main]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [apps]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
 
 
-#[kde-unstable]
-#Include = /etc/pacman.d/mirrorlist
+# [kde-unstable]
+# Include = /etc/pacman.d/mirrorlist
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -61,6 +95,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 # SigLevel = Optional
 # Server = http://192.168.1.250/$repo/$arch
 
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
 # [core-testing]
 # Include = /etc/pacman.d/mirrorlist
 
@@ -73,12 +111,21 @@ Include = /etc/pacman.d/mirrorlist
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
 # [multilib-testing]
 # Include = /etc/pacman.d/mirrorlist
 
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
 
diff --git a/generate_packages.x86_64_from_netinstall.py b/generate_packages.x86_64_from_netinstall.py
index 67690da..3caf826 100755
--- a/generate_packages.x86_64_from_netinstall.py
+++ b/generate_packages.x86_64_from_netinstall.py
@@ -178,7 +178,7 @@ clonezilla
 ddrescue
 gpart
 grsync
-melawy-calamares
+melawy-calamares-qt6
 memtest86+
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
diff --git a/netinstall.yaml b/netinstall.yaml
index aee7f6b..4e580ec 100644
--- a/netinstall.yaml
+++ b/netinstall.yaml
@@ -43,6 +43,8 @@
     - xf86-input-void
     - xf86-video-fbdev
     - xf86-video-openchrome
+    - fwupd
+    - fwupd-efi
 
 - name: "Virtual machines"
   description: "Required if OS run in virtual environment"
@@ -329,6 +331,7 @@
         - screen
         - screenfetch
         - sed
+        - sshpass
         - sudo
         - sysfsutils
         - syslog-ng
@@ -404,7 +407,7 @@
       selected: true
       packages:
         - appimagelauncher
-        - discover
+        # - discover
         - downgrade
         - flatpak
         - flatpak-kcm
@@ -439,8 +442,10 @@
         - ffmpegthumbnailer
         - ffmpegthumbs
         - file-roller
+        - filezilla
         - glfw-wayland
         - gnome-keyring
+        - gnome-firmware
         - gparted
         - gst-libav
         - gst-plugin-pipewire
@@ -692,6 +697,7 @@
     - kitty-terminfo
 
 - name: "Office"
+  description: "Add the office applications"
   hidden: false
   expanded: false
   selected: true
diff --git a/packages.x86_64 b/packages.x86_64
index 3a996bf..1184d8d 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -10,6 +10,8 @@ chaotic-mirrorlist
 chwd
 chwd-db
 dracut
+fwupd
+fwupd-efi
 gptfdisk
 iptables-nft
 linux-firmware
@@ -209,6 +211,7 @@ s-nail
 screen
 screenfetch
 sed
+sshpass
 sudo
 sysfsutils
 syslog-ng
@@ -275,7 +278,6 @@ xl2tpd
 
 ## Package management
 appimagelauncher
-discover
 downgrade
 flatpak
 flatpak-kcm
@@ -307,7 +309,9 @@ drkonqi
 ffmpegthumbnailer
 ffmpegthumbs
 file-roller
+filezilla
 glfw-wayland
+gnome-firmware
 gnome-keyring
 gparted
 gst-libav
@@ -600,7 +604,7 @@ clonezilla
 ddrescue
 gpart
 grsync
-melawy-calamares
+melawy-calamares-qt6
 memtest86+
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
diff --git a/pacman.conf b/pacman.conf
deleted file mode 100644
index 89c154e..0000000
--- a/pacman.conf
+++ /dev/null
@@ -1,99 +0,0 @@
-# /etc/pacman.conf
-#
-#
-# See the pacman.conf(5) manpage for option and repository directives
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# RootDir = /
-# DBPath = /var/lib/pacman/
-# CacheDir = /var/cache/pacman/pkg/
-# LogFile = /var/log/pacman.log
-# GPGDir = /etc/pacman.d/gnupg/
-# HookDir = /etc/pacman.d/hooks/
-HoldPkg = base base-devel pacman glibc
-# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-# CleanMethod = KeepInstalled
-Architecture = auto
-#IgnorePkg   =
-# IgnoreGroup =
-# NoUpgrade =
-# NoExtract =
-# UseSyslog
-Color
-ILoveCandy
-# NoProgressBar
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 8
-SigLevel = Required DatabaseOptional
-LocalFileSigLevel = Optional
-# RemoteFileSigLevel = Required
-
-#[core]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
-
-#[main]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
-
-#[apps]
-#SigLevel = Never
-#Include = /etc/pacman.d/kaos-mirrorlist
-
-
-#[kde-unstable]
-#Include = /etc/pacman.d/mirrorlist
-
-[melawy]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[melawy-3party]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[cache]
-SigLevel = Optional
-Server = http://192.168.1.250/$repo/$arch
-
-# [core-testing]
-# Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-# [extra-testing]
-# Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# [multilib-testing]
-# Include = /etc/pacman.d/mirrorlist
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist
-
-[arcolinux_repo]
-Include = /etc/pacman.d/arcolinux-mirrorlist
-
-[arcolinux_repo_xlarge]
-Include = /etc/pacman.d/arcolinux-mirrorlist
-
-[arcolinux_repo_3party]
-Include = /etc/pacman.d/arcolinux-mirrorlist
-
-[garuda]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
-[chaotic-aur]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
-# [custom]
-# SigLevel = Optional TrustAll
-# Server = file:///home/custompkgs
diff --git a/pacman_.conf b/pacman_sys.conf
similarity index 66%
rename from pacman_.conf
rename to pacman_sys.conf
index cdcd9d9..4649795 100644
--- a/pacman_.conf
+++ b/pacman_sys.conf
@@ -1,26 +1,27 @@
-#
+# 
 # /etc/pacman.conf
-#
+# 
+# 
 # See the pacman.conf(5) manpage for option and repository directives
-#
+# 
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-#
+# 
 # GENERAL OPTIONS
-#
+# 
 [options]
 # The following paths are commented out with their default values listed.
 # If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
+# RootDir     = /
+# DBPath      = /var/lib/pacman/
+# CacheDir    = /var/cache/pacman/pkg/
+# LogFile     = /var/log/pacman.log
+# GPGDir      = /etc/pacman.d/gnupg/
+# HookDir     = /etc/pacman.d/hooks/
 HoldPkg      = base base-devel pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
+# XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+# XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+# CleanMethod = KeepInstalled
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -34,8 +35,8 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-#NoProgressBar
-#CheckSpace
+# NoProgressBar
+CheckSpace
 VerbosePkgLists
 ParallelDownloads = 8
 
@@ -43,7 +44,7 @@ ParallelDownloads = 8
 # trusts (see pacman-key and its man page), as well as unsigned packages.
 SigLevel    = Required DatabaseOptional
 LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
+# RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Arch Linux
@@ -68,6 +69,22 @@ LocalFileSigLevel = Optional
 # uncommented to enable the repo.
 #
 
+# [core]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [main]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+# [apps]
+# SigLevel = Never
+# Include = /etc/pacman.d/kaos-mirrorlist
+
+
+# [kde-unstable]
+# Include = /etc/pacman.d/mirrorlist
+
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
@@ -78,14 +95,14 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
-#Include = /etc/pacman.d/mirrorlist
+# [core-testing]
+# Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
-#Include = /etc/pacman.d/mirrorlist
+# [extra-testing]
+# Include = /etc/pacman.d/mirrorlist
 
 [extra]
 Include = /etc/pacman.d/mirrorlist
@@ -93,8 +110,8 @@ Include = /etc/pacman.d/mirrorlist
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
+# [multilib-testing]
+# Include = /etc/pacman.d/mirrorlist
 
 [multilib]
 Include = /etc/pacman.d/mirrorlist
@@ -114,42 +131,50 @@ Include = /etc/pacman.d/arcolinux-mirrorlist
 [arcolinux_repo_3party]
 Include = /etc/pacman.d/arcolinux-mirrorlist
 
-[xhbp]
-SigLevel = Optional TrustAll
-Server = https://repos.xerolinux.xyz/$repo/$arch
-
-[xiso]
-SigLevel = Optional TrustAll
-Server = https://repos.xerolinux.xyz/$repo/$arch
-
-[xerolinux_repo]
-SigLevel = Optional TrustAll
-Server = https://xerolinux.github.io/$repo/$arch
-
-[xerolinux_repo_xl]
-SigLevel = Optional TrustAll
-Server = https://repos.xerolinux.xyz/$repo/$arch
-
-[cachyos]
-Include = /etc/pacman.d/cachyos-mirrorlist
-
 [garuda]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
+# [xhbp]
+# SigLevel = Optional TrustAll
+# Server = https://xerolinux.github.io/$repo/$arch
+#
+# [xiso]
+# SigLevel = Optional TrustAll
+# Server = https://xerolinux.github.io/$repo/$arch
+
+[xerolinux_repo]
+SigLevel = Optional TrustAll
+Include = /etc/pacman.d/xero-mirrorlist
+
+[xerolinux_repo_xl]
+SigLevel = Optional TrustAll
+Include = /etc/pacman.d/xero-mirrorlist
+
+[cachyos]
+Include = /etc/pacman.d/cachyos-mirrorlist
+
 [endeavouros]
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-[melawy-aur]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
+# [melawy-aur]
+# Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-aur-kde]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
+# [melawy-aur-kde]
+# Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-aur-theme]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
+# [melawy-aur-theme]
+# Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-aur-gui-app]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
+# [melawy-aur-gui-app]
+# Include = /etc/pacman.d/melawy-linux-mirrorlist
+
+# [cache]
+# SigLevel = Optional
+# Server = https://repo.melawy.ru/$repo/$arch
+
+# [custom]
+# SigLevel = Optional TrustAll
+# Server = file:///home/custompkgs