diff --git a/Melawy-Linux-Base-System/_base_and_developer_edition.yaml b/Melawy-Linux-Base-System/_base_and_developer_edition.yaml
index beb9113..39dcd80 100644
--- a/Melawy-Linux-Base-System/_base_and_developer_edition.yaml
+++ b/Melawy-Linux-Base-System/_base_and_developer_edition.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Base-System/_base_system.yaml b/Melawy-Linux-Base-System/_base_system.yaml
index c8bf670..e0a18c4 100644
--- a/Melawy-Linux-Base-System/_base_system.yaml
+++ b/Melawy-Linux-Base-System/_base_system.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Base-System/_netinstall_only.yaml b/Melawy-Linux-Base-System/_netinstall_only.yaml
index 1b64844..7d57cd1 100644
--- a/Melawy-Linux-Base-System/_netinstall_only.yaml
+++ b/Melawy-Linux-Base-System/_netinstall_only.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf
index 6b2b1b1..5dbd9c6 100644
--- a/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf
+++ b/Melawy-Linux-Base-System/airootfs/etc/pacman-cache.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 [cache]
 SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf
index 5d1521a..e5958e1 100644
--- a/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf
+++ b/Melawy-Linux-Base-System/airootfs/etc/pacman-std.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 # [cache]
 # SigLevel = Optional
 # Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Base-System/airootfs/etc/pacman.conf b/Melawy-Linux-Base-System/airootfs/etc/pacman.conf
index 9510ae5..9e11ad6 100644
--- a/Melawy-Linux-Base-System/airootfs/etc/pacman.conf
+++ b/Melawy-Linux-Base-System/airootfs/etc/pacman.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -95,15 +98,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf
index e93515e..ea90615 100644
--- a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf
+++ b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/10-wayland.conf
@@ -1,3 +1,5 @@
+[General]
+DisplayServer=x11-user
 GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
 
 [Wayland]
diff --git a/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/hidpi.conf b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/hidpi.conf
new file mode 100644
index 0000000..a235ccf
--- /dev/null
+++ b/Melawy-Linux-Base-System/airootfs/etc/sddm.conf.d/hidpi.conf
@@ -0,0 +1,5 @@
+[Wayland]
+EnableHiDPI=true
+
+[X11]
+EnableHiDPI=true
\ No newline at end of file
diff --git a/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service b/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
deleted file mode 120000
index a9e68a9..0000000
--- a/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/power-profiles-daemon.service
\ No newline at end of file
diff --git a/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service b/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
new file mode 120000
index 0000000..482d51b
--- /dev/null
+++ b/Melawy-Linux-Base-System/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned-ppd.service
\ No newline at end of file
diff --git a/Melawy-Linux-Base-System/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service b/Melawy-Linux-Base-System/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
new file mode 120000
index 0000000..4e779e0
--- /dev/null
+++ b/Melawy-Linux-Base-System/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned.service
\ No newline at end of file
diff --git a/Melawy-Linux-Base-System/generate_packages.x86_64 b/Melawy-Linux-Base-System/generate_packages.x86_64
new file mode 120000
index 0000000..e99dd47
--- /dev/null
+++ b/Melawy-Linux-Base-System/generate_packages.x86_64
@@ -0,0 +1 @@
+pack_base_system.sh
\ No newline at end of file
diff --git a/Melawy-Linux-Base-System/netinstall.yaml b/Melawy-Linux-Base-System/netinstall.yaml
index 625630e..276ec4a 100644
--- a/Melawy-Linux-Base-System/netinstall.yaml
+++ b/Melawy-Linux-Base-System/netinstall.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Base-System/packages.x86_64 b/Melawy-Linux-Base-System/packages.x86_64
index 84a453e..9b8fc3c 100644
--- a/Melawy-Linux-Base-System/packages.x86_64
+++ b/Melawy-Linux-Base-System/packages.x86_64
@@ -53,7 +53,6 @@ bluez
 bluez-hid2hci
 bluez-libs
 bluez-utils
-bpftune
 breeze
 breeze-gtk
 bridge-utils
@@ -451,7 +450,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -569,6 +567,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 udftools
 udiskie
 udisks2
diff --git a/Melawy-Linux-Base-System/packages.x86_64_melawy_base_system b/Melawy-Linux-Base-System/packages.x86_64_melawy_base_system
index 84a453e..9b8fc3c 100644
--- a/Melawy-Linux-Base-System/packages.x86_64_melawy_base_system
+++ b/Melawy-Linux-Base-System/packages.x86_64_melawy_base_system
@@ -53,7 +53,6 @@ bluez
 bluez-hid2hci
 bluez-libs
 bluez-utils
-bpftune
 breeze
 breeze-gtk
 bridge-utils
@@ -451,7 +450,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -569,6 +567,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 udftools
 udiskie
 udisks2
diff --git a/Melawy-Linux-Base-System/pacman_sys.conf b/Melawy-Linux-Base-System/pacman_sys.conf
index 7c9793f..03c93c6 100644
--- a/Melawy-Linux-Base-System/pacman_sys.conf
+++ b/Melawy-Linux-Base-System/pacman_sys.conf
@@ -76,6 +76,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -97,15 +100,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 #[cache]
 #SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
