diff --git a/gnomesetup.sh b/gnomesetup.sh
index 5c237ed..3bec7d9 100644
--- a/gnomesetup.sh
+++ b/gnomesetup.sh
@@ -5,49 +5,40 @@ echo
 
 PKGS=(
 
-    # --- XORG Display Rendering
-        'xorg'                  # Base Package
-        'xorg-drivers'          # Display Drivers 
-        'xterm'                 # Terminal for TTY
-        'xorg-server'           # XOrg server
-        'xorg-apps'             # XOrg apps group
-        'xorg-xinit'            # XOrg init
-        'xorg-xinput'           # XOrg xinput
-        'xorg-twm'              # XOrg twm
-        'xorg-xclock'           # XOrg xclock
+    # --- XORG
+        'xorg'
+        'xorg-drivers'
+        'xterm'
+        'xorg-server'
+        'xorg-apps'
+        'xorg-xinit'
+        'xorg-xinput'
+        'xorg-twm'
+        'xorg-xclock'
         'xf86-input-vmmouse'
         'xf86-video-vmware'
         'mesa'
-
-    # --- Setup Desktop
-        'gnome'                 # GNOME
-
-    # --- Login Display Manager
-        'sddm'                   # Base Login Manager
-
-    # --- Networking Setup
-        'dialog'                    # Enables shell scripts to trigger dialog boxex
-        'network-manager-applet'    # System tray icon/utility for network connectivity
-        'dhclient'                  # DHCP client
-        'libsecret'                 # Library for storing passwords
-        'fail2ban'                  # Ban IP's after man failed login attempts
-        'ufw'                       # Uncomplicated firewall
+        
+    # --- Desktop
+        'gnome'
+
+    # --- Login manager
+        'sddm'
+
+    # --- Networking
+        'dialog'
+        'network-manager-applet'
+        'dhclient'
+        'libsecret'
+        'fail2ban'
+        'ufw'
     
     # --- Audio
-        'alsa-utils'        # Advanced Linux Sound Architecture (ALSA) Components https://alsa.opensrc.org/
-        'alsa-plugins'      # ALSA plugins
-        'pulseaudio'        # Pulse Audio sound components
-        'pulseaudio-alsa'   # ALSA configuration for pulse audio
-        'pavucontrol'       # Pulse Audio volume control
-        'pnmixer'           # System tray volume control
-
-    # --- Bluetooth
-        'bluez'                 # Daemons for the bluetooth protocol stack
-        'bluez-utils'           # Bluetooth development and debugging utilities
-        'bluez-libs'            # Bluetooth libraries
-        'bluez-firmware'        # Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
-        'blueberry'             # Bluetooth configuration tool
-        'pulseaudio-bluetooth'  # Bluetooth support for PulseAudio
+        'pipewire'
+        'wireplumber'
+        'pipewire-pulse'
+        'pipewire-alsa'
+        'pavucontrol'
 )
 
 for PKG in "${PKGS[@]}"; do
diff --git a/kdesetup.sh b/kdesetup.sh
index b7b4cd2..1ff13ff 100644
--- a/kdesetup.sh
+++ b/kdesetup.sh
@@ -5,49 +5,40 @@ echo
 
 PKGS=(
 
-    # --- XORG Display Rendering
-        'xorg'                  # Base Package
-        'xorg-drivers'          # Display Drivers 
-        'xterm'                 # Terminal for TTY
-        'xorg-server'           # XOrg server
-        'xorg-apps'             # XOrg apps group
-        'xorg-xinit'            # XOrg init
-        'xorg-xinput'           # XOrg xinput
-        'xorg-twm'              # XOrg twm
-        'xorg-xclock'           # XOrg xclock
+    # --- XORG
+        'xorg'
+        'xorg-drivers'
+        'xterm'
+        'xorg-server'
+        'xorg-apps'
+        'xorg-xinit'
+        'xorg-xinput'
+        'xorg-twm'
+        'xorg-xclock'
         'xf86-input-vmmouse'
         'xf86-video-vmware'
         'mesa'
 
-    # --- Setup Desktop
-        'plasma'                 # Plasma
+    # --- Desktop
+        'plasma'
 
-    # --- Login Display Manager
-        'sddm'                   # Base Login Manager
+    # --- Login manager
+        'sddm'
 
-    # --- Networking Setup
-        'dialog'                    # Enables shell scripts to trigger dialog boxex
-        'network-manager-applet'    # System tray icon/utility for network connectivity
-        'dhclient'                  # DHCP client
-        'libsecret'                 # Library for storing passwords
-        'fail2ban'                  # Ban IP's after man failed login attempts
-        'ufw'                       # Uncomplicated firewall
+    # --- Networking
+        'dialog'
+        'network-manager-applet'
+        'dhclient'
+        'libsecret'
+        'fail2ban'
+        'ufw'
     
     # --- Audio
-        'alsa-utils'        # Advanced Linux Sound Architecture (ALSA) Components https://alsa.opensrc.org/
-        'alsa-plugins'      # ALSA plugins
-        'pulseaudio'        # Pulse Audio sound components
-        'pulseaudio-alsa'   # ALSA configuration for pulse audio
-        'pavucontrol'       # Pulse Audio volume control
-        'pnmixer'           # System tray volume control
-
-    # --- Bluetooth
-        'bluez'                 # Daemons for the bluetooth protocol stack
-        'bluez-utils'           # Bluetooth development and debugging utilities
-        'bluez-libs'            # Bluetooth libraries
-        'bluez-firmware'        # Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
-        'blueberry'             # Bluetooth configuration tool
-        'pulseaudio-bluetooth'  # Bluetooth support for PulseAudio
+        'pipewire'
+        'wireplumber'
+        'pipewire-pulse'
+        'pipewire-alsa'
+        'pavucontrol'
 )
 
 for PKG in "${PKGS[@]}"; do
@@ -55,7 +46,7 @@ for PKG in "${PKGS[@]}"; do
     sudo pacman -S "$PKG" --noconfirm --needed
 done
 
-sudo systemctl enable sddm.service 
+sudo systemctl enable sddm.service
 
 echo
 echo "Done! Please Reboot & Run software.sh"
diff --git a/software.sh b/software.sh
index 958db7e..43030e6 100644
--- a/software.sh
+++ b/software.sh
@@ -48,6 +48,9 @@ PKGS=(
     'thunar-archive-plugin'
     'ark'
     'tumbler'
+    'gvfs'
+    'gvfs-smb'
+    'samba'
 
     # DEVELOPMENT ---------------------------------------------------------