diff --git a/build.sh b/build.sh
index 4d5d186b..04571477 100755
--- a/build.sh
+++ b/build.sh
@@ -27,19 +27,17 @@ help_function()
   printf "\t-h for help\n"
   printf "\t-d Desktop: %s\n" "${desktop_list}"
   printf "\t-b Build type: unstable, testing, or release\n"
-  printf "\t-t Test: FreeBSD os packages\n"
    exit 1 # Exit script after printing help
 }
 # Set mate and release to be default
 export desktop="mate"
 export build_type="release"
 
-while getopts "d:b:th" opt
+while getopts "d:b:h" opt
 do
    case "$opt" in
       'd') export desktop="$OPTARG" ;;
       'b') export build_type="$OPTARG" ;;
-      't') export desktop="test" ; build_type="test";;
       'h') help_function ;;
       '?') help_function ;;
       *) help_function ;;
@@ -149,13 +147,8 @@ workspace()
 base()
 {
   log "Installing base system packages..."
-  if [ "${desktop}" = "test" ] ; then
-    base_list="$(cat "${cwd}/packages/test_base")"
-    vital_base="$(cat "${cwd}/packages/vital/test_base")"
-  else
-    base_list="$(cat "${cwd}/packages/base")"
-    vital_base="$(cat "${cwd}/packages/vital/base")"
-  fi
+  base_list="$(cat "${cwd}/packages/base")"
+  vital_base="$(cat "${cwd}/packages/vital/base")"
   mkdir -p ${release}/etc
   cp /etc/resolv.conf ${release}/etc/resolv.conf
   mkdir -p ${release}/var/cache/pkg
diff --git a/desktop_config/test.sh b/desktop_config/test.sh
deleted file mode 100644
index 96b4b06a..00000000
--- a/desktop_config/test.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
\ No newline at end of file
diff --git a/packages/common b/packages/common
index b10206d2..dab351e1 100644
--- a/packages/common
+++ b/packages/common
@@ -1,7 +1,5 @@
 cups
 cups-filters
-drm-kmod
-evolution
 exfat-utils
 firefox
 fish
@@ -11,22 +9,16 @@ fusefs-ext2
 fusefs-hfsfuse
 fusefs-lkl
 fusefs-ntfs
-gbi
 ghostbsd-fonts
 ghostbsd-icons
 ghostbsd-utils
-gnome-keyring
 nss_mdns
 pc-sysinstall
 pkg
 python
-rhythmbox
-shotwell
-slick-greeter
-system-config-printer
 unzip
-vlc
 webrtc-audio-processing
 xconfig
 xorg-minimal
 zip
+zsh
diff --git a/packages/gershwin b/packages/gershwin
index d3c7aa80..e6f21ee8 100644
--- a/packages/gershwin
+++ b/packages/gershwin
@@ -1,4 +1,7 @@
+gbi
 gershwin-desktop
 gershwin-gbi-wrapper
 gershwin-ghostbsd-wrappers
 gershwin-firefox-wrapper
+slick-greeter
+vlc
diff --git a/packages/mate b/packages/mate
index 368c0087..6cbf852e 100644
--- a/packages/mate
+++ b/packages/mate
@@ -1,8 +1,15 @@
 brisk-menu
 cursor-dmz-theme
 dconf-editor
+evolution
 freedesktop-sound-theme
 gbi
 ghostbsd-mate
+gnome-keyring
 plank
+rhythmbox
+shotwell
+slick-greeter
+system-config-printer
+vlc
 station-tweak
\ No newline at end of file
diff --git a/packages/mate_oem b/packages/mate_oem
index 72826367..a8a3f8ef 100644
--- a/packages/mate_oem
+++ b/packages/mate_oem
@@ -1,43 +1,17 @@
 brisk-menu
-cpdup
-cups
-cups-filters
 cursor-dmz-theme
 dconf-editor
-drm-kmod
-en-aspell
-en-hunspell
-egl-wayland
 evolution
 feh
-firefox
-foomatic-db
 freedesktop-sound-theme
-fusefs-ext2
-fusefs-ntfs
-fusefs-simple-mtpfs
-gdk-pixbuf2
-ghostbsd-common-settings
-ghostbsd-drivers
-ghostbsd-fonts
-ghostbsd-icons
 ghostbsd-mate
-ghostbsd-utils
-gstreamer1-plugins-neon
-nss_mdns
-pkg
+gnome-keyring
+install-station
 plank
-python
 rhythmbox
+setup-station
 shotwell
 slick-greeter
-station-tweak
 system-config-printer
-utouch-kmod
-virtualbox-ose-additions
 vlc
-webrtc-audio-processing
-xconfig
-xf86-input-evdev
-xorg-minimal
-zip
+station-tweak
\ No newline at end of file
diff --git a/packages/plasma b/packages/plasma
index ec9b619f..6e65c28f 100644
--- a/packages/plasma
+++ b/packages/plasma
@@ -6,6 +6,7 @@ kate
 ark
 kcalc
 kate
+gbi
 gwenview
 okular
 konsole
diff --git a/packages/test b/packages/test
deleted file mode 100644
index e69de29b..00000000
diff --git a/packages/test_base b/packages/test_base
deleted file mode 100644
index b1a5d40c..00000000
--- a/packages/test_base
+++ /dev/null
@@ -1,249 +0,0 @@
-FreeBSD-acct
-FreeBSD-acct-man
-FreeBSD-acpi
-FreeBSD-acpi-man
-FreeBSD-apm
-FreeBSD-apm-man
-FreeBSD-at
-FreeBSD-at-man
-FreeBSD-autofs
-FreeBSD-autofs-man
-FreeBSD-bhyve
-FreeBSD-bhyve-man
-FreeBSD-blocklist
-FreeBSD-blocklist-lib32
-FreeBSD-blocklist-man
-FreeBSD-bluetooth
-FreeBSD-bluetooth-lib32
-FreeBSD-bluetooth-man
-FreeBSD-bootloader
-FreeBSD-bsnmp
-FreeBSD-bsnmp-lib32
-FreeBSD-bsnmp-man
-FreeBSD-caroot
-FreeBSD-ccdconfig
-FreeBSD-ccdconfig-man
-FreeBSD-certctl
-FreeBSD-certctl-man
-FreeBSD-clang
-FreeBSD-clang-man
-FreeBSD-clibs
-FreeBSD-clibs-lib32
-FreeBSD-clibs-man
-FreeBSD-clibs-man-lib32
-FreeBSD-console-tools
-FreeBSD-console-tools-man
-FreeBSD-csh
-FreeBSD-csh-man
-FreeBSD-ctf-tools
-FreeBSD-ctf-tools-man
-FreeBSD-cxgbe-tools
-FreeBSD-cxgbe-tools-man
-FreeBSD-devd
-FreeBSD-devd-man
-FreeBSD-devmatch
-FreeBSD-devmatch-lib32
-FreeBSD-devmatch-man
-FreeBSD-dhclient
-FreeBSD-dhclient-man
-FreeBSD-dma
-FreeBSD-dma-man
-FreeBSD-dpv
-FreeBSD-dpv-lib32
-FreeBSD-dpv-man
-FreeBSD-dtrace
-FreeBSD-dtrace-lib32
-FreeBSD-dtrace-man
-FreeBSD-dwatch
-FreeBSD-dwatch-man
-FreeBSD-ee
-FreeBSD-ee-man
-FreeBSD-efi-tools
-FreeBSD-efi-tools-lib32
-FreeBSD-efi-tools-man
-FreeBSD-elftoolchain
-FreeBSD-elftoolchain-man
-FreeBSD-fetch
-FreeBSD-fetch-lib32
-FreeBSD-fetch-man
-FreeBSD-ftp
-FreeBSD-ftp-man
-FreeBSD-ftpd
-FreeBSD-ftpd-man
-FreeBSD-fwget
-FreeBSD-fwget-man
-FreeBSD-geom
-FreeBSD-geom-lib32
-FreeBSD-geom-man
-FreeBSD-ggate
-FreeBSD-ggate-man
-FreeBSD-hast
-FreeBSD-hast-man
-FreeBSD-hostapd
-FreeBSD-hostapd-man
-FreeBSD-hyperv-tools
-FreeBSD-inetd
-FreeBSD-inetd-man
-FreeBSD-ipf
-FreeBSD-ipf-man
-FreeBSD-ipfw
-FreeBSD-ipfw-man
-FreeBSD-iscsi
-FreeBSD-iscsi-man
-FreeBSD-jail
-FreeBSD-jail-man
-FreeBSD-kerberos
-FreeBSD-kerberos-lib
-FreeBSD-kerberos-lib-lib32
-FreeBSD-kerberos-lib-man
-FreeBSD-kerberos-lib32
-FreeBSD-kerberos-man
-FreeBSD-kernel-generic
-FreeBSD-lib9p
-FreeBSD-lib9p-lib32
-FreeBSD-libarchive
-FreeBSD-libarchive-lib32
-FreeBSD-libarchive-man
-FreeBSD-libbegemot
-FreeBSD-libbegemot-lib32
-FreeBSD-libbegemot-man
-FreeBSD-libblocksruntime
-FreeBSD-libblocksruntime-lib32
-FreeBSD-libbsdstat
-FreeBSD-libbsdstat-lib32
-FreeBSD-libbsm
-FreeBSD-libbsm-lib32
-FreeBSD-libbsm-man
-FreeBSD-libbz2
-FreeBSD-libbz2-lib32
-FreeBSD-libcasper
-FreeBSD-libcasper-lib32
-FreeBSD-libcasper-man
-FreeBSD-libcompat-man
-FreeBSD-libcuse
-FreeBSD-libcuse-lib32
-FreeBSD-libcuse-man
-FreeBSD-libdwarf
-FreeBSD-libdwarf-lib32
-FreeBSD-libdwarf-man
-FreeBSD-libevent1
-FreeBSD-libevent1-lib32
-FreeBSD-libexecinfo
-FreeBSD-libexecinfo-lib32
-FreeBSD-libexecinfo-man
-FreeBSD-libipt
-FreeBSD-libldns
-FreeBSD-libldns-lib32
-FreeBSD-liblzma
-FreeBSD-liblzma-lib32
-FreeBSD-libmagic
-FreeBSD-libmagic-lib32
-FreeBSD-libmagic-man
-FreeBSD-libpathconv
-FreeBSD-libpathconv-lib32
-FreeBSD-libpathconv-man
-FreeBSD-librpcsec_gss
-FreeBSD-librpcsec_gss-lib32
-FreeBSD-librpcsec_gss-man
-FreeBSD-librss
-FreeBSD-librss-lib32
-FreeBSD-libsdp
-FreeBSD-libsdp-lib32
-FreeBSD-libsdp-man
-FreeBSD-libsqlite3
-FreeBSD-libsqlite3-lib32
-FreeBSD-libstdbuf
-FreeBSD-libstdbuf-lib32
-FreeBSD-libstdbuf-man
-FreeBSD-libstdthreads
-FreeBSD-libstdthreads-lib32
-FreeBSD-libstdthreads-man
-FreeBSD-libthread_db
-FreeBSD-libthread_db-lib32
-FreeBSD-libucl
-FreeBSD-libucl-lib32
-FreeBSD-libucl-man
-FreeBSD-libvgl
-FreeBSD-libvgl-lib32
-FreeBSD-libvgl-man
-FreeBSD-libvmmapi
-FreeBSD-lld
-FreeBSD-lld-man
-FreeBSD-lldb
-FreeBSD-lldb-man
-FreeBSD-locales
-FreeBSD-mlx-tools
-FreeBSD-mlx-tools-man
-FreeBSD-mtree
-FreeBSD-mtree-man
-FreeBSD-natd
-FreeBSD-natd-lib32
-FreeBSD-natd-man
-FreeBSD-netmap
-FreeBSD-netmap-lib32
-FreeBSD-netmap-man
-FreeBSD-newsyslog
-FreeBSD-newsyslog-man
-FreeBSD-nfs
-FreeBSD-nfs-man
-FreeBSD-nvme-tools
-FreeBSD-nvme-tools-man
-FreeBSD-openssl
-FreeBSD-openssl-lib
-FreeBSD-openssl-lib-lib32
-FreeBSD-openssl-lib-man
-FreeBSD-openssl-man
-FreeBSD-periodic
-FreeBSD-periodic-man
-FreeBSD-pf
-FreeBSD-pf-man
-FreeBSD-pkg-bootstrap
-FreeBSD-pkg-bootstrap-man
-FreeBSD-ppp
-FreeBSD-ppp-man
-FreeBSD-quotacheck
-FreeBSD-quotacheck-man
-FreeBSD-rc
-FreeBSD-rc-man
-FreeBSD-rcmds
-FreeBSD-rcmds-man
-FreeBSD-rdma
-FreeBSD-rdma-man
-FreeBSD-rescue
-FreeBSD-resolvconf
-FreeBSD-resolvconf-man
-FreeBSD-runtime
-FreeBSD-runtime-lib32
-FreeBSD-runtime-man
-FreeBSD-smbutils
-FreeBSD-smbutils-lib32
-FreeBSD-smbutils-man
-FreeBSD-ssh
-FreeBSD-ssh-lib32
-FreeBSD-ssh-man
-FreeBSD-syscons
-FreeBSD-syslogd
-FreeBSD-syslogd-man
-FreeBSD-tcpd
-FreeBSD-tcpd-lib32
-FreeBSD-tcpd-man
-FreeBSD-ufs
-FreeBSD-ufs-lib32
-FreeBSD-ufs-man
-FreeBSD-unbound
-FreeBSD-unbound-lib32
-FreeBSD-unbound-man
-FreeBSD-utilities
-FreeBSD-utilities-lib32
-FreeBSD-utilities-man
-FreeBSD-vi
-FreeBSD-vi-man
-FreeBSD-vt-data
-FreeBSD-wpa
-FreeBSD-wpa-man
-FreeBSD-yp
-FreeBSD-yp-man
-FreeBSD-zfs
-FreeBSD-zfs-lib32
-FreeBSD-zfs-man
-FreeBSD-zoneinfo
diff --git a/packages/xfce b/packages/xfce
index a67b7dc8..9633dd3a 100644
--- a/packages/xfce
+++ b/packages/xfce
@@ -1,5 +1,12 @@
 evince-lite
+evolution
 ffmpegthumbnailer
 ghostbsd-xfce-settings
 ghostbsd-xfce4
+gnome-keyring
+rhythmbox
+shotwell
+slick-greeter
+system-config-printer
+vlc
 xarchiver