diff --git a/a/alacritty/manifest.x86_64.bin b/a/alacritty/manifest.x86_64.bin
index 3cf32b5c..92e9ecf3 100644
Binary files a/a/alacritty/manifest.x86_64.bin and b/a/alacritty/manifest.x86_64.bin differ
diff --git a/a/alacritty/manifest.x86_64.jsonc b/a/alacritty/manifest.x86_64.jsonc
index 9b9810e2..9402cd32 100644
--- a/a/alacritty/manifest.x86_64.jsonc
+++ b/a/alacritty/manifest.x86_64.jsonc
@@ -7,6 +7,7 @@
 				"binary(cargo)",
 				"binary(cmake)",
 				"binary(make)",
+				"binary(scdoc)",
 				"pkgconfig(fontconfig)"
 			],
 			"depends": [
@@ -19,7 +20,16 @@
 				"soname(libunwind.so.1(x86_64))"
 			],
 			"files": [
-				"/usr/bin/alacritty"
+				"/usr/bin/alacritty",
+				"/usr/share/applications/alacritty.desktop",
+				"/usr/share/bash-completion/completions/alacritty",
+				"/usr/share/fish/vendor_completions.d/alacritty.fish",
+				"/usr/share/icons/hicolor/scalable/apps/Alacritty.svg",
+				"/usr/share/man/man1/alacritty-msg.1",
+				"/usr/share/man/man1/alacritty.1",
+				"/usr/share/man/man5/alacritty-bindings.5",
+				"/usr/share/man/man5/alacritty.5",
+				"/usr/share/zsh/site-functions/_alacritty"
 			],
 			"name": "alacritty",
 			"provides": [
@@ -28,6 +38,6 @@
 		}
 	},
 	"source-name": "alacritty",
-	"source-release": "1",
+	"source-release": "2",
 	"source-version": "0.13.1"
 }
diff --git a/a/alacritty/stone.yml b/a/alacritty/stone.yml
index c388d2ed..405aacfc 100644
--- a/a/alacritty/stone.yml
+++ b/a/alacritty/stone.yml
@@ -5,7 +5,7 @@
 #
 name        : alacritty
 version     : '0.13.1'
-release     : 1
+release     : 2
 homepage    : https://alacritty.org/
 upstreams   :
     - https://github.com/alacritty/alacritty/archive/refs/tags/v0.13.1.tar.gz : 38a42e23e1e6faaa9e300347df3f7b58b6182908a701517aac6e296fbdf37451
@@ -20,12 +20,27 @@ environment : |
     export HOME=$(pwd)
 builddeps   :
     - binary(cargo)
-    - binary(make)
     - binary(cmake)
-    #- nss
+    - binary(make)
+    - binary(scdoc)
     - pkgconfig(fontconfig)
 build       : |
     export CARGO_HTTP_CAINFO=/usr/share/defaults/etc/ssl/certs/ca-certificates.crt
     make binary
+
+    for FILENAME in alacritty-bindings.5 alacritty-msg.1 alacritty.1 alacritty.5; do
+        scdoc < extra/man/${FILENAME}.scd > extra/man/${FILENAME}
+    done
 install     : |
     install -Dm00755 target/release/alacritty -t %(installroot)/usr/bin
