diff --git a/recipes/binutils/recipe.sh b/recipes/binutils/recipe.sh
deleted file mode 100644
index 3083a53adb91b74278cf3b1da5b62494e850332a..0000000000000000000000000000000000000000
--- a/recipes/binutils/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/binutils.git
diff --git a/recipes/binutils/recipe.toml b/recipes/binutils/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..588e511de0c327058bfea0a1a64cf411a0d1f30b
--- /dev/null
+++ b/recipes/binutils/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/binutils.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/fd/recipe.toml b/recipes/fd/recipe.toml
index d7d1c6385a4b74d6782787751db3c3a4c14d341b..ab67ead8814f03650dd389ed2adc266ab352848d 100644
--- a/recipes/fd/recipe.toml
+++ b/recipes/fd/recipe.toml
@@ -1,5 +1,5 @@
 [source]
 git = "https://github.com/sharkdp/fd.git"
-
+rev = "840a565d3aadbeb303b10a01c0aa3561924dfc46"
 [build]
 template = "cargo"
diff --git a/recipes/friar/recipe.sh b/recipes/friar/recipe.sh
deleted file mode 100644
index 467429109ced85a90d1dcfb4e9a6c10e69d15654..0000000000000000000000000000000000000000
--- a/recipes/friar/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://github.com/jackpot51/friar.git
diff --git a/recipes/friar/recipe.toml b/recipes/friar/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..8ef922902e188ee9ab67c21c4aae8fa9294f3623
--- /dev/null
+++ b/recipes/friar/recipe.toml
@@ -0,0 +1,4 @@
+[source]
+git = "https://github.com/jackpot51/friar.git"
+[build]
+template = "cargo"
diff --git a/recipes/game-2048/recipe.sh b/recipes/game-2048/recipe.sh
deleted file mode 100644
index c6a46587e4c5f26a82ecf30c911c7fcddafdcb37..0000000000000000000000000000000000000000
--- a/recipes/game-2048/recipe.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/2048-rs.git
-GIT_UPSTREAM=https://github.com/pierrechevalier83/2048-rs.git
diff --git a/recipes/game-2048/recipe.toml b/recipes/game-2048/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..f1ff19de14ca2f1c70b8cd466ff2907eafecdc9d
--- /dev/null
+++ b/recipes/game-2048/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/2048-rs.git"
+#git_upstream = "https://github.com/pierrechevalier83/2048-rs.git"
+[build]
+template = "cargo"
diff --git a/recipes/glib/recipe.toml b/recipes/glib/recipe.toml
index bcb6abe6e6e1b04d9cd827cc96174f62d34b20c8..6dfd5a3d942b06776c1d4401d0b53bdeb08e33aa 100644
--- a/recipes/glib/recipe.toml
+++ b/recipes/glib/recipe.toml
@@ -1,5 +1,8 @@
 [source]
+#git = "https://gitlab.gnome.org/GNOME/glib"
+#rev = "37f41eb44a7d423069ff93f44dd0baec92adad62"
 tar = "https://download.gnome.org/sources/glib/2.59/glib-2.59.0.tar.xz"
+blake3 = "4b10f071bad767bbed9dc3ca742aac4de1f5746c03d515908e7dad4ea8334cbf"
 patches = [
     "redox.patch"
 ]
diff --git a/recipes/libflac/recipe.toml b/recipes/libflac/recipe.toml
index 6cfe5c8e71901abb20ff533ab029672ca6fab07e..b309c64d752305e16cf860f950c4f8a242658ff3 100644
--- a/recipes/libflac/recipe.toml
+++ b/recipes/libflac/recipe.toml
@@ -1,6 +1,8 @@
 [source]
+#git = "https://gitlab.xiph.org/xiph/flac"
+#rev = "b32e5cbf9818ca23dd22aaa75522042c16ea7d17"
 tar = "https://github.com/xiph/flac/releases/download/1.4.2/flac-1.4.2.tar.xz"
