diff --git a/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh b/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh
index 3d97f9523..398b5173e 100755
--- a/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh
+++ b/scripts/BuildScripts/FilesystemScripts/buildFilesystem.sh
@@ -276,7 +276,7 @@ chroot $outmnt apt-get autoremove --purge
 chroot $outmnt apt-get clean
 
 #Download the shared packages to be installed by InstallPackages.sh:
-apt_install $PRAWNOS_BUILD $outmnt false ${base_debs_download[@]}
+apt_install $PRAWNOS_BUILD $outmnt false ${shared_desktop_debs_download[@]}
 
 #DEs
 #Download the xfce packages to be installed by InstallPackages.sh:
diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh
index 1282643b5..536c81d19 100755
--- a/scripts/InstallScripts/InstallPackages.sh
+++ b/scripts/InstallScripts/InstallPackages.sh
@@ -78,7 +78,7 @@ dpkg-reconfigure tzdata
 
 ## GENERAL CONFIG
 #Install shared packages
-DEBIAN_FRONTEND=noninteractive apt install -y ${base_debs_download[@]}
+DEBIAN_FRONTEND=noninteractive apt install -y ${shared_desktop_debs_download[@]}
 DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_base_debs_prebuilt_download[@]}
 
 DEBIAN_FRONTEND=noninteractive apt install -y prawnos-general-config
diff --git a/scripts/Shared/package_lists.sh b/scripts/Shared/package_lists.sh
index fdc393e5a..0bd9d4011 100755
--- a/scripts/Shared/package_lists.sh
+++ b/scripts/Shared/package_lists.sh
@@ -18,16 +18,7 @@
 # ======================================== Package Lists =========================================
 # ================================ KEEP THESE LISTS ALPHABETIZED! ================================
 
