diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml
index 76fb84db..2ce2e360 100644
--- a/config/aarch64/ci.toml
+++ b/config/aarch64/ci.toml
@@ -7,6 +7,20 @@ prompt = false
 
 # Package settings
 [packages]
+
+# If you need to disable some broken package comment out instead of removal to not increase the maintenance cost
+#TODO: commented out recipes need to be built and tested inside of Redox to verify if they returned to work
+
+# Meta-packages below
+
+# dev-essential = {}
+# dev-redox = {}
+# redox-tests = {}
+# x11-minimal = {}
+# x11-full = {}
+
+# Normal packages below
+
 acid = {}
 base = {}
 base-initfs = {}
@@ -32,8 +46,6 @@ freefont = {}
 freetype2 = {}
 gettext = {}
 git = {}
-# gdbserver = {} # wrong libc type
-# gnu-binutils = {} # bfd doesn't recognize redox
 gnu-make = {}
 hicolor-icon-theme = {}
 installer = {}
@@ -52,9 +64,6 @@ libstdcxx = {}
 libvorbis = {}
 libxkbcommon = {}
 libxml2 = {}
-# mesa = {} # libudev was not found
-# mesa-glu = {} # depends on mesa
-# mpc = {} # libmpfr not found
 nano = {}
 nasm = {}
 ncurses = {}
@@ -71,16 +80,15 @@ orbutils-background = {}
 orbutils-launcher = {}
 orbutils-orblogin = {}
 patch = {}
-pcre = {}
 patchelf = {}
-pop-icon-theme = {}
+pcre = {}
 pkgutils = {}
+pop-icon-theme = {}
 redoxfs = {}
 relibc = {}
 resist = {}
 ripgrep = {}
 rustpython = {}
-# strace = {} # unknown syscall
 sdl1 = {}
 sed = {}
 shared-mime-info = {}
@@ -88,6 +96,224 @@ smith = {}
 terminfo = {}
 userutils = {}
 uutils = {}
-xz = {}
 vim = {}
+xz = {}
 zlib = {}
