diff --git a/config/x11.toml b/config/x11.toml
index dbbccc55e..c2a5bc851 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -12,29 +12,14 @@ filesystem_size = 2048
 # Package settings
 [packages]
 adwaita-icon-theme = {}
-caja = {}
 dbus = {}
 gtk3 = {}
-marco = {}
-mate-control-center = {}
-mate-icon-theme = {}
-mate-panel = {}
-mate-session-manager = {}
-mate-settings-daemon = {}
-mate-terminal = {}
+mate-common = {}
 mesa-demos-x11 = {}
 webkitgtk3 = {}
-xev = {}
-xeyes = {}
 #xfce4-panel = {}
 #xfwm4 = {}
-xinit = {}
-xkbcomp = {}
-xkbutils = {}
-xkeyboard-config = {}
-xserver-xorg = {}
-xserver-xorg-video-orbital = {}
-xterm = {}
+x11-full = {}
 zenity = {}
 
 [[files]]
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 1351e18d2..69a275204 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -15,6 +15,8 @@ prompt = false
 
 dev-essential = {}
 dev-redox = {}
+llvm21-common = {}
+mate-common = {}
 redox-tests = {}
 x11-minimal = {}
 x11-full = {}
@@ -22,6 +24,7 @@ x11-full = {}
 # Normal packages below
 
 acid = {}
+adwaita-icon-theme = {}
 autoconf = {}
 automake = {}
 base = {}
@@ -101,6 +104,7 @@ libuuid = {}
 libvorbis = {}
 libwebp = {}
 libxkbcommon = {}
+libxcursor = {}
 libxml2 = {}
 llvm21 = {}
 lsd = {}
@@ -109,6 +113,7 @@ lz4 = {}
 mednafen = {}
 mesa = {}
 mesa-glu = {}
+mesa-demos-x11 = {}
 mgba = {}
 nano = {}
 nasm = {}
@@ -185,8 +190,10 @@ shared-mime-info = {}
 shellharden = {}
 shellstorm = {}
 simple-http-server = {}
+smallvil = {}
 smith = {}
 sodium = {}
+softbuffer-wayland = {}
 sopwith = {}
 sqlite3 = {}
 strace = {}
@@ -199,20 +206,16 @@ userutils = {}
 uutils = {}
 vim = {}
 vttest = {}
+wayland-rs = {}
 webkitgtk3 = {}
 winit = {}
+winit-wayland = {}
 xxhash = {}
 xz = {}
+zenity = {}
 zlib = {}
 zstd = {}
 
-#"gcc13.cxx" = {}
-#"llvm21.clang" = {}
-#"llvm21.clang-dev" = {}
-#"llvm21.dev" = {}
-#"llvm21.lld" = {}
-#"llvm21.lld-dev" = {}
-#"llvm21.runtime" = {}
 #"python312.dev" = {}
 #"rust.doc" = {}
 #atk = {} # depends on glib which does not build
diff --git a/recipes/groups/dev-essential/recipe.toml b/recipes/groups/dev-essential/recipe.toml
index b6621ac86..f3bc72af1 100644
--- a/recipes/groups/dev-essential/recipe.toml
+++ b/recipes/groups/dev-essential/recipe.toml
@@ -4,7 +4,6 @@ dependencies = [
     "automake",
     "gcc13",
     "gcc13.cxx",
-    "llvm21",
     "gnu-binutils",
     "gnu-make",
     "gnu-grep",
diff --git a/recipes/groups/llvm21-common/recipe.toml b/recipes/groups/llvm21-common/recipe.toml
new file mode 100644
index 000000000..0a56afd54
--- /dev/null
+++ b/recipes/groups/llvm21-common/recipe.toml
@@ -0,0 +1,7 @@
+[package]
+dependencies = [
+    "clang21",
+    "llvm21",
+    "llvm21.runtime",
+    "lld21",
+]
diff --git a/recipes/groups/mate-common/recipe.toml b/recipes/groups/mate-common/recipe.toml
new file mode 100644
index 000000000..5861faef9
--- /dev/null
+++ b/recipes/groups/mate-common/recipe.toml
@@ -0,0 +1,11 @@
+[package]
+dependencies = [
+    "caja",
+    "marco",
+    "mate-control-center",
+    "mate-icon-theme",
+    "mate-panel",
+    "mate-session-manager",
+    "mate-settings-daemon",
+    "mate-terminal",
+]