+
+    install -Dm00644 extra/completions/alacritty.bash %(installroot)/usr/share/bash-completion/completions/alacritty
+    install -Dm00644 extra/completions/_alacritty %(installroot)/usr/share/zsh/site-functions/_alacritty
+    install -Dm00644 extra/completions/alacritty.fish %(installroot)/usr/share/fish/vendor_completions.d/alacritty.fish
+
+    for FILENAME in alacritty-bindings.5 alacritty-msg.1 alacritty.1 alacritty.5; do
+        install -Dm00644 extra/man/${FILENAME} %(installroot)/usr/share/man/man${FILENAME##*.}/${FILENAME}
+    done
+
+    install -Dm00644 extra/linux/Alacritty.desktop %(installroot)/usr/share/applications/alacritty.desktop
+    install -Dm00644 extra/logo/alacritty-term+scanlines.svg %(installroot)/usr/share/icons/hicolor/scalable/apps/Alacritty.svg
diff --git a/s/scdoc/manifest.x86_64.bin b/s/scdoc/manifest.x86_64.bin
new file mode 100644
index 00000000..45e0486a
Binary files /dev/null and b/s/scdoc/manifest.x86_64.bin differ
diff --git a/s/scdoc/manifest.x86_64.jsonc b/s/scdoc/manifest.x86_64.jsonc
new file mode 100644
index 00000000..23d25d08
--- /dev/null
+++ b/s/scdoc/manifest.x86_64.jsonc
@@ -0,0 +1,22 @@
+/** Human readable report. This is not consumed by boulder */
+{
+	"manifest-version": "0.2",
+	"packages": {
+		"scdoc": {
+			"files": [
+				"/usr/bin/scdoc",
+				"/usr/share/man/man1/scdoc.1",
+				"/usr/share/man/man5/scdoc.5",
+				"/usr/share/pkgconfig/scdoc.pc"
+			],
+			"name": "scdoc",
+			"provides": [
+				"pkgconfig(scdoc)",
+				"binary(scdoc)"
+			]
+		}
+	},
+	"source-name": "scdoc",
+	"source-release": "1",
+	"source-version": "1.11.2"
+}
diff --git a/s/scdoc/monitoring.yml b/s/scdoc/monitoring.yml
new file mode 100644
index 00000000..55ee8b41
--- /dev/null
+++ b/s/scdoc/monitoring.yml
@@ -0,0 +1,2 @@
+releases:
+    id: 68662
diff --git a/s/scdoc/stone.yml b/s/scdoc/stone.yml
new file mode 100644
index 00000000..d56a6d90
--- /dev/null
+++ b/s/scdoc/stone.yml
@@ -0,0 +1,25 @@
+#
+# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+name        : scdoc
+version     : '1.11.2'
+release     : 1
+homepage    : https://git.sr.ht/~sircmpwn/scdoc
+upstreams   :
+    - https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz : e9ff9981b5854301789a6778ee64ef1f6d1e5f4829a9dd3e58a9a63eacc2e6f0
+summary     : Simple man page generator
+description : |
+    scdoc is a simple man page generator for POSIX systems written in C99.
+license     :
+    - MIT
+packages    :
+    - "%(name)":
+        paths:
+            - /usr/share/pkgconfig/scdoc.pc
+toolchain   : gnu
+build       : |
+    %make PREFIX=/usr
+install     : |
+    %make_install PREFIX=/usr
diff --git a/s/sway/manifest.x86_64.bin b/s/sway/manifest.x86_64.bin
index 2f2a59a8..e43971a4 100644
Binary files a/s/sway/manifest.x86_64.bin and b/s/sway/manifest.x86_64.bin differ
diff --git a/s/sway/manifest.x86_64.jsonc b/s/sway/manifest.x86_64.jsonc
index d030aab2..eb2ea883 100644
--- a/s/sway/manifest.x86_64.jsonc
+++ b/s/sway/manifest.x86_64.jsonc
@@ -5,6 +5,7 @@
 		"sway": {
 			"build-depends": [
 				"binary(cmake)",
+				"binary(scdoc)",
 				"pkgconfig(bash-completion)",
 				"pkgconfig(cairo)",
 				"pkgconfig(fish)",
@@ -60,6 +61,16 @@
 				"/usr/share/fish/vendor_completions.d/sway.fish",
 				"/usr/share/fish/vendor_completions.d/swaymsg.fish",
 				"/usr/share/fish/vendor_completions.d/swaynag.fish",
+				"/usr/share/man/man1/sway.1",
+				"/usr/share/man/man1/swaymsg.1",
+				"/usr/share/man/man1/swaynag.1",
+				"/usr/share/man/man5/sway-bar.5",
+				"/usr/share/man/man5/sway-input.5",
+				"/usr/share/man/man5/sway-output.5",
+				"/usr/share/man/man5/sway.5",
+				"/usr/share/man/man5/swaynag.5",
+				"/usr/share/man/man7/sway-ipc.7",
+				"/usr/share/man/man7/swaybar-protocol.7",
 				"/usr/share/wayland-sessions/sway.desktop",
 				"/usr/share/zsh/site-functions/_sway",
 				"/usr/share/zsh/site-functions/_swaymsg"
@@ -74,6 +85,6 @@
 		}
 	},
 	"source-name": "sway",
-	"source-release": "2",
+	"source-release": "3",
 	"source-version": "1.8.1"
 }