+# #"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
+# #benchmarks = {}
+# #binutils-gdb = {}
+# #book = {}
+# #cairo-demo = {} # linking errors
+# #classicube = {}
+# #cmake = {}
+# #cmatrix = {} # needs ncursesw now
+# #cookbook = {}
+# #cosmic-reader = {}
+# #cosmic-settings = {}
+# #cosmic-store = {}
+# #devilutionx = {}
+# #dynamic-example = {}
+# #fal
+# #fd = {} # ctrlc-3.1.1
+# #file = {}
+# #flycast = {}
+# #freeciv = {}
+# #freeglut = {}
+# #friar = {} # mio patch
+# #game-2048 = {} # rustc-serialize
+# #gawk = {} # langinfo.h
+# #gigalomania = {} # old recipe format
+# #gitoxide = {}
+# #goaccess = {}
+# #gstreamer = {} # conflict with thread local errno
+# #harfbuzz = {} # depends on glib which does not build
+# #helix = {}
+# #hello-redox = {}
+# #hematite = {} # needs crate patches for redox-unix
+# #hf = {}
+# #ibm-plex = {}
+# #iced = {}
+# #jansson = {} # needs config.sub update
+# #jq = {}
+# #libarchive = {}
+# #libatomic = {}
+# #libcosmic = {}
+# #libflac = {}
+# #libmodplug1 = {}
+# #libmpfr = {}
+# #libnettle = {}
+# #libogg = {}
+# #libpsl = {}
+# #libssh2 = {}
+# #libtool = {}
+# #liburcu = {}
+# #libuv = {}
+# #lua-compat-53 = {}
+# #luajit = {}
+# #luarocks = {}
+# #luv = {}
+# #mdp = {} # gcc hangs
+# #miniserve = {} # actix
+# #mpc = {}
+# #mupen64plus = {}
+# #ncdu = {} # multiple definitions of symbols
+# #newlib = {} # obsolete
+# #newlibtest = {} # obsolete
+# #noto-color-emoji = {}
+# #nushell = {} # needs cargo update
+# #openjk = {}
+# #openposixtestsuite = {}
+# #opentyrian = {}
+# #orbcalculator = {}
+# #ostest-bins = {}
+# #pango = {} # undefined references to std::__throw_system_error(int)
+# #pastel = {} # needs crate patches for redox-unix
+# #pathfinder = {} # servo-fontconfig
+# #pciids = {}
+# #pcre2 = {}
+# #pixman = {} # depends on glib which does not build
+# #pkgar = {} # uses virtual Cargo.toml, needs recipe update
+# #pls = {}
+# #pop-wallpapers = {}
+# #powerline = {} # dirs
+# #qemu = {} # can be built, but not working
+# #quakespasm = {}
+# #redox-posix-tests = {}
+# #redox-ssh = {} # does not compile
+# #retroarch = {} # OS_TLSIndex not declared
+# #rust-cairo = {} # linking errors
+# #rust-cairo-demo = {} # linking errors
+# #rvvm = {}
+# #schismtracker = {} # uses system includes
+# #sdl-player = {} # wctype_t
+# #sdl2-gfx = {}
+# #sm64ex = {}
+# #spacecadetpinball = {}
+# #termplay = {} # backtrace cannot find link.h
+# #twin-commander = {}
+# #ubuntu-wallpapers = {}
+# #unibilium = {}
+# #utf8proc = {}
+# #vice = {} # linker errors
+# #vvvvvv = {} # did not compile
+# #webrender = {} # unwind
+# #website = {}
+# #wesnoth = {}
+# #wget = {}
+# autoconf = {}
+# automake = {}
+# binutils = {}
+# bzip2 = {}
+# cairo = {}
+# cleye = {}
+# composer = {}
+# cpal = {}
+# dosbox = {}
+# duktape = {}
+# eduke32 = {}
+# exampled = {}
+# expat = {}
+# extrautils = {}
+# ffmpeg6 = {}
+# fontconfig = {}
+# freedoom = {}
+# freepats = {}
+# fribidi = {}
+# gcc13 = {}
+# gdbserver = {} # wrong libc type
+# gdk-pixbuf = {}
+# gears = {}
+# generaluser-gs = {}
+# glib = {}
+# glutin = {}
+# gnu-binutils = {} # bfd doesn't recognize redox
+# gnu-grep = {}
+# htop = {}
+# intel-one-mono = {}
+# lci = {}
+# libavif = {}
+# libc-bench = {}
+# libedit = {}
+# libgmp = {}
+# libicu = {}
+# libonig = {}
+# libsodium = {}
+# libuuid = {}
+# libwebp = {}
+# llvm21 = {}
+# lsd = {}
+# lua54 = {}
+# lz4 = {}
+# mednafen = {}
+# mesa = {} # libudev was not found
+# mesa-glu = {} # depends on mesa
+# mgba = {}
+# mpc = {} # libmpfr not found
+# ncursesw = {}
+# neverball = {}
+# nginx = {}
+# onefetch = {}
+# openjazz = {}
+# openssh = {}
+# openssl3 = {}
+# openttd = {}
+# openttd-opengfx = {}
+# openttd-openmsx = {}
+# openttd-opensfx = {}
+# orbclient = {}
+# osdemo = {}
+# perg = {}
+# periodictable = {}
+# perl5 = {}
+# php84 = {}
+# pixelcannon = {}
+# pkg-config = {}
+# prboom = {}
+# procedural-wallpapers-rs = {}
+# python312 = {}
+# readline = {}
+# redox-fatfs = {}
+# redox-games = {}
+# relibc-tests = {}
+# rodioplay = {}
+# rs-nes = {}
+# rsync = {}
+# rust = {}
+# rust64 = {}
+# rustual-boy = {}
+# scummvm = {}
+# sdl-gfx = {}
+# sdl1-image = {}
+# sdl1-mixer = {}
+# sdl1-ttf = {}
+# sdl2 = {}
+# sdl2-gears = {}
+# sdl2-image = {}
+# sdl2-mixer = {}
+# sdl2-ttf = {}
+# servo = {}
+# shellharden = {}
+# shellstorm = {}
+# simple-http-server = {}
+# sodium = {}
+# sopwith = {}
+# sqlite3 = {}
+# strace = {} # unknown syscall
+# syobonaction = {}
+# timidity = {}
+# tokei = {}
+# ttf-hack = {}
+# vttest = {}
+# webkitgtk3 = {}
+# winit = {}
+# xxhash = {}
+# zstd = {}
diff --git a/config/i586/ci.toml b/config/i586/ci.toml
index 8c6105c9..090d252b 100644
--- a/config/i586/ci.toml
+++ b/config/i586/ci.toml
@@ -7,6 +7,20 @@ prompt = false
 
 # Package settings
 [packages]
+
+# If you need to disable some broken package comment out instead of removal to not increase the maintenance cost
+#TODO: commented out recipes need to be built and tested inside of Redox to verify if they returned to work
+
+# Meta-packages below
+
+# dev-essential = {}
+# dev-redox = {}
+# redox-tests = {}
+# x11-minimal = {}
+# x11-full = {}
+
+# Normal packages below
+
 acid = {}
 base = {}
 base-initfs = {}