-
+blake3 = "d165b9a18eb83b6f6e9993cc2074547566df706fc61464eb17ff088fd0c88104"
 [build]
 template = "configure"
 dependencies = [
diff --git a/recipes/libogg/recipe.toml b/recipes/libogg/recipe.toml
index 7e61376e6eda091a57e5fafa65d78f2e418ee316..aa77f0ba1b0aeffe228f3b04d31716a36d1bef03 100644
--- a/recipes/libogg/recipe.toml
+++ b/recipes/libogg/recipe.toml
@@ -1,7 +1,7 @@
 [source]
 #git = "https://gitlab.xiph.org/xiph/ogg"
 #rev = "4380566a44b8d5e85ad511c9c17eb04197863ec5"
-tar = "http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz"
+tar = "https://github.com/xiph/ogg/releases/download/v1.3.3/libogg-1.3.3.tar.xz"
 blake3 = "8220c0e4082fa26c07b10bfe31f641d2e33ebe1d1bb0b20221b7016bc8b78a3a"
 patches = [
     "redox.patch"
diff --git a/recipes/libsodium/recipe.toml b/recipes/libsodium/recipe.toml
index cd4ed49371a3888822151eee2c447db6c9b8c6bb..4e9e6014325758d081ad575e215e27c419f0ed3c 100644
--- a/recipes/libsodium/recipe.toml
+++ b/recipes/libsodium/recipe.toml
@@ -1,5 +1,8 @@
 [source]
+#git = "https://github.com/jedisct1/libsodium"
+#rev = "675149b9b8b66ff44152553fb3ebf9858128363d"
 tar = "https://github.com/jedisct1/libsodium/archive/1.0.16.tar.gz"
+blake3 = "2482633f872c173f9a42e6badb44c3efb042e783e664fdf8b1046babfa2405e7"
 patches = [
     "random.patch"
 ]
diff --git a/recipes/libssh2/recipe.toml b/recipes/libssh2/recipe.toml
index 3e2c526d31e46f4a36a96ea6b0ec7cfd35ff24eb..6665e66864ceed128936fea60c56b5b74a0c9b87 100644
--- a/recipes/libssh2/recipe.toml
+++ b/recipes/libssh2/recipe.toml
@@ -1,5 +1,8 @@
 [source]
+#git = "https://github.com/libssh2/libssh2"
+#rev = "635caa90787220ac3773c1d5ba11f1236c22eae8"
 tar = "https://www.libssh2.org/download/libssh2-1.10.0.tar.gz"
+blake3 = "2447216ce82c1d22301456bb02f60dfb6688f1461417b90f900c099a87f1292f"
 patches = []
 
 [build]
diff --git a/recipes/libvorbis/recipe.toml b/recipes/libvorbis/recipe.toml
index 8b2541f9350bf94224e7073fe61f66124cd504c0..4a963d454c04455f6b7575fe32e6cffe460a3b1b 100644
--- a/recipes/libvorbis/recipe.toml
+++ b/recipes/libvorbis/recipe.toml
@@ -1,8 +1,8 @@
 [source]
 #git = "https://gitlab.xiph.org/xiph/vorbis"
 #rev = "0657aee69dec8508a0011f47f3b69d7538e9d262"
-tar = "https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.gz"
-blake3 = "a8e88482b8d70321c8435616b0cec1a931b11445f003649774fd6940e593a254"
+tar = "https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.xz"
+blake3 = "c67f3f74ec26d93a5571c4404a64eb6e6587d7d77b46b552f7b410f5bc5b1f03"
 [build]
 template = "configure"
 dependencies = [
diff --git a/recipes/libxml2/recipe.toml b/recipes/libxml2/recipe.toml
index d99963e229208990259aa71c3d06926abb0bfe14..8d7f1cf829ddaa83a19cea8009b38420fd2eda08 100644
--- a/recipes/libxml2/recipe.toml
+++ b/recipes/libxml2/recipe.toml
@@ -1,6 +1,8 @@
 [source]
-tar = "ftp://xmlsoft.org/libxml2/libxml2-2.9.9.tar.gz"
-
+#git = "https://gitlab.gnome.org/GNOME/libxml2"
+#rev = "838bf42d54f94c8ff99b6e5022899a32875ed5d7"
+tar = "https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.3.tar.xz"
+blake3 = "0653d3750576299c4cb88740942165671b576ff93019f3d669b3f37136225ab7"
 [build]
 template = "custom"
 dependencies = [
diff --git a/recipes/lua/recipe.sh b/recipes/lua/recipe.sh
deleted file mode 100644
index 25aff48022d31042e2f47a84bcb2296ac1ce23f5..0000000000000000000000000000000000000000
--- a/recipes/lua/recipe.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-VERSION=5.3.1
-TAR=http://www.lua.org/ftp/lua-$VERSION.tar.gz
-
-function recipe_version {
-    echo "$VERSION"
-    skip=1
-}
-
-function recipe_build {
-    "$REDOX_MAKE" generic CC="${HOST}-gcc -std=gnu99" -j"$($NPROC)"
-    skip=1
-}
-
-function recipe_clean {
-    "$REDOX_MAKE" clean
-    skip=1
-}
-
-function recipe_stage {
-    mkdir -pv "$1/bin"
-    cp src/lua src/luac "$1/bin"
-    skip=1
-}
diff --git a/recipes/lua/recipe.toml b/recipes/lua/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b0a6d8f85a9c0b211f760be01f73fa471a5aecdc
--- /dev/null
+++ b/recipes/lua/recipe.toml
@@ -0,0 +1,11 @@
+[source]
+tar = "https://www.lua.org/ftp/lua-5.4.4.tar.gz"
+[build]
+template = "custom"
+script = """
+rsync -av --delete "${COOKBOOK_SOURCE}/" ./
+export CC="${TARGET}-gcc -std=gnu99"
+"${COOKBOOK_MAKE}" generic -j"${COOKBOOK_MAKE_JOBS}"
+mkdir -pv "${COOKBOOK_STAGE}/bin"
+cp src/lua src/luac "${COOKBOOK_STAGE}/bin"
+"""
diff --git a/recipes/redox-fatfs/recipe.sh b/recipes/redox-fatfs/recipe.sh
deleted file mode 100644
index c707f4585fd8d17f2be48b684e227366a0ed9a2d..0000000000000000000000000000000000000000
--- a/recipes/redox-fatfs/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/redox-fatfs
diff --git a/recipes/redox-fatfs/recipe.toml b/recipes/redox-fatfs/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..462ccfaa8f210ceba8d5cfe36f1691af2748add3
--- /dev/null
+++ b/recipes/redox-fatfs/recipe.toml
@@ -0,0 +1,4 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/redox-fatfs.git"
+[build]
+template = "cargo"
diff --git a/recipes/redox-ssh/recipe.sh b/recipes/redox-ssh/recipe.sh
deleted file mode 100644
index fb6f790a0f46a5dba380059956707d9885c60fe3..0000000000000000000000000000000000000000
--- a/recipes/redox-ssh/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/redox-ssh.git
diff --git a/recipes/redox-ssh/recipe.toml b/recipes/redox-ssh/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..277727fbcd802306dd816831cf4f8b24c2c2a490
--- /dev/null
+++ b/recipes/redox-ssh/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/redox-ssh.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/rodioplay/recipe.sh b/recipes/rodioplay/recipe.sh
deleted file mode 100644
index a13ee1cb9dd33038c7ad7393c3f5ec170205980c..0000000000000000000000000000000000000000
--- a/recipes/rodioplay/recipe.sh
+++ /dev/null
@@ -1 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/rodioplay.git
diff --git a/recipes/rodioplay/recipe.toml b/recipes/rodioplay/recipe.toml
new file mode 100644
index 0000000000000000000000000000000000000000..84b246e1ad100827ab089cf7592039e1d3d20dc6
--- /dev/null
+++ b/recipes/rodioplay/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/rodioplay.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/rs-nes/recipe.sh b/recipes/rs-nes/recipe.sh
deleted file mode 100755
index 73aa9ef84ce916c4f640a6b3bda91bc4f4618f59..0000000000000000000000000000000000000000
--- a/recipes/rs-nes/recipe.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/rs-nes.git
-GIT_UPSTREAM=https://github.com/bgourlie/rs-nes.git
-DEPENDS="orbital"
diff --git a/recipes/rs-nes/recipe.toml b/recipes/rs-nes/recipe.toml
new file mode 100755
index 0000000000000000000000000000000000000000..26381d8997ecbbf9c52ed159f716d0247bd5783c
--- /dev/null
+++ b/recipes/rs-nes/recipe.toml
@@ -0,0 +1,8 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/rs-nes.git"
+#git_upstream = "https://github.com/bgourlie/rs-nes.git"
+[build]
+template = "cargo"
+dependencies = [
+    "orbital"
+]
diff --git a/recipes/rust64/recipe.sh b/recipes/rust64/recipe.sh
deleted file mode 100755
index 27ddfa89078b869362fadbafec5416a6376f9ac3..0000000000000000000000000000000000000000
--- a/recipes/rust64/recipe.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-GIT=https://gitlab.redox-os.org/redox-os/rust64.git
-GIT_UPSTREAM=https://github.com/kondrak/rust64.git
-DEPENDS="orbital"
diff --git a/recipes/rust64/recipe.toml b/recipes/rust64/recipe.toml
new file mode 100755
index 0000000000000000000000000000000000000000..47207fc58228df97e6d5fcc2a8393240230a327d
--- /dev/null
+++ b/recipes/rust64/recipe.toml
@@ -0,0 +1,8 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/rust64.git"
+#git_upstream = "https://github.com/kondrak/rust64.git"
+[build]
+template = "cargo"
+dependencies = [
+    "orbital"
+]
diff --git a/recipes/shellharden/recipe.toml b/recipes/shellharden/recipe.toml
index 7cdbbb3d59b2630b1ae72ad0a30a7237f5ce2675..b564411920457524685800f1702f3a352f43646e 100644
--- a/recipes/shellharden/recipe.toml
+++ b/recipes/shellharden/recipe.toml
@@ -1,5 +1,5 @@
 [source]
 git = "https://github.com/anordal/shellharden.git"
-
+rev = "bd24c99d5d1e76452b6d0749404837c1c95d923c"
 [build]
 template = "cargo"