diff --git a/s/sway/pkg/enhance-config.patch b/s/sway/pkg/enhance-config.patch
new file mode 100644
index 00000000..00ad45e9
--- /dev/null
+++ b/s/sway/pkg/enhance-config.patch
@@ -0,0 +1,18 @@
+diff --git a/config.in b/config.in
+index 3eda7ac..55d0e80 100644
+--- a/config.in
++++ b/config.in
+@@ -14,11 +14,11 @@ set $down j
+ set $up k
+ set $right l
+ # Your preferred terminal emulator
+-set $term foot
++set $term alacritty
+ # Your preferred application launcher
+ # Note: pass the final command to swaymsg so that the resulting window can be opened
+ # on the original workspace that the command was run on.
+-set $menu dmenu_path | dmenu | xargs swaymsg exec --
++set $menu tofi-drun | xargs swaymsg exec --
+ 
+ ### Output configuration
+ #
diff --git a/s/sway/stone.yml b/s/sway/stone.yml
index 40072f1e..2eb3c7e6 100644
--- a/s/sway/stone.yml
+++ b/s/sway/stone.yml
@@ -5,7 +5,7 @@
 #
 name        : sway
 version     : '1.8.1'
-release     : 2
+release     : 3
 homepage    : https://github.com/swaywm/sway
 upstreams   :
     - https://github.com/swaywm/sway/releases/download/1.8.1/sway-1.8.1.tar.gz : 73f08fd2cf7948e8af900709efe44eae412ae11c5773960e25c9aa09f73bad41
@@ -16,6 +16,7 @@ license     :
     - MIT
 builddeps   :
     - binary(cmake)
+    - binary(scdoc)
     - pkgconfig(bash-completion)
     - pkgconfig(cairo)
     - pkgconfig(fish)
@@ -31,11 +32,15 @@ builddeps   :
 rundeps     :
     # Let's make sure we have at least one terminal
     - binary(alacritty)
+    - binary(swaybg)
+    - binary(tofi)
+    # For tofi-drun
+    - binary(xargs)
     - liberation-fonts-ttf
-    - swaybg
     # sway needs /usr/share/X11/xkb
     - xkeyboard-config
 setup       : |
+    %patch %(pkgdir)/enhance-config.patch
     %meson
 build       : |
     %meson_build
