diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index d1fdbea..7a28d1d 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -168,24 +168,6 @@
       <packagereq variant="BaseOS">xfsprogs</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <name>base-x</name>
-    <description>Local X.org display server</description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="AppStream">glx-utils</packagereq>
-      <packagereq variant="AppStream">mesa-dri-drivers</packagereq>
-      <packagereq variant="AppStream">plymouth-system-theme</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-evdev</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="AppStream">xorg-x11-server-Xorg</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xauth</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xinit</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>cloud-bootloader-tools</id>
     <name>cloud-bootloader-tools</name>
@@ -406,7 +388,6 @@
       <packagereq variant="AppStream">gnome-disk-utility</packagereq>
       <packagereq variant="AppStream">gnome-font-viewer</packagereq>
       <packagereq variant="AppStream">gnome-initial-setup</packagereq>
-      <packagereq variant="AppStream">gnome-logs</packagereq>
       <packagereq variant="AppStream">gnome-remote-desktop</packagereq>
       <packagereq variant="AppStream">gnome-session-wayland-session</packagereq>
       <packagereq variant="AppStream">gnome-session-xsession</packagereq>
@@ -428,8 +409,7 @@
       <packagereq variant="AppStream" type="optional">gnome-shell-extension-workspace-indicator</packagereq>
       <packagereq variant="AppStream">gnome-software</packagereq>
       <packagereq variant="AppStream">gnome-system-monitor</packagereq>
-      <packagereq variant="AppStream">gnome-terminal</packagereq>
-      <packagereq variant="AppStream">gnome-terminal-nautilus</packagereq>
+      <packagereq variant="AppStream">ptyxis</packagereq>
       <packagereq variant="AppStream">gnome-user-docs</packagereq>
       <packagereq variant="AppStream">gvfs-fuse</packagereq>
       <packagereq variant="AppStream">gvfs-goa</packagereq>
@@ -506,7 +486,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>
@@ -595,7 +574,6 @@
       <packagereq variant="BaseOS" type="default">cyrus-sasl</packagereq>
       <packagereq variant="AppStream" type="default">postfix</packagereq>
       <packagereq variant="AppStream" type="default">dovecot</packagereq>
-      <packagereq variant="AppStream" type="default">spamassassin</packagereq>
       <packagereq variant="AppStream" type="optional">cyrus-imapd</packagereq>
       <packagereq variant="AppStream" type="optional">dovecot-pigeonhole</packagereq>
       <packagereq variant="AppStream" type="optional">postfix-cdb</packagereq>
@@ -1226,7 +1204,6 @@
       <packagereq variant="AppStream" type="default">NetworkManager-libreswan</packagereq>
       <packagereq variant="AppStream" type="default">nmap</packagereq>
       <packagereq variant="AppStream" type="optional">aide</packagereq>
-      <packagereq variant="AppStream" type="optional">bacula-client</packagereq>
       <packagereq variant="AppStream" type="optional">convmv</packagereq>
       <packagereq variant="AppStream" type="optional">createrepo_c</packagereq>
       <packagereq variant="AppStream" type="optional">freerdp</packagereq>
@@ -1659,7 +1636,6 @@
       <packagereq variant="AppStream">setroubleshoot</packagereq>
       <packagereq variant="AppStream">telnet</packagereq>
       <packagereq variant="AppStream" arch="x86_64">thermald</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
       <packagereq variant="AppStream" arch="x86_64">alsa-sof-firmware</packagereq>
     </packagelist>
   </group>
@@ -2175,7 +2151,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq type="optional" arch="x86_64,ppc64le,s390x">rear</packagereq>
     </packagelist>
   </group>
@@ -2475,7 +2450,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -2822,7 +2796,6 @@
       <packagereq type="default">libXfont2-devel</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
@@ -2845,7 +2818,6 @@
       <packagereq type="default">mariadb-test</packagereq>
       <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">mecab-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">memkind-devel</packagereq>
       <packagereq type="default">mesa-libgbm-devel</packagereq>
       <packagereq type="default">mesa-libGLES-devel</packagereq>
       <packagereq type="default">mesa-libOSMesa-devel</packagereq>