@@ -85,3 +99,219 @@ uutils = {}
 xz = {}
 #vim = {} # conflicting types
 zlib = {}
+
+# #"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
+# #benchmarks = {}
+# #binutils-gdb = {}
+# #book = {}
+# #cairo-demo = {} # linking errors
+# #classicube = {}
+# #cmake = {}
+# #cmatrix = {} # needs ncursesw now
+# #cookbook = {}
+# #cosmic-reader = {}
+# #cosmic-settings = {}
+# #cosmic-store = {}
+# #devilutionx = {}
+# #dynamic-example = {}
+# #fal
+# #fd = {} # ctrlc-3.1.1
+# #file = {}
+# #flycast = {}
+# #freeciv = {}
+# #freeglut = {}
+# #friar = {} # mio patch
+# #game-2048 = {} # rustc-serialize
+# #gawk = {} # langinfo.h
+# #gigalomania = {} # old recipe format
+# #gitoxide = {}
+# #goaccess = {}
+# #gstreamer = {} # conflict with thread local errno
+# #harfbuzz = {} # depends on glib which does not build
+# #helix = {}
+# #hello-redox = {}
+# #hematite = {} # needs crate patches for redox-unix
+# #hf = {}
+# #ibm-plex = {}
+# #iced = {}
+# #jansson = {} # needs config.sub update
+# #jq = {}
+# #libarchive = {}
+# #libatomic = {}
+# #libcosmic = {}
+# #libflac = {}
+# #libmodplug1 = {}
+# #libmpfr = {}
+# #libnettle = {}
+# #libogg = {}
+# #libpsl = {}
+# #libssh2 = {}
+# #libtool = {}
+# #liburcu = {}
+# #libuv = {}
+# #lua-compat-53 = {}
+# #luajit = {}
+# #luarocks = {}
+# #luv = {}
+# #mdp = {} # gcc hangs
+# #miniserve = {} # actix
+# #mpc = {}
+# #mupen64plus = {}
+# #ncdu = {} # multiple definitions of symbols
+# #newlib = {} # obsolete
+# #newlibtest = {} # obsolete
+# #noto-color-emoji = {}
+# #nushell = {} # needs cargo update
+# #openjk = {}
+# #openposixtestsuite = {}
+# #opentyrian = {}
+# #orbcalculator = {}
+# #ostest-bins = {}
+# #pango = {} # undefined references to std::__throw_system_error(int)
+# #pastel = {} # needs crate patches for redox-unix
+# #pathfinder = {} # servo-fontconfig
+# #pciids = {}
+# #pcre2 = {}
+# #pixman = {} # depends on glib which does not build
+# #pkgar = {} # uses virtual Cargo.toml, needs recipe update
+# #pls = {}
+# #pop-wallpapers = {}
+# #powerline = {} # dirs
+# #qemu = {} # can be built, but not working
+# #quakespasm = {}
+# #redox-posix-tests = {}
+# #redox-ssh = {} # does not compile
+# #retroarch = {} # OS_TLSIndex not declared
+# #rust-cairo = {} # linking errors
+# #rust-cairo-demo = {} # linking errors
+# #rvvm = {}
+# #schismtracker = {} # uses system includes
+# #sdl-player = {} # wctype_t
+# #sdl2-gfx = {}
+# #sm64ex = {}
+# #spacecadetpinball = {}
+# #termplay = {} # backtrace cannot find link.h
+# #twin-commander = {}
+# #ubuntu-wallpapers = {}
+# #unibilium = {}
+# #utf8proc = {}
+# #vice = {} # linker errors
+# #vvvvvv = {} # did not compile
+# #webrender = {} # unwind
+# #website = {}
+# #wesnoth = {}
+# #wget = {}
+# autoconf = {}
+# automake = {}
+# binutils = {}
+# bzip2 = {}
+# cairo = {}
+# cleye = {}
+# composer = {}
+# cpal = {}
+# dosbox = {}
+# duktape = {}
+# eduke32 = {}
+# exampled = {}
+# ffmpeg6 = {}
+# fontconfig = {}
+# freedoom = {}
+# freepats = {}
+# fribidi = {}
+# gcc13 = {}
+# gdbserver = {}
+# gdk-pixbuf = {}
+# gears = {}
+# generaluser-gs = {}
+# glib = {}
+# glutin = {}
+# gnu-binutils = {}
+# gnu-grep = {}
+# htop = {}
+# intel-one-mono = {}
+# lci = {}
+# libavif = {}
+# libc-bench = {}
+# libedit = {}
+# libgmp = {}
+# libicu = {}
+# libonig = {}
+# libsodium = {}
+# libuuid = {}
+# libwebp = {}
+# llvm21 = {}
+# lsd = {}
+# lua54 = {}
+# lz4 = {}
+# mednafen = {}
+# mesa = {}
+# mesa-glu = {}
+# mgba = {}
+# ncursesw = {}
+# neverball = {}
+# nginx = {}
+# onefetch = {}
+# openjazz = {}
+# openssh = {}
+# openssl3 = {}
+# openttd = {}
+# openttd-opengfx = {}
+# openttd-openmsx = {}
+# openttd-opensfx = {}
+# orbclient = {}
+# osdemo = {}
+# perg = {}
+# periodictable = {}
+# perl5 = {}
+# php84 = {}
+# pixelcannon = {}
+# pkg-config = {}
+# prboom = {}
+# procedural-wallpapers-rs = {}
+# python312 = {}
+# readline = {}
+# redox-fatfs = {}
+# redox-games = {}
+# relibc-tests = {}
+# rodioplay = {}
+# rs-nes = {}
+# rsync = {}
+# rust = {}
+# rust64 = {}
+# rustual-boy = {}
+# scummvm = {}
+# sdl-gfx = {}
+# sdl1-image = {}
+# sdl1-mixer = {}
+# sdl1-ttf = {}
+# sdl2 = {}
+# sdl2-gears = {}
+# sdl2-image = {}
+# sdl2-mixer = {}
+# sdl2-ttf = {}
+# servo = {}
+# shellharden = {}
+# shellstorm = {}
+# simple-http-server = {}
+# sodium = {}
+# sopwith = {}
+# sqlite3 = {}
+# strace = {}
+# syobonaction = {}
+# timidity = {}
+# tokei = {}
+# ttf-hack = {}
+# vttest = {}
+# webkitgtk3 = {}
+# winit = {}
+# xxhash = {}
+# zstd = {}
diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml
index 6da302cb..fbb986a2 100644
--- a/config/riscv64gc/ci.toml
+++ b/config/riscv64gc/ci.toml
@@ -7,6 +7,20 @@ prompt = false
 
 # Package settings
 [packages]
