diff --git a/src/modules/netinstall/build/_base_and_developer_edition.yaml b/src/modules/netinstall/build/_base_and_developer_edition.yaml
index bb60120..f8697fc 100644
--- a/src/modules/netinstall/build/_base_and_developer_edition.yaml
+++ b/src/modules/netinstall/build/_base_and_developer_edition.yaml
@@ -67,6 +67,7 @@
     - melawy-check-reboot-required
     - melawy-dracut-initramfs
     - melawy-dracut-ukify
+    - dracut-luks-autounlock
     - melawy-etc-skel-std-powerman-kvantum
     - melawy-skel-root
     - melawy-refind-menu-generator
@@ -233,6 +234,7 @@
         - intltool
         - inxi
         - iotop-c
+        - kdialog
         - less
         - libfido2
         - libusb-compat
@@ -347,6 +349,10 @@
         - sshguard
         - systemd-resolvconf
         - tor
+        - tor-router
+        - obfs4proxy
+        - snowflake-pt-client-git
+        - webtunnel
         - traceroute
         - usb_modeswitch
         - vpnc
@@ -653,6 +659,7 @@
         - breeze-gtk
         - dolphin
         - dolphin-plugins
+        - doublecmd-qt6
         - drkonqi
         - feh
         - ffmpegthumbnailer
@@ -763,14 +770,13 @@
         - downgrade
         - expac
         - flatpak
-        - libpamac-flatpak
         - melawy-pamac-helper
         - ocs-url
         - pace
         - packagekit-qt5
         - packagekit-qt6
         - paclast
-        - pamac-flatpak
+        - pamac
         - paru
         - pkgfile
         - rate-mirrors
@@ -795,7 +801,7 @@
               - firefox
               - firefox-i18n-$LOCALE
               - profile-sync-daemon
-              - torbrowser-launcher
+              - tor-browser-bin
 
         - name: "Firefox (full netinstall)"
           description: "Add firefox and language pack"
@@ -908,7 +914,15 @@
       description: "Add Code IDE and programming language package"
       selected: true
       packages:
+        - android-emulator
+        - android-ndk
+        - android-platform
+        - android-sdk
+        - android-sdk-build-tools
+        - android-sdk-cmdline-tools-latest
+        - android-tools
         - ansible-language-server
+        - apksigcopier
         - base-devel
         - bash-language-server
         - boost
@@ -930,6 +944,8 @@
         - gdb
         - git
         - git-lfs
+        - go
+        - go-tools
         - icu69
         - jdk-openjdk
         - jq
diff --git a/src/modules/netinstall/build/_base_system.yaml b/src/modules/netinstall/build/_base_system.yaml
index f96d700..527e72b 100644
--- a/src/modules/netinstall/build/_base_system.yaml
+++ b/src/modules/netinstall/build/_base_system.yaml
@@ -67,6 +67,7 @@
     - melawy-check-reboot-required
     - melawy-dracut-initramfs
     - melawy-dracut-ukify
+    - dracut-luks-autounlock
     - melawy-etc-skel-std-powerman-kvantum
     - melawy-skel-root
     - melawy-refind-menu-generator
@@ -233,6 +234,7 @@
         - intltool
         - inxi
         - iotop-c
+        - kdialog
         - less
         - libfido2
         - libusb-compat
@@ -347,6 +349,10 @@
         - sshguard
         - systemd-resolvconf
         - tor
+        - tor-router
+        - obfs4proxy
+        - snowflake-pt-client-git
+        - webtunnel
         - traceroute
         - usb_modeswitch
         - vpnc
@@ -653,6 +659,7 @@
         - breeze-gtk
         - dolphin
         - dolphin-plugins
+        - doublecmd-qt6
         - drkonqi
         - feh
         - ffmpegthumbnailer
@@ -763,14 +770,13 @@
         - downgrade
         - expac
         - flatpak
-        - libpamac-flatpak
         - melawy-pamac-helper
         - ocs-url
         - pace
         - packagekit-qt5
         - packagekit-qt6
         - paclast
-        - pamac-flatpak
+        - pamac
         - paru
         - pkgfile
         - rate-mirrors
@@ -795,7 +801,7 @@
               - firefox
               - firefox-i18n-$LOCALE
               - profile-sync-daemon
-              - torbrowser-launcher
+              - tor-browser-bin
 
         - name: "Firefox (full netinstall)"
           description: "Add firefox and language pack"
@@ -908,7 +914,15 @@
       description: "Add Code IDE and programming language package"
       selected: false
       packages:
+        - android-emulator
+        - android-ndk
+        - android-platform
+        - android-sdk
+        - android-sdk-build-tools
+        - android-sdk-cmdline-tools-latest
+        - android-tools
         - ansible-language-server
+        - apksigcopier
         - base-devel
         - bash-language-server
         - boost
@@ -930,6 +944,8 @@
         - gdb
         - git
         - git-lfs
+        - go
+        - go-tools
         - icu69
         - jdk-openjdk
         - jq
diff --git a/src/modules/netinstall/build/_netinstall_only.yaml b/src/modules/netinstall/build/_netinstall_only.yaml
index e0e600c..1362eb1 100644
--- a/src/modules/netinstall/build/_netinstall_only.yaml
+++ b/src/modules/netinstall/build/_netinstall_only.yaml
@@ -67,6 +67,7 @@
     - melawy-check-reboot-required
     - melawy-dracut-initramfs
     - melawy-dracut-ukify