@@ -2945,8 +2917,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -3389,12 +3359,6 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>
@@ -3476,6 +3440,9 @@
       <packagereq type="default">freerdp-server</packagereq>
       <packagereq type="default">gnome-autoar-devel</packagereq>
       <packagereq type="default">libmtp-examples</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 5f2c420..4e0700c 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -168,24 +168,6 @@
       <packagereq variant="BaseOS">xfsprogs</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>base-x</id>
-    <_name>base-x</_name>
-    <_description>Local X.org display server</_description>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq variant="AppStream">glx-utils</packagereq>
-      <packagereq variant="AppStream">mesa-dri-drivers</packagereq>
-      <packagereq variant="AppStream">plymouth-system-theme</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-evdev</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
-      <packagereq variant="AppStream">xorg-x11-server-Xorg</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xauth</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xinit</packagereq>
-      <packagereq variant="AppStream">xorg-x11-xinit-session</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>cloud-bootloader-tools</id>
     <_name>cloud-bootloader-tools</_name>
@@ -406,7 +388,6 @@
       <packagereq variant="AppStream">gnome-disk-utility</packagereq>
       <packagereq variant="AppStream">gnome-font-viewer</packagereq>
       <packagereq variant="AppStream">gnome-initial-setup</packagereq>
-      <packagereq variant="AppStream">gnome-logs</packagereq>
       <packagereq variant="AppStream">gnome-remote-desktop</packagereq>
       <packagereq variant="AppStream">gnome-session-wayland-session</packagereq>
       <packagereq variant="AppStream">gnome-session-xsession</packagereq>
@@ -428,8 +409,7 @@
       <packagereq type="optional" variant="AppStream">gnome-shell-extension-workspace-indicator</packagereq>
       <packagereq variant="AppStream">gnome-software</packagereq>
       <packagereq variant="AppStream">gnome-system-monitor</packagereq>
-      <packagereq variant="AppStream">gnome-terminal</packagereq>
-      <packagereq variant="AppStream">gnome-terminal-nautilus</packagereq>
+      <packagereq variant="AppStream">ptyxis</packagereq>
       <packagereq variant="AppStream">gnome-user-docs</packagereq>
       <packagereq variant="AppStream">gvfs-fuse</packagereq>
       <packagereq variant="AppStream">gvfs-goa</packagereq>
@@ -506,7 +486,6 @@
       <packagereq type="default">iwlwifi-mvm-firmware</packagereq>
       <packagereq type="default">netronome-firmware</packagereq>
       <packagereq type="default">libertas-sd8787-firmware</packagereq>
-      <packagereq type="default">usb_modeswitch</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
       <packagereq type="optional">opensc</packagereq>
       <packagereq type="optional">openssl-pkcs11</packagereq>
@@ -595,7 +574,6 @@
       <packagereq type="default" variant="BaseOS">cyrus-sasl</packagereq>
       <packagereq type="default" variant="AppStream">postfix</packagereq>
       <packagereq type="default" variant="AppStream">dovecot</packagereq>
-      <packagereq type="default" variant="AppStream">spamassassin</packagereq>
       <packagereq type="optional" variant="AppStream">cyrus-imapd</packagereq>
       <packagereq type="optional" variant="AppStream">dovecot-pigeonhole</packagereq>
       <packagereq type="optional" variant="AppStream">postfix-cdb</packagereq>
@@ -1226,7 +1204,6 @@
       <packagereq type="default" variant="AppStream">NetworkManager-libreswan</packagereq>
       <packagereq type="default" variant="AppStream">nmap</packagereq>
       <packagereq type="optional" variant="AppStream">aide</packagereq>
-      <packagereq type="optional" variant="AppStream">bacula-client</packagereq>
       <packagereq type="optional" variant="AppStream">convmv</packagereq>
       <packagereq type="optional" variant="AppStream">createrepo_c</packagereq>
       <packagereq type="optional" variant="AppStream">freerdp</packagereq>
@@ -1659,7 +1636,6 @@
       <packagereq variant="AppStream">setroubleshoot</packagereq>
       <packagereq variant="AppStream">telnet</packagereq>
       <packagereq variant="AppStream" arch="x86_64">thermald</packagereq>
-      <packagereq variant="AppStream">xorg-x11-drv-libinput</packagereq>
       <packagereq variant="AppStream" arch="x86_64">alsa-sof-firmware</packagereq>
     </packagelist>
   </group>