+
+# If you need to disable some broken package comment out instead of removal to not increase the maintenance cost
+#TODO: commented out recipes need to be built and tested inside of Redox to verify if they returned to work
+
+# Meta-packages below
+
+# dev-essential = {}
+# dev-redox = {}
+# redox-tests = {}
+# x11-minimal = {}
+# x11-full = {}
+
+# Normal packages below
+
 acid = {}
 base = {}
 base-initfs = {}
@@ -85,3 +99,220 @@ uutils = {}
 xz = {}
 #vim = {} # error compiling ncurses
 zlib = {}
+
+# #"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
+# #benchmarks = {}
+# #binutils-gdb = {}
+# #book = {}
+# #cairo-demo = {} # linking errors
+# #classicube = {}
+# #cmake = {}
+# #cmatrix = {} # needs ncursesw now
+# #cookbook = {}
+# #cosmic-reader = {}
+# #cosmic-settings = {}
+# #cosmic-store = {}
+# #devilutionx = {}
+# #dynamic-example = {}
+# #fal
+# #fd = {} # ctrlc-3.1.1
+# #file = {}
+# #flycast = {}
+# #freeciv = {}
+# #freeglut = {}
+# #friar = {} # mio patch
+# #game-2048 = {} # rustc-serialize
+# #gawk = {} # langinfo.h
+# #gigalomania = {} # old recipe format
+# #gitoxide = {}
+# #goaccess = {}
+# #gstreamer = {} # conflict with thread local errno
+# #harfbuzz = {} # depends on glib which does not build
+# #helix = {}
+# #hello-redox = {}
+# #hematite = {} # needs crate patches for redox-unix
+# #hf = {}
+# #ibm-plex = {}
+# #iced = {}
+# #jansson = {} # needs config.sub update
+# #jq = {}
+# #libarchive = {}
+# #libatomic = {}
+# #libcosmic = {}
+# #libflac = {}
+# #libmodplug1 = {}
+# #libmpfr = {}
+# #libnettle = {}
+# #libogg = {}
+# #libpsl = {}
+# #libssh2 = {}
+# #libtool = {}
+# #liburcu = {}
+# #libuv = {}
+# #lua-compat-53 = {}
+# #luajit = {}
+# #luarocks = {}
+# #luv = {}
+# #mdp = {} # gcc hangs
+# #miniserve = {} # actix
+# #mpc = {}
+# #mupen64plus = {}
+# #ncdu = {} # multiple definitions of symbols
+# #newlib = {} # obsolete
+# #newlibtest = {} # obsolete
+# #noto-color-emoji = {}
+# #nushell = {} # needs cargo update
+# #openjk = {}
+# #openposixtestsuite = {}
+# #opentyrian = {}
+# #orbcalculator = {}
+# #ostest-bins = {}
+# #pango = {} # undefined references to std::__throw_system_error(int)
+# #pastel = {} # needs crate patches for redox-unix
+# #pathfinder = {} # servo-fontconfig
+# #pciids = {}
+# #pcre2 = {}
+# #pixman = {} # depends on glib which does not build
+# #pkgar = {} # uses virtual Cargo.toml, needs recipe update
+# #pls = {}
+# #pop-wallpapers = {}
+# #powerline = {} # dirs
+# #qemu = {} # can be built, but not working
+# #quakespasm = {}
+# #redox-posix-tests = {}
+# #redox-ssh = {} # does not compile
+# #retroarch = {} # OS_TLSIndex not declared
+# #rust-cairo = {} # linking errors
+# #rust-cairo-demo = {} # linking errors
+# #rvvm = {}
+# #schismtracker = {} # uses system includes
+# #sdl-player = {} # wctype_t
+# #sdl2-gfx = {}
+# #sm64ex = {}
+# #spacecadetpinball = {}
+# #termplay = {} # backtrace cannot find link.h
+# #twin-commander = {}
+# #ubuntu-wallpapers = {}
+# #unibilium = {}
+# #utf8proc = {}
+# #vice = {} # linker errors
+# #vvvvvv = {} # did not compile
+# #webrender = {} # unwind
+# #website = {}
+# #wesnoth = {}
+# #wget = {}
+# autoconf = {}
+# automake = {}
+# binutils = {}
+# bzip2 = {}
+# cairo = {}
+# cleye = {}
+# composer = {}
+# cosmic-text = {}
+# cpal = {}
+# dosbox = {}
+# duktape = {}
+# eduke32 = {}
+# exampled = {}
+# ffmpeg6 = {}
+# fontconfig = {}
+# freedoom = {}
+# freepats = {}
+# fribidi = {}
+# gcc13 = {}
+# gdbserver = {}
+# gdk-pixbuf = {}
+# gears = {}
+# generaluser-gs = {}
+# glib = {}
+# glutin = {}
+# gnu-binutils = {}
+# gnu-grep = {}
+# htop = {}
+# intel-one-mono = {}
+# lci = {}
+# libavif = {}
+# libc-bench = {}
+# libedit = {}
+# libgmp = {}
+# libicu = {}
+# libonig = {}
+# libsodium = {}
+# libuuid = {}
+# libwebp = {}
+# llvm21 = {}
+# lsd = {}
+# lua54 = {}
+# lz4 = {}
+# mednafen = {}
+# mesa = {}
+# mesa-glu = {}
+# mgba = {}
+# ncursesw = {}
+# neverball = {}
+# nginx = {}
+# onefetch = {}
+# openjazz = {}
+# openssh = {}
+# openssl3 = {}
+# openttd = {}
+# openttd-opengfx = {}
+# openttd-openmsx = {}
+# openttd-opensfx = {}
+# orbclient = {}
+# osdemo = {}
+# perg = {}
+# periodictable = {}
+# perl5 = {}
+# php84 = {}
+# pixelcannon = {}
+# pkg-config = {}
+# prboom = {}
+# procedural-wallpapers-rs = {}
+# python312 = {}
+# readline = {}
+# redox-fatfs = {}
+# redox-games = {}
+# relibc-tests = {}
+# rodioplay = {}
+# rs-nes = {}
+# rsync = {}
+# rust = {}
+# rust64 = {}
+# rustual-boy = {}
+# scummvm = {}
+# sdl-gfx = {}
+# sdl1-image = {}
+# sdl1-mixer = {}
+# sdl1-ttf = {}
+# sdl2 = {}
+# sdl2-gears = {}
+# sdl2-image = {}
+# sdl2-mixer = {}
+# sdl2-ttf = {}
+# servo = {}
+# shellharden = {}
+# shellstorm = {}
+# simple-http-server = {}
+# sodium = {}
+# sopwith = {}
+# sqlite3 = {}
+# strace = {}
+# syobonaction = {}
+# timidity = {}
+# tokei = {}
+# ttf-hack = {}
+# vttest = {}
+# webkitgtk3 = {}
+# winit = {}
+# xxhash = {}
+# zstd = {}
\ No newline at end of file
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 7394289b..22ca6e2c 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -8,6 +8,9 @@ prompt = false
 # Package settings
 [packages]
 
