diff --git a/build.sh b/build.sh
index 18827ba..263bbbf 100755
--- a/build.sh
+++ b/build.sh
@@ -5,11 +5,6 @@ set -e -u
 cwd="$(realpath)"
 export cwd
 
-# Enhanced logging function
-log() {
-    echo "$(date '+%H:%M:%S') [BUILD] $*"
-}
-
 # Only run as superuser
 if [ "$(id -u)" != "0" ]; then
   echo "This script must be run as root" 1>&2
@@ -53,7 +48,7 @@ elif [ "${build_type}" = "release" ] ; then
 elif [ "${build_type}" = "unstable" ] ; then
   PKG_CONF="GhostBSD_Unstable"
 else
-  printf "\t-b Build type: unstable, testing, or release\n"
+  printf "\t-b Build type: unstable, testing, or release"
   exit 1
 fi
 
@@ -175,7 +170,6 @@ set_ghostbsd_version()
     base_version="-$(cat ${release}/etc/version)"
     date_suffix="-$(date +%m-%d-%H)"
     version="${base_version}${date_suffix}"
-    log "Adding date suffix for ${build_type} build: ${date_suffix}"
   else
     version="-$(cat ${release}/etc/version)"
   fi
@@ -213,8 +207,6 @@ fetch_x_drivers_packages()
 {
   if [ "${build_type}" = "release" ] ; then
     pkg_url=$(pkg -R pkg/ -vv | grep '/stable.*/latest' | cut -d '"' -f2)
-  elif [ "${build_type}" = "testing" ]; then
-    pkg_url=$(pkg -R pkg/ -vv | grep '/testing.*/latest' | cut -d '"' -f2)
   else
     pkg_url=$(pkg -R pkg/ -vv | grep '/unstable.*/latest' | cut -d '"' -f2)
   fi
diff --git a/packages/common b/packages/common
index b10206d..9c85dc5 100644
--- a/packages/common
+++ b/packages/common
@@ -25,8 +25,9 @@ shotwell
 slick-greeter
 system-config-printer
 unzip
-vlc
 webrtc-audio-processing
 xconfig
 xorg-minimal
 zip
+ly
+mpv
diff --git a/packages/drivers b/packages/drivers
index 9f57dab..4367ac1 100644
--- a/packages/drivers
+++ b/packages/drivers
@@ -7,11 +7,13 @@ realtek-re-kmod
 utouch-kmod
 virtualbox-ose-additions
 wifi-firmware-kmod
-xf86-input-evdev
-xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
-xf86-input-synaptics
-xf86-input-vmmouse
-xf86-video-scfb
-xf86-video-vesa
+wifi-firmware-rtw88-kmod
+xlibre-xf86-input-evdev
+xlibre-xf86-input-joystick
+xlibre-xf86-input-keyboard
+xlibre-xf86-input-mouse
+xlibre-xf86-input-synaptics
+xlibre-xf86-input-vmmouse
+xlibre-xf86-video-scfb
+xlibre-xf86-video-vesa
+xlibre-xf86-video-ati