diff --git a/recipes/wip/dev/godot4/recipe.toml b/recipes/wip/dev/godot4/recipe.toml
index 727b56c8aef29fc632c0c4607f407d0bafa1bcd5..b464adcd107475994827fcfd18d691ba9bbd9b18 100644
--- a/recipes/wip/dev/godot4/recipe.toml
+++ b/recipes/wip/dev/godot4/recipe.toml
@@ -1,11 +1,11 @@
 #TODO missing script for SCons, see https://docs.godotengine.org/en/stable/contributing/development/compiling/compiling_for_linuxbsd.html
+#TODO port to orbital
 #TODO missing dependencies
 [source]
 tar = "https://github.com/godotengine/godot/releases/download/4.1.3-stable/godot-4.1.3-stable.tar.xz"
 [build]
 template = "custom"
 dependencies = [
-    "libx11",
     "mesa",
-    "mesa_glu",
+    "mesa-glu",
 ]
diff --git a/recipes/wip/games/ship-of-harkinian/recipe.toml b/recipes/wip/games/ship-of-harkinian/recipe.toml
index 4b28cc426ee437e1f2e90f92fb97dae89b860a3c..c94e3c2aa43787a930f3b3fd0d5bbfd52df1b6e1 100644
--- a/recipes/wip/games/ship-of-harkinian/recipe.toml
+++ b/recipes/wip/games/ship-of-harkinian/recipe.toml
@@ -1,11 +1,11 @@
 #TODO missing script for CMake, see https://github.com/HarbourMasters/Shipwright/blob/develop/docs/BUILDING.md#linux