+# If you need to disable some broken package comment out instead of removal to not increase the maintenance cost
+#TODO: commented out recipes need to be built and tested inside of Redox to verify if they returned to work
+
 # Meta-packages below
 
 dev-essential = {}
@@ -19,7 +22,6 @@ x11-full = {}
 # Normal packages below
 
 acid = {}
-#atk = {} # depends on glib which does not build
 autoconf = {}
 automake = {}
 base = {}
@@ -31,10 +33,7 @@ bottom = {}
 bzip2 = {}
 ca-certificates = {}
 cairo = {}
-#cairodemo = {} # linking errors
-#calculator = {}
 cleye = {}
-#cmatrix = {} # needs ncursesw now
 composer = {}
 contain = {}
 coreutils = {}
@@ -54,49 +53,37 @@ eduke32 = {}
 exampled = {}
 expat = {}
 extrautils = {}
-#fal
-#fd = {} # ctrlc-3.1.1
 ffmpeg6 = {}
 findutils = {}
 fontconfig = {}
-#freeciv = {}
 freedoom = {}
 freefont = {}
-#freeglut = {}
 freepats = {}
 freetype2 = {}
-#friar = {} # mio patch
 fribidi = {}
-#game-2048 = {} # rustc-serialize
-#gawk = {} # langinfo.h
 gcc13 = {}
 gdbserver = {}
 gdk-pixbuf = {}
 gears = {}
 generaluser-gs = {}
 gettext = {}