-
-debootstrap_debs_install=(
-    build-essential
-    ca-certificates
-    gnupg
-    init
-    locales
-    openssl
-)
-
+# packages shared by CLI/GUI installs:
 base_debs_install=(
     alsa-utils
     apt-utils
@@ -73,70 +64,17 @@ base_debs_install=(
     xz-utils
 )
 
-# blueman can be moved to xfce only once gnome-bluetooth in settings works properly
-base_debs_download=(
-    acpi-support
-    alsa-utils
-    anacron
-    avahi-daemon
-    blueman
-    bluetooth
-    crda
-    dbus-user-session
-    dpkg
-    dkms
-    eject
-    firefox-esr
-    iw
-    libegl-mesa0
-    libegl1-mesa
-    libgl1-mesa-dri
-    libglapi-mesa
-    libglu1-mesa
-    libglx-mesa0
-    libnss-mdns
-    librsvg2-common
-    libutempter0
-    libwayland-egl1-mesa
-    sudo
-    sysfsutils
-    tasksel
-    vlc
-    xdg-utils
-    xorg
-    xserver-xorg-input-libinput
-)
-
-xfce_debs_download=(
-    accountsservice
-    dbus-user-session
-    dconf-cli
-    dconf-editor
-    lightdm
-    mousepad
-    network-manager-gnome
-    network-manager-openvpn
-    network-manager-openvpn-gnome
-    numix-gtk-theme
-    papirus-icon-theme
-    plank
-    system-config-printer
-    xfce4
-    xfce4-goodies
-    xfce4-power-manager
-    xfce4-terminal
-)
-
-lxqt_debs_download=(
-    lightdm
-    lxqt
-    mousepad
-    network-manager-gnome
-    network-manager-openvpn
-    network-manager-openvpn-gnome
-    pavucontrol-qt
+# packages installed by debootstrap within chroot during build process:
+debootstrap_debs_install=(
+    build-essential
+    ca-certificates
+    gnupg
+    init
+    locales
+    openssl
 )
 
+# Packages installed for gnome desktop
 gnome_debs_download=(
     dbus-user-session
     dconf-cli
@@ -166,31 +104,32 @@ gnome_debs_download=(
     seahorse
 )
 
-# packages built by prawnos, to be installed when running InstallPrawnOS
-# and choosing xfce
-prawnos_xfce_debs_prebuilt_download=(
-    xsecurelock
-    prawnos-xfce-config
-    libinput-gestures
+lxqt_debs_download=(
+    lightdm
+    lxqt
+    mousepad
+    network-manager-gnome
+    network-manager-openvpn
+    network-manager-openvpn-gnome
+    pavucontrol-qt
 )
 
 # packages built by prawnos, to be installed when running InstallPrawnOS
-# and choosing gnome
-prawnos_gnome_debs_prebuilt_download=(
-    prawnos-gnome-config
+# on arm64 devices
+prawnos_arm64_debs_prebuilt_download=(
+    prawnos-gru-config
 )
 
 # packages built by prawnos, to be installed when running InstallPrawnOS
-prawnos_base_debs_prebuilt_download=(
-    prawnos-general-config
-    lagrange-gemini-browser
+# on armhf devices
+prawnos_armhf_debs_prebuilt_download=(
+    prawnos-veyron-config
 )
 
-# packages built by prawnos, to be installed at build time
-prawnos_base_debs_prebuilt_install=(
-    font-source-code-pro
-    flashmap
-    mosys
+# packages built by prawnos, to be installed when running InstallPrawnOS
+# and choosing gnome
+prawnos_gnome_debs_prebuilt_download=(
+    prawnos-gnome-config
 )
 
 # these are only required when the debian mesa version is too old for us
@@ -212,15 +151,82 @@ prawnos_mesa_prebuilt_install=(
 )
 
 # packages built by prawnos, to be installed when running InstallPrawnOS
-# on armhf devices
-prawnos_armhf_debs_prebuilt_download=(
-    prawnos-veyron-config
+prawnos_base_debs_prebuilt_download=(
+    prawnos-general-config
+    lagrange-gemini-browser
+)
+
+# packages built by prawnos, to be installed at build time
+prawnos_base_debs_prebuilt_install=(
+    font-source-code-pro
+    flashmap
+    mosys
 )
 
 # packages built by prawnos, to be installed when running InstallPrawnOS
-# on arm64 devices
-prawnos_arm64_debs_prebuilt_download=(
-    prawnos-gru-config
+# and choosing xfce
+prawnos_xfce_debs_prebuilt_download=(
+    xsecurelock
+    prawnos-xfce-config
+    libinput-gestures
+)
+
+# packages installed for all GUI installs (gnome/lxqt/xfce):
+# FIXME: blueman can be moved to xfce only once gnome-bluetooth in settings works properly
+shared_desktop_debs_download=(
+    acpi-support
+    alsa-utils
+    anacron
+    avahi-daemon
+    blueman
+    bluetooth
+    crda
+    dbus-user-session
+    dpkg
+    dkms
+    eject
+    firefox-esr
+    gvfs-backends
+    gvfs-fuse
+    iw
+    keepassxc
+    libegl-mesa0
+    libegl1-mesa
+    libgl1-mesa-dri
+    libglapi-mesa
+    libglu1-mesa
+    libglx-mesa0
+    libnss-mdns
+    librsvg2-common
+    libutempter0
+    libwayland-egl1-mesa
+    sudo
+    sysfsutils
+    tasksel
+    vlc
+    xdg-utils
+    xorg
+    xserver-xorg-input-libinput
+)
+
+xfce_debs_download=(
+    accountsservice
+    dbus-user-session
+    dconf-cli
+    dconf-editor
+    lightdm
+    mousepad
+    network-manager-gnome
+    network-manager-openvpn
+    network-manager-openvpn-gnome
+    numix-gtk-theme
+    papirus-icon-theme
+    plank
+    system-config-printer
+    xfce4
+    xfce4-goodies
+    xfce4-power-manager
+    xfce4-terminal
 )
 
 # ====================================== END Package Lists =======================================