+    - dracut-luks-autounlock
     - melawy-etc-skel-std-powerman-kvantum
     - melawy-skel-root
     - melawy-refind-menu-generator
@@ -233,6 +234,7 @@
         - intltool
         - inxi
         - iotop-c
+        - kdialog
         - less
         - libfido2
         - libusb-compat
@@ -347,6 +349,10 @@
         - sshguard
         - systemd-resolvconf
         - tor
+        - tor-router
+        - obfs4proxy
+        - snowflake-pt-client-git
+        - webtunnel
         - traceroute
         - usb_modeswitch
         - vpnc
@@ -653,6 +659,7 @@
         - breeze-gtk
         - dolphin
         - dolphin-plugins
+        - doublecmd-qt6
         - drkonqi
         - feh
         - ffmpegthumbnailer
@@ -763,14 +770,13 @@
         - downgrade
         - expac
         - flatpak
-        - libpamac-flatpak
         - melawy-pamac-helper
         - ocs-url
         - pace
         - packagekit-qt5
         - packagekit-qt6
         - paclast
-        - pamac-flatpak
+        - pamac
         - paru
         - pkgfile
         - rate-mirrors
@@ -795,7 +801,7 @@
               - firefox
               - firefox-i18n-$LOCALE
               - profile-sync-daemon
-              - torbrowser-launcher
+              - tor-browser-bin
 
         - name: "Firefox (full netinstall)"
           description: "Add firefox and language pack"
@@ -908,7 +914,15 @@
       description: "Add Code IDE and programming language package"
       selected: false
       packages:
+        - android-emulator
+        - android-ndk
+        - android-platform
+        - android-sdk
+        - android-sdk-build-tools
+        - android-sdk-cmdline-tools-latest
+        - android-tools
         - ansible-language-server
+        - apksigcopier
         - base-devel
         - bash-language-server
         - boost
@@ -930,6 +944,8 @@
         - gdb
         - git
         - git-lfs
+        - go
+        - go-tools
         - icu69
         - jdk-openjdk
         - jq
diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index a8ad8a6..f8c29bb 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -27,6 +27,7 @@
 
     - base
     - base-devel
+    - coreutils-hybrid-git
     - appstream
     - busybox
     - edk2-shell
@@ -67,6 +68,7 @@
     - melawy-check-reboot-required
     - melawy-dracut-initramfs
     - melawy-dracut-ukify
+    - dracut-luks-autounlock
     - melawy-etc-skel-std-powerman-kvantum
     - melawy-skel-root
     - melawy-refind-menu-generator
@@ -233,6 +235,7 @@
         - intltool
         - inxi
         - iotop-c
+        - kdialog
         - less
         - libfido2
         - libusb-compat
@@ -347,6 +350,10 @@
         - sshguard
         - systemd-resolvconf
         - tor
+        - tor-router
+        - obfs4proxy
+        - snowflake-pt-client-git
+        - webtunnel
         - traceroute
         - usb_modeswitch
         - vpnc
@@ -653,6 +660,7 @@
         - breeze-gtk
         - dolphin
         - dolphin-plugins
+        - doublecmd-qt6
         - drkonqi
         - feh
         - ffmpegthumbnailer
@@ -763,14 +771,13 @@
         - downgrade
         - expac
         - flatpak
-        - libpamac-flatpak
         - melawy-pamac-helper
         - ocs-url
         - pace
         - packagekit-qt5
         - packagekit-qt6
         - paclast
-        - pamac-flatpak
+        - pamac
         - paru
         - pkgfile
         - rate-mirrors
@@ -795,7 +802,7 @@
               - firefox
               - firefox-i18n-$LOCALE
               - profile-sync-daemon
-              - torbrowser-launcher
+              - tor-browser-bin
 
         - name: "Firefox (full netinstall)"
           description: "Add firefox and language pack"
@@ -908,7 +915,15 @@
       description: "Add Code IDE and programming language package"
       selected: true
       packages:
+        - android-emulator
+        - android-ndk
+        - android-platform
+        - android-sdk
+        - android-sdk-build-tools
+        - android-sdk-cmdline-tools-latest
+        - android-tools
         - ansible-language-server
+        - apksigcopier
         - base-devel
         - bash-language-server
         - boost
@@ -930,6 +945,8 @@
         - gdb
         - git
         - git-lfs
+        - go
+        - go-tools
         - icu69
         - jdk-openjdk
         - jq
@@ -997,8 +1014,8 @@
       description: "Add the mail applications"
       selected: true
       packages:
-        - discord
-        - telegram-desktop
+        - discord_arch_electron
+        - telegram-desktop-bin
         - zoom
 
     - name: "Chat applications (full netinstall)"
diff --git a/src/modules/pacstrap/pacstrap.conf b/src/modules/pacstrap/pacstrap.conf
index 401c34f..55a0c89 100644
--- a/src/modules/pacstrap/pacstrap.conf
+++ b/src/modules/pacstrap/pacstrap.conf
@@ -126,6 +126,7 @@ postInstallFiles:
   - "/etc/resolv.conf.bak"
   - "/etc/systemd/timesyncd.conf"
   - "/etc/systemd/zram-generator.conf"
+  - "/etc/tor/torrc"
   - "/etc/vconsole.conf"
   - "/etc/xdg/reflector/reflector.conf"
   - "/usr/bin/GPU-Intel-installer"