-#gigalomania = {} # old recipe format
 git = {}
 glib = {}
 glutin = {}
 gnu-binutils = {}
 gnu-grep = {}
 gnu-make = {}
-#gstreamer = {} # conflict with thread local errno
-#harfbuzz = {} # depends on glib which does not build
-#hematite = {} # needs crate patches for redox-unix
 hicolor-icon-theme = {}
 htop = {}
 installer = {}
 installer-gui = {}
 intel-one-mono = {}
 ion = {}
-#jansson = {} # needs config.sub update
 kernel = {}
 kibi = {}
 lci = {}
-libc-bench = {}
 libavif = {}
+libc-bench = {}
 libedit = {}
 libffi = {}
 libgcc = {}
@@ -108,37 +95,31 @@ libogg = {}
 libonig = {}
 liborbital = {}
 libpng = {}
-libstdcxx = {}
 libsodium = {}
+libstdcxx = {}
+libuuid = {}
 libvorbis = {}
 libwebp = {}
 libxkbcommon = {}
-libuuid = {}
 libxml2 = {}
 llvm21 = {}
 lsd = {}
 lua54 = {}
 lz4 = {}
-#mdp = {} # gcc hangs
 mednafen = {}
 mesa = {}
 mesa-glu = {}
 mgba = {}
-#miniserve = {} # actix
 nano = {}
 nasm = {}
-#ncdu = {} # multiple definitions of symbols
 ncurses = {}
 ncursesw = {}
 netdb = {}
 netsurf = {}
 netutils = {}
 neverball = {}
-#newlib = {} # obsolete
-#newlibtest = {} # obsolete
 nghttp2 = {}
 nginx = {}
-#nushell = {} # needs cargo update
 onefetch = {}
 openjazz = {}
 openssh = {}
@@ -157,51 +138,37 @@ orbutils-background = {}
 orbutils-launcher = {}
 orbutils-orblogin = {}
 osdemo = {}
-#pango = {} # undefined references to std::__throw_system_error(int)
-#pastel = {} # needs crate patches for redox-unix
 patch = {}
 patchelf = {}
-#pathfinder = {} # servo-fontconfig
-#pciids = {}
 pcre = {}
 perg = {}
 periodictable = {}
-php84 = {}
 perl5 = {}
+php84 = {}
 pixelcannon = {}
-#pixman = {} # depends on glib which does not build
-#pkgar = {} # uses virtual Cargo.toml, needs recipe update
 pkg-config = {}
 pkgutils = {}
 pop-icon-theme = {}
-#powerline = {} # dirs
 prboom = {}
 procedural-wallpapers-rs = {}
 python312 = {}
-#qemu = {} # can be built, but not working
 readline = {}
 redox-fatfs = {}
-redoxfs = {}
 redox-games = {}
-#redox-ssh = {} # does not compile
+redoxfs = {}
 relibc = {}
 relibc-tests = {}
 resist = {}
-#retroarch = {} # OS_TLSIndex not declared
 ripgrep = {}
 rodioplay = {}
 rs-nes = {}
 rsync = {}
 rust = {}
 rust64 = {}
-#rust-cairo = {} # linking errors
-#rust-cairo-demo = {} # linking errors
 rustpython = {}
 rustual-boy = {}
-#schismtracker = {} # uses system includes
 scummvm = {}
 sdl-gfx = {}