@@ -2438,8 +2414,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">bacula-director</packagereq>
-      <packagereq type="mandatory">bacula-storage</packagereq>
       <packagereq>mt-st</packagereq>
     </packagelist>
   </group> -->
@@ -2450,7 +2424,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="optional">bacula-client</packagereq>
       <packagereq arch="x86_64,ppc64le,s390x" type="optional">rear</packagereq>
     </packagelist>
   </group>
@@ -2750,7 +2723,6 @@
       <packagereq type="default">flexiblas-devel</packagereq>
       <packagereq type="default">flite</packagereq>
       <packagereq type="default">flite-devel</packagereq>
-      <packagereq type="default">fltk-devel</packagereq>
       <packagereq type="default">fontawesome-fonts-web</packagereq>
       <packagereq type="default">fontconfig-devel-doc</packagereq>
       <packagereq type="default">fontpackages-devel</packagereq>
@@ -3097,7 +3069,6 @@
       <packagereq type="default">libXfont2-devel</packagereq>
       <packagereq type="default">libxkbcommon-x11-devel</packagereq>
       <packagereq type="default">libxkbfile-devel</packagereq>
-      <packagereq type="default">libxklavier-devel</packagereq>
       <packagereq type="default">libXres-devel</packagereq>
       <packagereq type="default">libXxf86vm-devel</packagereq>
       <packagereq type="default">libyaml-devel</packagereq>
@@ -3120,7 +3091,6 @@
       <packagereq type="default">mariadb-test</packagereq>
       <packagereq type="default">marshalparser</packagereq>
       <packagereq type="default">mecab-devel</packagereq>
-      <packagereq type="default" arch="aarch64,ppc64le,x86_64">memkind-devel</packagereq>
       <packagereq type="default">mesa-libgbm-devel</packagereq>
       <packagereq type="default">mesa-libGLES-devel</packagereq>
       <packagereq type="default">mesa-libOSMesa-devel</packagereq>
@@ -3220,8 +3190,6 @@
       <packagereq type="default">ocaml-camomile-devel</packagereq>
       <packagereq type="default">ocaml-compiler-libs</packagereq>
       <packagereq type="default">ocaml-cppo</packagereq>
-      <packagereq type="default">ocaml-csexp</packagereq>
-      <packagereq type="default">ocaml-csexp-devel</packagereq>
       <packagereq type="default">ocaml-csv</packagereq>
       <packagereq type="default">ocaml-csv-devel</packagereq>
       <packagereq type="default">ocaml-curses</packagereq>
@@ -3664,12 +3632,6 @@
       <packagereq type="default">xmvn-minimal</packagereq>
       <packagereq type="default">xmvn-mojo</packagereq>
       <packagereq type="default">xmvn-tools</packagereq>
-      <packagereq type="default">xorg-x11-drv-evdev-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-libinput-devel</packagereq>
-      <packagereq type="default">xorg-x11-drv-wacom-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-devel</packagereq>
-      <packagereq type="default">xorg-x11-server-source</packagereq>
-      <packagereq type="default">xorg-x11-util-macros</packagereq>
       <packagereq type="default">xorg-x11-xtrans-devel</packagereq>
       <packagereq type="default">xxhash-devel</packagereq>
       <packagereq type="default">xxhash-doc</packagereq>
@@ -3751,6 +3713,9 @@
       <packagereq type="default">freerdp-server</packagereq>
       <packagereq type="default">gnome-autoar-devel</packagereq>
       <packagereq type="default">libmtp-examples</packagereq>
+      <packagereq type="default">lmdb-devel</packagereq>
+      <packagereq type="default">xorg-x11-server-Xwayland-devel</packagereq>
+      <packagereq type="default">vulkan-utility-libraries-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">
diff --git a/comps-rocky-9-lh.xml.in b/comps-rocky-9-lh.xml.in
index 6dbea93..cc3c8d0 100644
--- a/comps-rocky-9-lh.xml.in
+++ b/comps-rocky-9-lh.xml.in
@@ -4033,6 +4033,7 @@
       <packagereq type="default">ocaml-augeas-devel</packagereq>
       <packagereq type="default">ledmon-devel</packagereq>
       <packagereq type="default">perl-libxml-perl</packagereq>
+      <packagereq type="default">libiptcdata-devel</packagereq>
     </packagelist>
   </group>
   <environment variant="BaseOS">