diff --git a/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml b/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml
index beb9113..39dcd80 100644
--- a/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml
+++ b/Melawy-Linux-Developer-Edition-Custom/_base_and_developer_edition.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml b/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml
index c8bf670..e0a18c4 100644
--- a/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml
+++ b/Melawy-Linux-Developer-Edition-Custom/_base_system.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml b/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml
index 1b64844..7d57cd1 100644
--- a/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml
+++ b/Melawy-Linux-Developer-Edition-Custom/_netinstall_only.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf
index 6b2b1b1..5dbd9c6 100644
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-cache.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 [cache]
 SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf
index 5d1521a..e5958e1 100644
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman-std.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 # [cache]
 # SigLevel = Optional
 # Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf
index 9510ae5..9e11ad6 100644
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -95,15 +98,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist
index dea2d73..22c32b0 100644
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/pacman.d/mirrorlist
@@ -1,60 +1,30 @@
-Server = http://ftp.byfly.by/pub/archlinux/$repo/os/$arch
-Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
-Server = https://at.arch.mirror.kescher.at/$repo/os/$arch
-Server = http://archlinux.koyanet.lv/archlinux/$repo/os/$arch
-Server = http://ch.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = https://mirror.ditatompel.com/archlinux/$repo/os/$arch
-Server = http://es.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
-Server = http://mirror.t-home.mk/archlinux/$repo/os/$arch
-Server = http://repository.su/archlinux/$repo/os/$arch
-Server = http://mirror.cspacehostings.com/archlinux/$repo/os/$arch
-Server = http://al.arch.niranjan.co/$repo/os/$arch
-Server = https://mirror.timtal.com.tr/archlinux/$repo/os/$arch
-Server = https://mirror.qctronics.com/archlinux/$repo/os/$arch
-Server = http://ca.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://mirrors.xtom.ee/archlinux/$repo/os/$arch
-Server = https://mirror.ps.kz/archlinux/$repo/os/$arch
-Server = https://mirror.leitecastro.com/archlinux/$repo/os/$arch
-Server = http://arch.yhtez.xyz/$repo/os/$arch
-Server = https://it.mirrors.cicku.me/archlinux/$repo/os/$arch
+################################################################################
+################# Arch Linux mirrorlist generated by Reflector #################
+################################################################################
+
+# With:       reflector @/etc/xdg/reflector/reflector.conf
+# When:       2024-11-05 16:41:59 UTC
+# From:       https://archlinux.org/mirrors/status/json/
+# Retrieved:  2024-11-05 16:41:03 UTC
+# Last Check: 2024-11-05 16:35:41 UTC
+
+Server = https://mirror.pseudoform.org/$repo/os/$arch
+Server = https://de.arch.mirror.kescher.at/$repo/os/$arch
+Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+Server = http://arch.phinau.de/$repo/os/$arch
+Server = https://arch.phinau.de/$repo/os/$arch
+Server = https://de.arch.niranjan.co/$repo/os/$arch
+Server = http://de.arch.niranjan.co/$repo/os/$arch
 Server = http://mirror.moson.org/arch/$repo/os/$arch
-Server = http://jp.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
-Server = https://sg.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = https://mirror1.sox.rs/archlinux/$repo/os/$arch
-Server = https://mirror.funami.tech/arch/$repo/os/$arch
-Server = http://mirror.neuf.no/archlinux/$repo/os/$arch
-Server = http://mirror.ps.kz/archlinux/$repo/os/$arch
-Server = https://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch
-Server = https://al.arch.niranjan.co/$repo/os/$arch
-Server = http://mirror.nw-sys.ru/archlinux/$repo/os/$arch
-Server = https://archlinux.koyanet.lv/archlinux/$repo/os/$arch
-Server = https://archlinux.grena.ge/$repo/os/$arch
-Server = http://archlinux.grena.ge/$repo/os/$arch
-Server = http://mirror1.sox.rs/archlinux/$repo/os/$arch
-Server = http://mirror.tux.si/arch/$repo/os/$arch
-Server = http://sg.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = https://jp.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://mirror.leitecastro.com/archlinux/$repo/os/$arch
-Server = http://archlinux.thaller.ws/$repo/os/$arch
-Server = http://it.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch
-Server = http://mirror.group.one/archlinux/$repo/os/$arch
-Server = https://arch.yhtez.xyz/$repo/os/$arch
-Server = https://us.arch.niranjan.co/$repo/os/$arch
-Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = https://mirror.t-home.mk/archlinux/$repo/os/$arch
-Server = https://london.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://arch.niranjan.co/$repo/os/$arch
-Server = http://nl.mirrors.cicku.me/archlinux/$repo/os/$arch
-Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
-Server = http://mirrors.atviras.lt/archlinux/$repo/os/$arch
-Server = https://mirrors.atviras.lt/archlinux/$repo/os/$arch
-Server = http://ftp.sh.cvut.cz/arch/$repo/os/$arch
-Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
-Server = https://mirror.neuf.no/archlinux/$repo/os/$arch
-Server = https://nox.panibrez.com/archlinux/$repo/os/$arch
-Server = https://mirror.tux.si/arch/$repo/os/$arch
-Server = http://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch
-Server = http://arch.niranjan.co/$repo/os/$arch
+Server = https://mirror.moson.org/arch/$repo/os/$arch
+Server = https://mirror.lcarilla.de/archlinux/$repo/os/$arch
+Server = rsync://mirror.lcarilla.de/archlinux/$repo/os/$arch
+Server = rsync://mirror.moson.org/arch/$repo/os/$arch
+Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch
+Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch
+Server = rsync://mirror.kumi.systems/archlinux/$repo/os/$arch
+Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch
+Server = rsync://mirror.theo546.fr/archlinux/$repo/os/$arch
+Server = rsync://mirror.pseudoform.org/packages/$repo/os/$arch
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf
index e93515e..ea90615 100644
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/10-wayland.conf
@@ -1,3 +1,5 @@
+[General]
+DisplayServer=x11-user
 GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
 
 [Wayland]
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/hidpi.conf b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/hidpi.conf
new file mode 100644
index 0000000..a235ccf
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/sddm.conf.d/hidpi.conf
@@ -0,0 +1,5 @@
+[Wayland]
+EnableHiDPI=true
+
+[X11]
+EnableHiDPI=true
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
deleted file mode 120000
index a9e68a9..0000000
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/power-profiles-daemon.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
new file mode 120000
index 0000000..482d51b
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned-ppd.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
new file mode 120000
index 0000000..4e779e0
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/start-data-flash.sh b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/start-data-flash.sh
index bff392e..ab5819a 100755
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/start-data-flash.sh
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/start-data-flash.sh
@@ -17,11 +17,11 @@ locale-gen
 timedatectl set-timezone Asia/Yekaterinburg
 
 if [ -f "/flash/etc/pacman.conf" ]; then