-#sdl-player = {} # wctype_t
 sdl1 = {}
 sdl1-image = {}
 sdl1-mixer = {}
@@ -224,21 +191,127 @@ sqlite3 = {}
 strace = {}
 syobonaction = {}
 terminfo = {}
-#termplay = {} # backtrace cannot find link.h
 timidity = {}
 tokei = {}
 ttf-hack = {}
 userutils = {}
 uutils = {}
-#vice = {} # linker errors
 vim = {}
 vttest = {}
-#vvvvvv = {} # did not compile
 webkitgtk3 = {}
-#webrender = {} # unwind
-#wesnoth = {}
 winit = {}
 xxhash = {}
 xz = {}
 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
+#benchmarks = {}
+#binutils-gdb = {}
+#book = {}
+#cairo-demo = {} # linking errors
+#classicube = {}
+#cmake = {}
+#cmatrix = {} # needs ncursesw now
+#cookbook = {}
+#cosmic-reader = {}
+#cosmic-settings = {}
+#cosmic-store = {}
+#devilutionx = {}
+#dynamic-example = {}
+#fal
+#fd = {} # ctrlc-3.1.1
+#file = {}
+#flycast = {}
+#freeciv = {}
+#freeglut = {}
+#friar = {} # mio patch
+#game-2048 = {} # rustc-serialize
+#gawk = {} # langinfo.h
+#gigalomania = {} # old recipe format
+#gitoxide = {}
+#goaccess = {}
+#gstreamer = {} # conflict with thread local errno
+#harfbuzz = {} # depends on glib which does not build
+#helix = {}
+#hello-redox = {}
+#hematite = {} # needs crate patches for redox-unix
+#hf = {}
+#ibm-plex = {}
+#iced = {}
+#jansson = {} # needs config.sub update
+#jq = {}
+#libarchive = {}
+#libatomic = {}
+#libcosmic = {}
+#libflac = {}
+#libmodplug1 = {}
+#libmpfr = {}
+#libnettle = {}
+#libogg = {}
+#libpsl = {}
+#libssh2 = {}
+#libtool = {}
+#liburcu = {}
+#libuv = {}
+#lua-compat-53 = {}
+#luajit = {}
+#luarocks = {}
+#luv = {}
+#mdp = {} # gcc hangs
+#miniserve = {} # actix
+#mpc = {}
+#mupen64plus = {}
+#ncdu = {} # multiple definitions of symbols
+#newlib = {} # obsolete
+#newlibtest = {} # obsolete
+#noto-color-emoji = {}
+#nushell = {} # needs cargo update
+#openjk = {}
+#openposixtestsuite = {}
+#opentyrian = {}
+#orbcalculator = {}
+#ostest-bins = {}
+#pango = {} # undefined references to std::__throw_system_error(int)
+#pastel = {} # needs crate patches for redox-unix
+#pathfinder = {} # servo-fontconfig
+#pciids = {}
+#pcre2 = {}
+#pixman = {} # depends on glib which does not build
+#pkgar = {} # uses virtual Cargo.toml, needs recipe update
+#pls = {}
+#pop-wallpapers = {}
+#powerline = {} # dirs
+#qemu = {} # can be built, but not working
+#quakespasm = {}
+#redox-posix-tests = {}
+#redox-ssh = {} # does not compile
+#retroarch = {} # OS_TLSIndex not declared
+#rust-cairo = {} # linking errors
+#rust-cairo-demo = {} # linking errors
+#rvvm = {}
+#schismtracker = {} # uses system includes
+#sdl-player = {} # wctype_t
+#sdl2-gfx = {}
+#sm64ex = {}
+#spacecadetpinball = {}
+#termplay = {} # backtrace cannot find link.h
+#twin-commander = {}
+#ubuntu-wallpapers = {}
+#unibilium = {}
+#utf8proc = {}
+#vice = {} # linker errors
+#vvvvvv = {} # did not compile
+#webrender = {} # unwind
+#website = {}
+#wesnoth = {}
+#wget = {}
diff --git a/recipes/demos/cairodemo/cairodemo.c b/recipes/demos/cairo-demo/cairo-demo.c
old mode 100755
new mode 100644
similarity index 100%
rename from recipes/demos/cairodemo/cairodemo.c
rename to recipes/demos/cairo-demo/cairo-demo.c
diff --git a/recipes/demos/cairodemo/recipe.toml b/recipes/demos/cairo-demo/recipe.toml
old mode 100755
new mode 100644
similarity index 76%
rename from recipes/demos/cairodemo/recipe.toml
rename to recipes/demos/cairo-demo/recipe.toml
index 6538f035..41b17176
--- a/recipes/demos/cairodemo/recipe.toml
+++ b/recipes/demos/cairo-demo/recipe.toml
@@ -15,11 +15,11 @@ template = "custom"
 script = """
 "${CXX}" \
     $("${PKG_CONFIG}" --cflags cairo) \
-    "${COOKBOOK_RECIPE}/cairodemo.c" \
-    -o cairodemo \
+    "${COOKBOOK_RECIPE}/cairo-demo.c" \
+    -o cairo-demo \
     -static \
     $("${PKG_CONFIG}" --libs cairo) \
     -lorbital
 mkdir -pv "${COOKBOOK_STAGE}/bin"
-cp -v "cairodemo" "${COOKBOOK_STAGE}/bin/cairodemo"
+cp -v "cairo-demo" "${COOKBOOK_STAGE}/bin/cairo-demo"
 """