diff --git a/t/tofi/manifest.x86_64.bin b/t/tofi/manifest.x86_64.bin
new file mode 100644
index 00000000..5b5f6c8c
Binary files /dev/null and b/t/tofi/manifest.x86_64.bin differ
diff --git a/t/tofi/manifest.x86_64.jsonc b/t/tofi/manifest.x86_64.jsonc
new file mode 100644
index 00000000..7eba1ec0
--- /dev/null
+++ b/t/tofi/manifest.x86_64.jsonc
@@ -0,0 +1,58 @@
+/** Human readable report. This is not consumed by boulder */
+{
+	"manifest-version": "0.2",
+	"packages": {
+		"tofi": {
+			"build-depends": [
+				"binary(cmake)",
+				"binary(scdoc)",
+				"pkgconfig(cairo)",
+				"pkgconfig(freetype2)",
+				"pkgconfig(gio-unix-2.0)",
+				"pkgconfig(glib-2.0)",
+				"pkgconfig(harfbuzz)",
+				"pkgconfig(pangocairo)",
+				"pkgconfig(wayland-client)",
+				"pkgconfig(wayland-protocols)",
+				"pkgconfig(wayland-scanner)",
+				"pkgconfig(xkbcommon)"
+			],
+			"depends": [
+				"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
+				"soname(libc.so.6(x86_64))",
+				"soname(libcairo.so.2(x86_64))",
+				"soname(libfreetype.so.6(x86_64))",
+				"soname(libgio-2.0.so.0(x86_64))",
+				"soname(libglib-2.0.so.0(x86_64))",
+				"soname(libgobject-2.0.so.0(x86_64))",
+				"soname(libharfbuzz.so.0(x86_64))",
+				"soname(libpango-1.0.so.0(x86_64))",
+				"soname(libpangocairo-1.0.so.0(x86_64))",
+				"soname(libwayland-client.so.0(x86_64))",
+				"soname(libxkbcommon.so.0(x86_64))"
+			],
+			"files": [
+				"/usr/bin/tofi",
+				"/usr/bin/tofi-drun",
+				"/usr/bin/tofi-run",
+				"/usr/share/bash-completion/completions/tofi",
+				"/usr/share/bash-completion/completions/tofi-drun",
+				"/usr/share/bash-completion/completions/tofi-run",
+				"/usr/share/licenses/tofi/LICENSE",
+				"/usr/share/man/man1/tofi-drun.1",
+				"/usr/share/man/man1/tofi-run.1",
+				"/usr/share/man/man1/tofi.1",
+				"/usr/share/man/man5/tofi.5"
+			],
+			"name": "tofi",
+			"provides": [
+				"binary(tofi)",
+				"binary(tofi-drun)",
+				"binary(tofi-run)"
+			]
+		}
+	},
+	"source-name": "tofi",
+	"source-release": "1",
+	"source-version": "0.9.1"
+}
diff --git a/t/tofi/monitoring.yml b/t/tofi/monitoring.yml
new file mode 100644
index 00000000..8c7595e7
--- /dev/null
+++ b/t/tofi/monitoring.yml
@@ -0,0 +1,2 @@
+releases:
+    id: 275299
diff --git a/t/tofi/stone.yml b/t/tofi/stone.yml
new file mode 100644
index 00000000..9adbb60a
--- /dev/null
+++ b/t/tofi/stone.yml
@@ -0,0 +1,35 @@
+#
+# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+name        : tofi
+version     : '0.9.1'
+release     : 1
+homepage    : https://github.com/philj56/tofi
+upstreams   :
+    - https://github.com/philj56/tofi/archive/refs/tags/v0.9.1.tar.gz : dd55347b509af786f133def64f3a86f1db258b5e196de80e53d62827bdcc37bc
+summary     : Fast and simple application launcher
+description : |
+    An extremely fast and simple dmenu / rofi replacement for wlroots-based Wayland compositors such as Sway.
+license     :
+    - MIT
+builddeps   :
+    - binary(cmake)
+    - binary(scdoc)
+    - pkgconfig(cairo)
+    - pkgconfig(freetype2)
+    - pkgconfig(gio-unix-2.0)
+    - pkgconfig(glib-2.0)
+    - pkgconfig(harfbuzz)
+    - pkgconfig(pangocairo)
+    - pkgconfig(wayland-client)
+    - pkgconfig(wayland-protocols)
+    - pkgconfig(wayland-scanner)
+    - pkgconfig(xkbcommon)
+setup       : |
+    %meson
+build       : |
+    %meson_build
+install     : |
+    %meson_install