-    cp -vf /flash/etc/pacman.conf /etc/
+    cp -vrf /flash/etc/* /etc/
 fi
 
 if [ -f "/flash/etc/sddm.conf.d/kde_settings.conf" ]; then
-    cp -vf /flash/etc/sddm.conf.d/kde_settings.conf /etc/sddm.conf.d/
+    cp -vrf /flash/etc/sddm.conf.d/* /etc/sddm.conf.d/
 fi
 
 userdbctl user liveuser
diff --git a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/usermod-home.sh b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/usermod-home.sh
index 93e0ea3..2ae4696 100755
--- a/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/usermod-home.sh
+++ b/Melawy-Linux-Developer-Edition-Custom/airootfs/usr/local/bin/usermod-home.sh
@@ -17,11 +17,11 @@ locale-gen
 timedatectl set-timezone Asia/Yekaterinburg
 
 if [ -f "/flash/etc/pacman.conf" ]; then
-    cp -vf /flash/etc/pacman.conf /etc/
+    cp -vrf /flash/etc/* /etc/
 fi
 
 if [ -f "/flash/etc/sddm.conf.d/kde_settings.conf" ]; then
-    cp -vf /flash/etc/sddm.conf.d/kde_settings.conf /etc/sddm.conf.d/
+    cp -vrf /flash/etc/sddm.conf.d/* /etc/sddm.conf.d/
 fi
 
 userdbctl user liveuser
diff --git a/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64 b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64
new file mode 120000
index 0000000..d0523a7
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition-Custom/generate_packages.x86_64
@@ -0,0 +1 @@
+pack_base_and_developer_edition_full.sh
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml b/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml
index 625630e..276ec4a 100644
--- a/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml
+++ b/Melawy-Linux-Developer-Edition-Custom/netinstall.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition-Custom/packages.x86_64 b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64
index 3325f85..0250f28 100644
--- a/Melawy-Linux-Developer-Edition-Custom/packages.x86_64
+++ b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64
@@ -57,7 +57,6 @@ bluez-libs
 bluez-utils
 boost
 boost-libs
-bpftune
 bpython
 brave-bin
 breeze
@@ -511,7 +510,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -651,6 +649,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 typescript
 typescript-language-server
 udftools
diff --git a/Melawy-Linux-Developer-Edition-Custom/packages.x86_64_melawy_base_and_developer_edition_full b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64_melawy_base_and_developer_edition_full
index 3325f85..0250f28 100644
--- a/Melawy-Linux-Developer-Edition-Custom/packages.x86_64_melawy_base_and_developer_edition_full
+++ b/Melawy-Linux-Developer-Edition-Custom/packages.x86_64_melawy_base_and_developer_edition_full
@@ -57,7 +57,6 @@ bluez-libs
 bluez-utils
 boost
 boost-libs
-bpftune
 bpython
 brave-bin
 breeze
@@ -511,7 +510,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -651,6 +649,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 typescript
 typescript-language-server
 udftools
diff --git a/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf b/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf
index 7c9793f..03c93c6 100644
--- a/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf
+++ b/Melawy-Linux-Developer-Edition-Custom/pacman_sys.conf
@@ -76,6 +76,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -97,15 +100,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 #[cache]
 #SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
diff --git a/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml b/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml
index beb9113..39dcd80 100644
--- a/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml
+++ b/Melawy-Linux-Developer-Edition/_base_and_developer_edition.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition/_base_system.yaml b/Melawy-Linux-Developer-Edition/_base_system.yaml
index c8bf670..e0a18c4 100644
--- a/Melawy-Linux-Developer-Edition/_base_system.yaml
+++ b/Melawy-Linux-Developer-Edition/_base_system.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition/_netinstall_only.yaml b/Melawy-Linux-Developer-Edition/_netinstall_only.yaml
index 1b64844..7d57cd1 100644
--- a/Melawy-Linux-Developer-Edition/_netinstall_only.yaml
+++ b/Melawy-Linux-Developer-Edition/_netinstall_only.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf
index 6b2b1b1..5dbd9c6 100644
--- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-cache.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 [cache]
 SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf
index 5d1521a..e5958e1 100644
--- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman-std.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 # [cache]
 # SigLevel = Optional
 # Server = http://10.120.152.1/$repo/$arch
@@ -101,15 +104,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf
index 9510ae5..9e11ad6 100644
--- a/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/pacman.conf
@@ -74,6 +74,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -95,15 +98,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [chaotic-aur]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf
index e93515e..ea90615 100644
--- a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/10-wayland.conf
@@ -1,3 +1,5 @@
+[General]
+DisplayServer=x11-user
 GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
 
 [Wayland]
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/hidpi.conf b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/hidpi.conf
new file mode 100644
index 0000000..a235ccf
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/sddm.conf.d/hidpi.conf
@@ -0,0 +1,5 @@
+[Wayland]
+EnableHiDPI=true
+
+[X11]
+EnableHiDPI=true
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service b/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
deleted file mode 120000
index a9e68a9..0000000
--- a/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/power-profiles-daemon.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service b/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
new file mode 120000
index 0000000..482d51b
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned-ppd.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service b/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
new file mode 120000
index 0000000..4e779e0
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned.service
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition/generate_packages.x86_64 b/Melawy-Linux-Developer-Edition/generate_packages.x86_64
new file mode 120000
index 0000000..d0523a7
--- /dev/null
+++ b/Melawy-Linux-Developer-Edition/generate_packages.x86_64
@@ -0,0 +1 @@
+pack_base_and_developer_edition_full.sh
\ No newline at end of file
diff --git a/Melawy-Linux-Developer-Edition/netinstall.yaml b/Melawy-Linux-Developer-Edition/netinstall.yaml
index 625630e..276ec4a 100644
--- a/Melawy-Linux-Developer-Edition/netinstall.yaml
+++ b/Melawy-Linux-Developer-Edition/netinstall.yaml
@@ -82,7 +82,7 @@
     # - uksmdstats
     - ananicy-cpp
     - cachyos-ananicy-rules-git
-    - bpftune
+    # - bpftune
     - cachyos-settings
     - dbus-broker
     - lua-filesystem
@@ -191,7 +191,9 @@
       selected: true
       packages:
         - cpupower
-        - power-profiles-daemon
+        # - power-profiles-daemon
+        - tuned
+        - tuned-ppd
         - upower
 
     - name: "Terminal applications (base_system) (base_and_developer_edition) (full netinstall)"
diff --git a/Melawy-Linux-Developer-Edition/packages.x86_64 b/Melawy-Linux-Developer-Edition/packages.x86_64
index 3325f85..0250f28 100644
--- a/Melawy-Linux-Developer-Edition/packages.x86_64
+++ b/Melawy-Linux-Developer-Edition/packages.x86_64
@@ -57,7 +57,6 @@ bluez-libs
 bluez-utils
 boost
 boost-libs
-bpftune
 bpython
 brave-bin
 breeze
@@ -511,7 +510,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -651,6 +649,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 typescript
 typescript-language-server
 udftools
diff --git a/Melawy-Linux-Developer-Edition/packages.x86_64_melawy_base_and_developer_edition_full b/Melawy-Linux-Developer-Edition/packages.x86_64_melawy_base_and_developer_edition_full
index 3325f85..0250f28 100644
--- a/Melawy-Linux-Developer-Edition/packages.x86_64_melawy_base_and_developer_edition_full
+++ b/Melawy-Linux-Developer-Edition/packages.x86_64_melawy_base_and_developer_edition_full
@@ -57,7 +57,6 @@ bluez-libs
 bluez-utils
 boost
 boost-libs
-bpftune
 bpython
 brave-bin
 breeze
@@ -511,7 +510,6 @@ polkit-qt6
 poppler-glib
 poppler-qt5
 poppler-qt6
-power-profiles-daemon
 powerdevil
 powerline
 powerline-common
@@ -651,6 +649,8 @@ ttf-ubuntu-font-family
 ttf-ubuntu-mono-nerd
 ttf-ubuntu-nerd
 tumbler
+tuned
+tuned-ppd
 typescript
 typescript-language-server
 udftools
diff --git a/Melawy-Linux-Developer-Edition/pacman_sys.conf b/Melawy-Linux-Developer-Edition/pacman_sys.conf
index 7c9793f..03c93c6 100644
--- a/Melawy-Linux-Developer-Edition/pacman_sys.conf
+++ b/Melawy-Linux-Developer-Edition/pacman_sys.conf
@@ -76,6 +76,9 @@ LocalFileSigLevel = Optional
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[melawy-core]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
+
 #[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -97,15 +100,9 @@ Include = /etc/pacman.d/mirrorlist
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 
-[melawy-core]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 #[cache]
 #SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/NetworkManager/conf.d/20-ipv4-dad.conf b/Melawy-Linux-NetInstall/airootfs/etc/NetworkManager/conf.d/20-ipv4-dad.conf
new file mode 100644
index 0000000..355494b
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/NetworkManager/conf.d/20-ipv4-dad.conf
@@ -0,0 +1,2 @@
+[connection-dad-default]
+ipv4.dad-timeout=200
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf b/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf
index ad58786..e549489 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/dracut.conf.d/defaults.conf
@@ -1,3 +1,3 @@
 omit_dracutmodules+=" network cifs nfs brltty "
-compress="zstd"
+compress="xz"
 hostonly="no"
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/environment b/Melawy-Linux-NetInstall/airootfs/etc/environment
index 664ebce..012561c 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/environment
+++ b/Melawy-Linux-NetInstall/airootfs/etc/environment
@@ -15,3 +15,4 @@ GTK_USE_PORTAL=1
 BROWSER=firefox
 EDITOR=mcedit
 ZPOOL_VDEV_NAME_PATH=1
+
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/gshadow b/Melawy-Linux-NetInstall/airootfs/etc/gshadow
index 3cea4f6..26e81ca 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/gshadow
+++ b/Melawy-Linux-NetInstall/airootfs/etc/gshadow
@@ -1,29 +1,29 @@
 root:::brltty,root
-bin:!*::daemon
-daemon:!*::bin
-sys:!*::bin,liveuser
-tty:!*::brltty,liveuser
-log:!*::liveuser
-network:!*::liveuser
-floppy:!*::liveuser
-scanner:!*::liveuser
-power:!*::liveuser
-cups:!*::liveuser
-brltty:!*::
-brlapi:!*::brltty
-realtime:!::liveuser
-sambashare:!::liveuser
+bin:!!::daemon
+daemon:!!::bin
+sys:!!::bin,liveuser
+tty:!!::brltty,liveuser
+log:!!::liveuser
+network:!!::liveuser
+floppy:!!::liveuser
+scanner:!!::liveuser
+power:!!::liveuser
+cups:!!::liveuser
+brltty:!!::
+brlapi:!!::brltty
+realtime:!!::liveuser
+sambashare:!!::liveuser
 nopasswdlogin:!::liveuser
 autologin:!::liveuser
-rfkill:!*::liveuser
-users:!*::liveuser
-video:!*::liveuser
-uucp:!*::brltty,liveuser
-storage:!*::liveuser
-optical:!*::liveuser
-lp:!*::cups,liveuser
-input:!*::brltty,liveuser
-audio:!*::brltty,liveuser
-wheel:!*::liveuser
-adm:!*::daemon,liveuser
+rfkill:!!::liveuser
+users:!!::liveuser
+video:!!::liveuser
+uucp:!!::brltty,liveuser
+storage:!!::liveuser
+optical:!!::liveuser
+lp:!!::cups,liveuser
+input:!!::brltty,liveuser
+audio:!!::brltty,liveuser
+wheel:!!::liveuser
+adm:!!::daemon,liveuser
 liveuser:!::
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.conf.d/archiso.conf
new file mode 100644
index 0000000..ef3f911
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/mkinitcpio.conf.d/archiso.conf
@@ -0,0 +1,3 @@
+BINARIES=(setfont)
+HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard plymouth)
+COMPRESSION="xz"
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/motd b/Melawy-Linux-NetInstall/airootfs/etc/motd
index e10b69f..66cc288 100755
--- a/Melawy-Linux-NetInstall/airootfs/etc/motd
+++ b/Melawy-Linux-NetInstall/airootfs/etc/motd
@@ -27,3 +27,4 @@ Thank you for donating your trust in us!
 Welcome to your Melawy Linux
 
 ------------------
+
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf
index 13408df..5dbd9c6 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman-cache.conf
@@ -1,27 +1,24 @@
-# 
+#
 # /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/
-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
+#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
@@ -35,16 +32,17 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-# NoProgressBar
+#NoProgressBar
 CheckSpace
 VerbosePkgLists
-ParallelDownloads = 8
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # 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
+#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
@@ -69,21 +67,9 @@ 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
+# 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.
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -91,30 +77,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-core]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-3party]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 [cache]
 SigLevel = Optional
 #Server = http://10.120.152.1/$repo/$arch
 Server = http://192.168.1.250/$repo/$arch
 Server = https://repo.melawy.ru/$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
 
 [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
@@ -122,20 +98,17 @@ 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
 
-# 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
+[melawy-3party]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[cachyos]
-Include = /etc/pacman.d/cachyos-mirrorlist
+[chaotic-aur]
+Include = /etc/pacman.d/chaotic-mirrorlist
 
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
@@ -149,12 +122,11 @@ Include = /etc/pacman.d/arcolinux-mirrorlist
 [garuda]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
-[chaotic-aur]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
 [endeavouros]
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-# [custom]
-# SigLevel = Optional TrustAll
-# Server = file:///home/custompkgs
+# 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
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf
index bbda64d..e5958e1 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman-std.conf
@@ -1,27 +1,24 @@
-# 
+#
 # /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/
-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
+#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
@@ -35,16 +32,17 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-# NoProgressBar
+#NoProgressBar
 CheckSpace
 VerbosePkgLists
-ParallelDownloads = 8
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # 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
+#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
@@ -69,21 +67,9 @@ 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
+# 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.
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -91,30 +77,20 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-core]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-3party]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
 # [cache]
 # SigLevel = Optional
 # Server = http://10.120.152.1/$repo/$arch
 # Server = http://192.168.1.250/$repo/$arch
 # Server = https://repo.melawy.ru/$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
 
 [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
@@ -122,20 +98,17 @@ 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
 
-# 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
+[melawy-3party]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[cachyos]
-Include = /etc/pacman.d/cachyos-mirrorlist
+[chaotic-aur]
+Include = /etc/pacman.d/chaotic-mirrorlist
 
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
@@ -149,12 +122,11 @@ Include = /etc/pacman.d/arcolinux-mirrorlist
 [garuda]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
-[chaotic-aur]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
 [endeavouros]
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-# [custom]
-# SigLevel = Optional TrustAll
-# Server = file:///home/custompkgs
+# 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
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf b/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf
index bbda64d..9e11ad6 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.conf
@@ -1,27 +1,24 @@
-# 
+#
 # /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/
-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
+#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
@@ -35,16 +32,17 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-# NoProgressBar
+#NoProgressBar
 CheckSpace
 VerbosePkgLists
-ParallelDownloads = 8
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # 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
+#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
@@ -69,21 +67,9 @@ 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
+# 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.
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -91,30 +77,14 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-core]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-3party]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-# [cache]
-# SigLevel = Optional
-# Server = http://10.120.152.1/$repo/$arch
-# Server = http://192.168.1.250/$repo/$arch
-# Server = https://repo.melawy.ru/$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
+#[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
@@ -122,20 +92,17 @@ 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
 
-# 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
+[melawy-3party]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[cachyos]
-Include = /etc/pacman.d/cachyos-mirrorlist
+[chaotic-aur]
+Include = /etc/pacman.d/chaotic-mirrorlist
 
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
@@ -149,12 +116,11 @@ Include = /etc/pacman.d/arcolinux-mirrorlist
 [garuda]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
-[chaotic-aur]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
 [endeavouros]
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-# [custom]
-# SigLevel = Optional TrustAll
-# Server = file:///home/custompkgs
+# 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
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/cachyos-mirrorlist b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/cachyos-mirrorlist
new file mode 100644
index 0000000..ce7c81c
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/cachyos-mirrorlist
@@ -0,0 +1,34 @@
+######################################################
+####                                              ####
+####        CachyOS Repository Mirrorlist         ####
+####                                              ####
+######################################################
+#### Entry in file /etc/pacman.conf:
+###     [cachyos]
+###     Include = /etc/pacman.d/cachyos-mirrorlist
+######################################################
+## Tebi CDN (Germany, USA, SG)
+Server = https://cdn-1.cachyos.org/$arch/$repo
+## Cloudflare R2
+Server = https://cdn.cachyos.org/repo/$arch/$repo
+## Germany
+Server = https://aur.cachyos.org/repo/$arch/$repo
+Server = https://mirror.cachyos.org/repo/$arch/$repo
+## South Korea much thanks to silent_heigou!
+Server = https://kr.cachyos.org/repo/$arch/$repo
+## USA Mirror much thanks to corpdecker!
+Server = https://us.cachyos.org/repo/$arch/$repo
+## India Mirror much thanks to https://github.com/albonycal
+Server = https://mirror.albony.xyz/cachylinux/repo/$arch/$repo
+## France Mirror much thanks to Antoine Viallon (aviallon)
+Server = https://mirror.lesviallon.fr/cachy/repo/$arch/$repo
+## Russia Mirror
+Server = https://mirror.truenetwork.ru/cachy/repo/$arch/$repo
+## Norway Mirror much thanks to QuadFeed
+Server = https://mirror.fast0ne.com/repo/$arch/$repo
+## Norway Mirror much thanks to innoix
+Server = https://no.mirror.cx/cachyos/repo/$arch/$repo
+## French Mirror much thanks to Rhino
+Server = https://mir.cachyos.fr/repo/$arch/$repo
+## South Korea much thanks to Mihate Hiura!
+Server = https://mirror.funami.tech/cachy/$arch/$repo
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist
index 2652c1f..dea2d73 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist
+++ b/Melawy-Linux-NetInstall/airootfs/etc/pacman.d/mirrorlist
@@ -1,30 +1,60 @@
-################################################################################
-################# Arch Linux mirrorlist generated by Reflector #################
-################################################################################
-
-# With:       reflector @/etc/xdg/reflector/reflector.conf
-# When:       2024-01-27 06:24:21 UTC
-# From:       https://archlinux.org/mirrors/status/json/
-# Retrieved:  2024-01-27 06:23:54 UTC
-# Last Check: 2024-01-27 05:46:11 UTC
-
-Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
-Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
-Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
+Server = http://ftp.byfly.by/pub/archlinux/$repo/os/$arch
+Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
+Server = https://at.arch.mirror.kescher.at/$repo/os/$arch
+Server = http://archlinux.koyanet.lv/archlinux/$repo/os/$arch
+Server = http://ch.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = https://mirror.ditatompel.com/archlinux/$repo/os/$arch
+Server = http://es.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
+Server = http://mirror.t-home.mk/archlinux/$repo/os/$arch
+Server = http://repository.su/archlinux/$repo/os/$arch
+Server = http://mirror.cspacehostings.com/archlinux/$repo/os/$arch
+Server = http://al.arch.niranjan.co/$repo/os/$arch
+Server = https://mirror.timtal.com.tr/archlinux/$repo/os/$arch
+Server = https://mirror.qctronics.com/archlinux/$repo/os/$arch
+Server = http://ca.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://mirrors.xtom.ee/archlinux/$repo/os/$arch
+Server = https://mirror.ps.kz/archlinux/$repo/os/$arch
+Server = https://mirror.leitecastro.com/archlinux/$repo/os/$arch
+Server = http://arch.yhtez.xyz/$repo/os/$arch
+Server = https://it.mirrors.cicku.me/archlinux/$repo/os/$arch
 Server = http://mirror.moson.org/arch/$repo/os/$arch
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = http://archlinux.honkgong.info/$repo/os/$arch
-Server = https://mirror.moson.org/arch/$repo/os/$arch
+Server = http://jp.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
+Server = https://sg.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = https://mirror1.sox.rs/archlinux/$repo/os/$arch
+Server = https://mirror.funami.tech/arch/$repo/os/$arch
+Server = http://mirror.neuf.no/archlinux/$repo/os/$arch
+Server = http://mirror.ps.kz/archlinux/$repo/os/$arch
+Server = https://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch
+Server = https://al.arch.niranjan.co/$repo/os/$arch
+Server = http://mirror.nw-sys.ru/archlinux/$repo/os/$arch
+Server = https://archlinux.koyanet.lv/archlinux/$repo/os/$arch
+Server = https://archlinux.grena.ge/$repo/os/$arch
+Server = http://archlinux.grena.ge/$repo/os/$arch
+Server = http://mirror1.sox.rs/archlinux/$repo/os/$arch
+Server = http://mirror.tux.si/arch/$repo/os/$arch
+Server = http://sg.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = https://jp.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://mirror.leitecastro.com/archlinux/$repo/os/$arch
 Server = http://archlinux.thaller.ws/$repo/os/$arch
-Server = http://ftp.psnc.pl/linux/archlinux/$repo/os/$arch
-Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
-Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
-Server = rsync://archlinux.honkgong.info/archlinux/$repo/os/$arch
-Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
-Server = rsync://mirror.moson.org/arch/$repo/os/$arch
+Server = http://it.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch
+Server = http://mirror.group.one/archlinux/$repo/os/$arch
+Server = https://arch.yhtez.xyz/$repo/os/$arch
+Server = https://us.arch.niranjan.co/$repo/os/$arch
+Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
+Server = https://mirror.t-home.mk/archlinux/$repo/os/$arch
+Server = https://london.mirror.pkgbuild.com/$repo/os/$arch
+Server = https://arch.niranjan.co/$repo/os/$arch
+Server = http://nl.mirrors.cicku.me/archlinux/$repo/os/$arch
+Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
+Server = http://mirrors.atviras.lt/archlinux/$repo/os/$arch
+Server = https://mirrors.atviras.lt/archlinux/$repo/os/$arch
+Server = http://ftp.sh.cvut.cz/arch/$repo/os/$arch
+Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
+Server = https://mirror.neuf.no/archlinux/$repo/os/$arch
+Server = https://nox.panibrez.com/archlinux/$repo/os/$arch
+Server = https://mirror.tux.si/arch/$repo/os/$arch
+Server = http://md.mirrors.hacktegic.com/archlinux/$repo/os/$arch
+Server = http://arch.niranjan.co/$repo/os/$arch
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf
index 892dd88..ea90615 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/10-wayland.conf
@@ -1,4 +1,6 @@
+[General]
+DisplayServer=x11-user
 GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
 
 [Wayland]
-CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod qtvirtualkeyboard
+CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1 --inputmethod maliit-keyboard
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/hidpi.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/hidpi.conf
new file mode 100644
index 0000000..a235ccf
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/hidpi.conf
@@ -0,0 +1,5 @@
+[Wayland]
+EnableHiDPI=true
+
+[X11]
+EnableHiDPI=true
\ No newline at end of file
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf
index 28d570a..9e78661 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf
+++ b/Melawy-Linux-NetInstall/airootfs/etc/sddm.conf.d/kde_settings.conf
@@ -1,6 +1,6 @@
 [Autologin]
 Relogin=false
-Session=plasma
+Session=plasmax11
 User=
 
 [General]
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/skel/.bashrc b/Melawy-Linux-NetInstall/airootfs/etc/skel/.bashrc
index 7e37138..5c71db5 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/skel/.bashrc
+++ b/Melawy-Linux-NetInstall/airootfs/etc/skel/.bashrc
@@ -5,10 +5,41 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+
+# Change the window title of X terminals
+case ${TERM} in
+    xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+        PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"'
+        ;;
+    screen*)
+        PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"'
+        ;;
+esac
+
 alias ls='ls --color=auto'
+alias la='ls -a'
+alias ll='ls -la'
+alias l='ls'
+alias l.="ls -A | egrep '^\.'"
+alias grep='grep --colour=auto'
+alias egrep='egrep --colour=auto'
+alias fgrep='fgrep --colour=auto'
+alias df='df -h'                          # human-readable sizes
+alias free='free -m'                      # show sizes in MB
 PS1='[\u@\h \W]\$ '
 
-########
-#ALCI
-########
-alias evb='sudo systemctl enable --now vboxservice.service'
\ No newline at end of file
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+shopt -s expand_aliases
+
+# export QT_SELECT=4
+
+# Enable history appending instead of overwriting.  #139609
+shopt -s histappend
+
+#neofetch
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
deleted file mode 120000
index a9e68a9..0000000
--- a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/power-profiles-daemon.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/power-profiles-daemon.service
\ No newline at end of file
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
new file mode 120000
index 0000000..482d51b
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/graphical.target.wants/tuned-ppd.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned-ppd.service
\ No newline at end of file
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
new file mode 120000
index 0000000..4e779e0
--- /dev/null
+++ b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/multi-user.target.wants/tuned.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/tuned.service
\ No newline at end of file
diff --git a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/pacman-init.service b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/pacman-init.service
index b824884..1a0be0f 100644
--- a/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/pacman-init.service
+++ b/Melawy-Linux-NetInstall/airootfs/etc/systemd/system/pacman-init.service
@@ -1,3 +1,6 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 [Unit]
 Description=Initializes Pacman keyring
 Requires=etc-pacman.d-gnupg.mount
diff --git a/Melawy-Linux-NetInstall/pacman_sys.conf b/Melawy-Linux-NetInstall/pacman_sys.conf
index e36d69a..565497d 100644
--- a/Melawy-Linux-NetInstall/pacman_sys.conf
+++ b/Melawy-Linux-NetInstall/pacman_sys.conf
@@ -12,16 +12,16 @@
 [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/
-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
+#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
@@ -35,16 +35,19 @@ Architecture = auto
 #UseSyslog
 Color
 ILoveCandy
-# NoProgressBar
-CheckSpace
+#NoProgressBar
+#TotalDownload
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 VerbosePkgLists
-ParallelDownloads = 8
+DisableDownloadTimeout
+ParallelDownloads = 10
 
 # 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
+#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
@@ -69,21 +72,9 @@ 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
+# 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.
 
 [melawy]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
@@ -91,24 +82,14 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-core]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[melawy-3party]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-[melawy-archlinux]
-Include = /etc/pacman.d/melawy-linux-mirrorlist
-
-# 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
+#[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
@@ -116,26 +97,29 @@ 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
 
-# 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
+[melawy-3party]
+Include = /etc/pacman.d/melawy-linux-mirrorlist
 
-[cache]
-SigLevel = Optional
-Server = http://10.120.152.1/$repo/$arch
-Server = http://192.168.1.250/$repo/$arch
-Server = https://repo.melawy.ru/$repo/$arch
+#[cache]
+#SigLevel = Optional
+#Server = http://10.120.152.1/$repo/$arch
+#Server = http://192.168.1.250/$repo/$arch
+#Server = https://repo.melawy.ru/$repo/$arch
 
-[cachyos]
-Include = /etc/pacman.d/cachyos-mirrorlist
+# [cachyos-iso]
+# Server = https://mirror.cachyos.org/repo/$arch/$repo
+#
+# [cachyos]
+# Include = /etc/pacman.d/cachyos-mirrorlist
+
+[chaotic-aur]
+Include = /etc/pacman.d/chaotic-mirrorlist
 
 [arcolinux_repo]
 Include = /etc/pacman.d/arcolinux-mirrorlist
@@ -149,12 +133,11 @@ Include = /etc/pacman.d/arcolinux-mirrorlist
 [garuda]
 Include = /etc/pacman.d/chaotic-mirrorlist
 
-[chaotic-aur]
-Include = /etc/pacman.d/chaotic-mirrorlist
-
 [endeavouros]
 Include = /etc/pacman.d/endeavouros-mirrorlist
 
-# [custom]
-# SigLevel = Optional TrustAll
-# Server = file:///home/custompkgs
+# 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
diff --git a/make.sh b/make.sh
index b308233..98c9bc1 100755
--- a/make.sh
+++ b/make.sh
@@ -14,6 +14,22 @@ else
     echo "USER IS ROOT"
 fi
 
+a=$(pacman -Qs archiso)
+if [[ "0" -ne "$?" ]]; then
+  echo "Отсутствует archiso"
+  unset a
+  a=$(pacman -Ss archiso)
+  if [[ "0" -eq "$?" ]]; then
+    echo "archiso имеется в удаленном репозитории"
+    unset a
+    pacman -Sy archiso
+  else
+    unset a
+  fi
+else
+  unset a
+fi
+
 DELAY=1
 
 function check_internet() {
@@ -200,12 +216,12 @@ function build() {
 
     mkdir -pv "$CWD/boot/"{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
     chown -R $user:$group "$CWD/boot/"
-    
+
     mkdir -pv "$CWD/sf" 2>/dev/null
     chown -R $user:$group "$CWD/sf"
-    
+
     mkdir -pv "$CWD/work_${edition}" 2>/dev/null
-    
+
     mkdir -pv "$CWD/sf/${iso_dir}" 2>/dev/null
     chown -R $user:$group "$CWD/sf/${iso_dir}"
 
@@ -224,6 +240,10 @@ function build() {
       rm "$CWD/sf/${iso_dir}/${iso_name}.iso"
     fi
 
+    if [ -f "generate_packages.x86_64" ]; then
+      bash generate_packages.x86_64
+    fi
+
     pacman -Sw --config pacman_sys.conf --noconfirm $(grep -v '^#' ./packages.x86_64 | grep -v '^$')
     if [ "$?" -ne 0 ]; then
       pacman -Sw --config pacman_sys.conf --noconfirm $(grep -v '^#' ./packages.x86_64 | grep -v '^$')
diff --git a/pwd.txt b/pwd.txt
index 9c49fbd..26ea645 100644
--- a/pwd.txt
+++ b/pwd.txt
@@ -1 +1 @@
-/data/data/melawy-archiso-config
\ No newline at end of file
+/data/github/active/Melawy/Melawy-Dev/MELAWY/Installer/melawy-archiso-config
\ No newline at end of file