+#TODO port to orbital?
 [source]
 git = "https://github.com/HarbourMasters/Shipwright"
 rev = "818addfdda660f6b4b54edd19636d6fd9d839f28"
 [build]
 template = "custom"
 dependencies = [
-    "libx11",
     "sdl2",
     "libpng",
     "glew",
diff --git a/recipes/wip/games/vkquake/recipe.toml b/recipes/wip/games/vkquake/recipe.toml
index 34eb0db66a80ef513e21a3def04ddc44b4388a74..9131a3094d6bfc8fe23f393734b30cf48c258a8c 100644
--- a/recipes/wip/games/vkquake/recipe.toml
+++ b/recipes/wip/games/vkquake/recipe.toml
@@ -1,4 +1,5 @@
 #TODO missing script for Meson, see https://github.com/Novum/vkQuake#linux-1
+#TODO port to orbital?
 [source]
 git = "https://github.com/Novum/vkQuake"
 [build]
@@ -7,6 +8,5 @@ dependencies = [
     "sdl2",
     "libvulkan",
     "libvorbis",
-    "libx11",
     "libmad",
 ]
diff --git a/recipes/wip/games/vkquake2/recipe.toml b/recipes/wip/games/vkquake2/recipe.toml
index 5aef8b98c4a13c5267f8320a4bb7c625559ad6dc..05bffe148e371cbdd4974d1c9f6e01a8c89c3a4a 100644
--- a/recipes/wip/games/vkquake2/recipe.toml
+++ b/recipes/wip/games/vkquake2/recipe.toml
@@ -1,4 +1,5 @@
 #TODO missing script for "make", see https://github.com/kondrak/vkQuake2#linux
+#TODO port to orbital
 [source]
 git = "https://github.com/kondrak/vkQuake2"
 rev = "bdd39b142fbadf581fd9d904968a83fb9b4a929a"
@@ -6,6 +7,4 @@ rev = "bdd39b142fbadf581fd9d904968a83fb9b4a929a"
 template = "custom"
 dependencies = [
     "mesa",
-    "libx11",
-    "libxcb",
 ]
diff --git a/recipes/wip/graphics/glou/recipe.toml b/recipes/wip/graphics/glou/recipe.toml
index 646f237e0e5762f1b4b656fcf88299ffe3c99956..dd3e9ea2aac7ba8d4cc05c654521aa8b366ed8c0 100644
--- a/recipes/wip/graphics/glou/recipe.toml
+++ b/recipes/wip/graphics/glou/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb crate error
+#TODO port to orbital
 [source]
 git = "https://github.com/Nurrl/glou"
 [build]
diff --git a/recipes/wip/graphics/krita/recipe.toml b/recipes/wip/graphics/krita/recipe.toml
index 3436057364206af5ca59d03c2bfbea9878f6de98..85a19655744fbced1b35b74ccd571619bcab9e55 100644
--- a/recipes/wip/graphics/krita/recipe.toml
+++ b/recipes/wip/graphics/krita/recipe.toml
@@ -1,4 +1,5 @@
 #TODO probably wrong script, see https://docs.krita.org/en/untranslatable_pages/building_krita.html#building-on-linux
+#TODO port to orbital
 #TODO maybe missing dependencies
 [source]
 tar = "https://download.kde.org/stable/krita/5.2.1/krita-5.2.1.tar.gz"
@@ -19,7 +20,6 @@ dependencies = [
     "libwebp",
     "qt5-base",
     "qt5-svg",
-    "qt5-x11extras",
     "zlib",
     "libmypaint",
     "boost",
@@ -41,7 +41,6 @@ dependencies = [
     "openexr",
     "openjpeg",
     "sdl2",
-    "libxcb",
     "libxi",
     "zlib",
     "libeigen",
diff --git a/recipes/wip/libs/fltk/recipe.toml b/recipes/wip/libs/fltk/recipe.toml
index c2e062dcfe6203e55ac01abbb64769105eb8da14..3589511469e3a8a3bd0fd8ee19aceff183ad7abe 100644
--- a/recipes/wip/libs/fltk/recipe.toml
+++ b/recipes/wip/libs/fltk/recipe.toml
@@ -1,4 +1,5 @@
 #TODO probably wrong script, see https://github.com/fltk/fltk/blob/master/README.Unix.txt
+#TODO port to orbital
 [source]
 tar = "https://www.fltk.org/pub/fltk/1.3.8/fltk-1.3.8-source.tar.bz2"
 [build]
@@ -6,12 +7,11 @@ template = "configure"
 dependencies = [
     "mesa-glu",
     "freeglut",
-    "cairo"
+    "cairo",
     "fontconfig",
     "glew",
     "libjpeg",
     "libpng",
     "pango",
     "zlib",
-    "libx11",
 ]
diff --git a/recipes/wip/security/cotp/recipe.toml b/recipes/wip/security/cotp/recipe.toml
index 9d783b910dbc684f696c178cbdd8da450e8262f7..db61713b1abc4fcdf6088f8552d0f70f30e926b0 100644
--- a/recipes/wip/security/cotp/recipe.toml
+++ b/recipes/wip/security/cotp/recipe.toml
@@ -1,11 +1,8 @@
-#TODO make dependencies work
+#TODO port to orbital
 [source]
 git = "https://github.com/replydev/cotp"
 [build]
 template = "cargo"
 dependencies = [
-    "libxcb",
-    "libx11",
-    "libxfixes",
     "libxkbcommon",
 ]
diff --git a/recipes/wip/security/motus/recipe.toml b/recipes/wip/security/motus/recipe.toml
index 1ab9b6ad1607512b21130e697d677efdfdac40f5..f42ede331157d32f822b52a98dc161d3cfecf5be 100644
--- a/recipes/wip/security/motus/recipe.toml
+++ b/recipes/wip/security/motus/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb crate error
+#TODO port to orbital
 [source]
 git = "https://github.com/oleiade/motus"
 [build]
diff --git a/recipes/wip/sound/pcmg/recipe.toml b/recipes/wip/sound/pcmg/recipe.toml
index c5186fcd58958bbefa46c5a20d110ee613e09d36..542b7cced12aa28b5b333a70d9e9503812691a08 100644
--- a/recipes/wip/sound/pcmg/recipe.toml
+++ b/recipes/wip/sound/pcmg/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb crate error
+#TODO port to orbital
 #TODO require WebAssembly
 [source]
 git = "https://github.com/JohnDowson/pcmg"
diff --git a/recipes/wip/tools/cb/recipe.toml b/recipes/wip/tools/cb/recipe.toml
index 1b7ee865e5407bbebfc7bfd004057cea297db0bb..16dd19dbeee6d48ebf812d90e301f2d6967634ad 100644
--- a/recipes/wip/tools/cb/recipe.toml
+++ b/recipes/wip/tools/cb/recipe.toml
@@ -1,5 +1,5 @@
-#TODO missing script for "make", see https://github.com/yaa110/cb#build-manually
-#TODO add the X11 libraries
+#TODO figure out how to build this, see https://github.com/yaa110/cb#build-manually
+#TODO port to orbital
 [source]
 git = "https://github.com/yaa110/cb"
 [build]
diff --git a/recipes/wip/tools/cute/recipe.toml b/recipes/wip/tools/cute/recipe.toml
index ce07247e5587c0ed0e4cd7a7c7396e7dc09795ad..82217cd67060b0556465d93fd8a5cbfac4aaf0c3 100644
--- a/recipes/wip/tools/cute/recipe.toml
+++ b/recipes/wip/tools/cute/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb crate error
+#TODO port to orbital
 [source]
 git = "https://github.com/PThorpe92/CuTE"
 [build]
diff --git a/recipes/wip/tools/glsl-viewer/recipe.toml b/recipes/wip/tools/glsl-viewer/recipe.toml
index f5d9519097adf5c78a080bdb7657bff1d6a4027f..a844dbfefd71d858e717d05d1c99d7d9ac618fae 100644
--- a/recipes/wip/tools/glsl-viewer/recipe.toml
+++ b/recipes/wip/tools/glsl-viewer/recipe.toml
@@ -1,5 +1,5 @@
-#TODO missing script for CMake, see https://github.com/patriciogonzalezvivo/glslViewer/wiki/Compile-on-linux#3-compile
-#TODO determine the X11 libraries
+#TODO missing script for cmake, see https://github.com/patriciogonzalezvivo/glslViewer/wiki/Compile-on-linux#3-compile
+#TODO port to orbital
 [source]
 git = "https://github.com/patriciogonzalezvivo/glslViewer"
 rev = "7eb6254cb4cedf03f1c78653f90905fe0c3b48fb"
diff --git a/recipes/wip/tools/iamb/recipe.toml b/recipes/wip/tools/iamb/recipe.toml
index 92a67f278a642b9ba7ddd71dd766c4ba5fd1d784..0393431612e926fe1b70a301e3939792650939bd 100644
--- a/recipes/wip/tools/iamb/recipe.toml
+++ b/recipes/wip/tools/iamb/recipe.toml
@@ -1,4 +1,4 @@
-#TODO x11rb crate error (after a patch on ring)
+#TODO port to orbital (after a patch on ring)
 [source]
 git = "https://github.com/ulyssa/iamb"
 [build]
diff --git a/recipes/wip/tools/keepassxc/recipe.toml b/recipes/wip/tools/keepassxc/recipe.toml
index 3efeb2ee6078b76d5c2d3b8165635f7b0c0ab3b3..ab1148bd0eacf92464430f10418dc46b5f50520b 100644
--- a/recipes/wip/tools/keepassxc/recipe.toml
+++ b/recipes/wip/tools/keepassxc/recipe.toml
@@ -1,4 +1,5 @@
 #TODO probably wrong script, see https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#linux
+#TODO port to orbital
 #TODO probably missing dependencies, see https://github.com/keepassxreboot/keepassxc/wiki/Set-up-Build-Environment-on-Linux#install-the-required-dependencies
 [source]
 tar = "https://github.com/keepassxreboot/keepassxc/releases/download/2.7.6/keepassxc-2.7.6-src.tar.xz"
@@ -7,7 +8,6 @@ template = "custom"
 dependencies = [
     "qt5-base",
     "qt5-svg",
-    "qt5-x11extras",
     "zlib",
     "libbotan",
     "libargon2",
diff --git a/recipes/wip/tools/mangohud/recipe.toml b/recipes/wip/tools/mangohud/recipe.toml
index 1ddb7f9be8f01cac5fe1c74a4b06d0a6bef674ae..83480f5a77439bf691ae26a90abe443d5e980efb 100644
--- a/recipes/wip/tools/mangohud/recipe.toml
+++ b/recipes/wip/tools/mangohud/recipe.toml
@@ -1,9 +1,9 @@
 #TODO missing script for Meson, see https://github.com/flightlessmango/MangoHud#installation---build-from-source
+#TODO port to orbital
 [source]
 tar = "https://github.com/flightlessmango/MangoHud/releases/download/v0.7.0/MangoHud-v0.7.0-Source.tar.xz"
 [build]
 template = "custom"
 dependencies = [
     "mesa",
-    "libx11",
 ]
diff --git a/recipes/wip/tools/odin2/recipe.toml b/recipes/wip/tools/odin2/recipe.toml
index d66d566918bd08d3596db473577dfe35d0783787..460de8968d2808ebc2badee8fa143e84000e8593 100644
--- a/recipes/wip/tools/odin2/recipe.toml
+++ b/recipes/wip/tools/odin2/recipe.toml
@@ -1,4 +1,5 @@
 #TODO missing script for CMake, see https://github.com/TheWaveWarden/odin2#all-platforms
+#TODO port to orbital
 [source]
 git = "https://github.com/TheWaveWarden/odin2"
 [build]
@@ -6,6 +7,5 @@ template = "custom"
 dependencies = [
     "mesa",
     "curl",
-    "libx11",
     "webkitgtk3",
 ]