diff --git a/recipes/dev/cargo/recipe.toml b/recipes/dev/cargo/recipe.toml
deleted file mode 100644
index e0748962..00000000
--- a/recipes/dev/cargo/recipe.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[source]
-git = "https://github.com/rust-lang/cargo.git"
-rev = "d73d2caf9e41a39daf2a8d6ce60ec80bf354d2a7" # 0.86
-patches = [
-    "redox.patch"
-]
-
-[build]
-template = "custom"
-dependencies = [
-    "curl",
-    "libssh2",
-    "nghttp2",
-    "openssl1",
-    "zlib",
-]
-script = """
-DYNAMIC_INIT
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
-export LIBZ_SYS_STATIC=1
-export DEP_NGHTTP2_ROOT="${COOKBOOK_SYSROOT}"
-export DEP_OPENSSL_ROOT="${COOKBOOK_SYSROOT}"
-export DEP_Z_ROOT="${COOKBOOK_SYSROOT}"
-"${COOKBOOK_CARGO}" rustc \
-    --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-    --release \
-    --bin cargo \
-    -- \
-    -L "${COOKBOOK_SYSROOT}/lib" \
-    -C link-arg=-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib
-mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
-cp -v "target/${TARGET}/release/cargo" "${COOKBOOK_STAGE}/usr/bin/cargo"
-"""
diff --git a/recipes/dev/cargo/redox.patch b/recipes/dev/cargo/redox.patch
deleted file mode 100644
index 4a32bfe0..00000000
--- a/recipes/dev/cargo/redox.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/crates/cargo-util/src/paths.rs b/crates/cargo-util/src/paths.rs
-index 5d7e3c5a6..b7de5655f 100644
---- a/crates/cargo-util/src/paths.rs
-+++ b/crates/cargo-util/src/paths.rs
-@@ -201,7 +201,7 @@ pub fn write_atomic<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> Res
-         use std::os::unix::fs::PermissionsExt;
- 
-         // these constants are u16 on macOS
--        let mask = u32::from(libc::S_IRWXU | libc::S_IRWXG | libc::S_IRWXO);
-+        let mask = (libc::S_IRWXU | libc::S_IRWXG | libc::S_IRWXO) as u32;
-         let mode = meta.permissions().mode() & mask;
- 
-         std::fs::Permissions::from_mode(mode)
-@@ -611,8 +611,6 @@ fn _link_or_copy(src: &Path, dst: &Path) -> Result<()> {
-     }
- 
-     let link_result = if src.is_dir() {
--        #[cfg(target_os = "redox")]
--        use std::os::redox::fs::symlink;
-         #[cfg(unix)]
-         use std::os::unix::fs::symlink;
-         #[cfg(windows)]
-diff --git a/src/cargo/core/compiler/build_config.rs b/src/cargo/core/compiler/build_config.rs
-index 80aa592dd..d40c2056b 100644
---- a/src/cargo/core/compiler/build_config.rs
-+++ b/src/cargo/core/compiler/build_config.rs
-@@ -51,9 +51,7 @@ pub struct BuildConfig {
- }
- 
- fn default_parallelism() -> CargoResult<u32> {
--    Ok(available_parallelism()
--        .context("failed to determine the amount of parallelism available")?
--        .get() as u32)
-+    Ok(1)
- }
- 
- impl BuildConfig {
diff --git a/recipes/math/calculator/recipe.toml b/recipes/math/orbcalculator/recipe.toml
similarity index 100%
rename from recipes/math/calculator/recipe.toml
rename to recipes/math/orbcalculator/recipe.toml
diff --git a/recipes/net/curl/recipe.toml b/recipes/net/download/curl/recipe.toml
similarity index 100%
rename from recipes/net/curl/recipe.toml
rename to recipes/net/download/curl/recipe.toml