195 files changed, 61 insertions, 40 deletions
diff --git a/Makefile b/Makefile
index 5acf9fd..7a79ebd 100644
--- a/Makefile
+++ b/Makefile
@@ -17,47 +17,25 @@ config:
 	@echo "Run make to compile sarc"
 sarc: clean 
 	./scripts/cp.sh
-	make  -C $(DWM)
-	make  -C $(ST)
-	make  -C $(DMENU)
-	make  -C surf
-	make  -C dwmblocks
-	make  -C nsxiv
-	make  -C tabbed
-	make  -C farbfeld
-	make  -C wmname
+	make wm -C wm
+	make utils -C utils
 	rm -rf colors.h
 	@echo
 	@echo "Finished! Run make install to install"
 c: clean
 cfg: config
 install:
-	make install -C $(DWM)
-	make install -C $(ST)
-	make install -C $(DMENU)
-	make install -C surf
-	make install -C dwmblocks
-	make install -C nsxiv
-	make install -C tabbed
-	make install -C farbfeld
-	make install -C wmname
+	make install-wm -C wm
+	make install-utils -C utils
 	install scripts/sarc.sh /usr/local/bin
 	install scripts/fehbg /usr/local/bin
 	mkdir -p $(PREFIX)/share/doc/sarc
 	cp sarc.1 $(MANPREFIX)/man1/
 	@echo
 clean:
-	make clean -C $(DWM)
-	make clean -C $(ST) 
-	make clean -C $(DMENU)
-	make clean -C surf
-	make clean -C nsxiv
-	make clean -C tabbed
-	make clean -C dwmblocks
-	make clean -C farbfeld
-	make clean -C wmname
-	make clean -C scroll-0.1
-	rm -rf scripts/gip colors.h
+	make clean-wm -C wm
+	make clean-utils -C utils
+	rm -rf colors.h
 part:
 	./scripts/cp.sh
 cleanp: clean
diff --git a/slock-1.4/slock b/slock-1.4/slock
deleted file mode 100755
index 5742593..0000000
--- a/slock-1.4/slock
+++ /dev/null
diff --git a/utils/Makefile b/utils/Makefile
new file mode 100644
index 0000000..c7e5e03
--- /dev/null
+++ b/utils/Makefile
@@ -0,0 +1,26 @@
+include ../config.mk
+utils:
+	make -C farbfeld
+	make -C nsxiv
+	make -C scroll-0.1
+	make -C $(ST)
+	make -C surf
+	make -C tabbed
+	make -C wmname
+clean-utils:
+	make clean -C farbfeld
+	make clean -C nsxiv
+	make clean -C scroll-0.1
+	make clean -C $(ST)
+	make clean -C surf
+	make clean -C tabbed
+	make clean -C wmname
+install-utils:
+	make install -C farbfeld
+	make install -C nsxiv
+	make install -C scroll-0.1
+	make install -C $(ST)
+	make install -C surf
+	make install -C tabbed
+	make install -C wmname
+
diff --git a/farbfeld/2ff b/utils/farbfeld/2ff
index 6ce91b9..6ce91b9 100755
--- a/farbfeld/2ff
+++ b/utils/farbfeld/2ff
diff --git a/farbfeld/2ff.1 b/utils/farbfeld/2ff.1
index 426e3fd..426e3fd 100644
--- a/farbfeld/2ff.1
+++ b/utils/farbfeld/2ff.1
diff --git a/farbfeld/FORMAT b/utils/farbfeld/FORMAT
index 0c082ea..0c082ea 100644
--- a/farbfeld/FORMAT
+++ b/utils/farbfeld/FORMAT
diff --git a/farbfeld/LICENSE b/utils/farbfeld/LICENSE
index 05640a5..05640a5 100644
--- a/farbfeld/LICENSE
+++ b/utils/farbfeld/LICENSE
diff --git a/farbfeld/Makefile b/utils/farbfeld/Makefile
index ac3d22a..354509b 100644
--- a/farbfeld/Makefile
+++ b/utils/farbfeld/Makefile
@@ -3,7 +3,7 @@
 .POSIX:
 
 include config.mk
-include ../config.mk
+include ../../config.mk
 
 REQ = util
 HDR = arg.h
diff --git a/farbfeld/README b/utils/farbfeld/README
index 1fe1125..1fe1125 100644
--- a/farbfeld/README
+++ b/utils/farbfeld/README
diff --git a/farbfeld/arg.h b/utils/farbfeld/arg.h
index 7f503ec..7f503ec 100644
--- a/farbfeld/arg.h
+++ b/utils/farbfeld/arg.h
diff --git a/farbfeld/config.mk b/utils/farbfeld/config.mk
index 8ba827a..8ba827a 100644
--- a/farbfeld/config.mk
+++ b/utils/farbfeld/config.mk
diff --git a/farbfeld/farbfeld.5 b/utils/farbfeld/farbfeld.5
index 55dc47c..55dc47c 100644
--- a/farbfeld/farbfeld.5
+++ b/utils/farbfeld/farbfeld.5
diff --git a/farbfeld/ff2jpg.1 b/utils/farbfeld/ff2jpg.1
index 745ae6e..745ae6e 100644
--- a/farbfeld/ff2jpg.1
+++ b/utils/farbfeld/ff2jpg.1
diff --git a/farbfeld/ff2jpg.c b/utils/farbfeld/ff2jpg.c
index f4514b8..f4514b8 100644
--- a/farbfeld/ff2jpg.c
+++ b/utils/farbfeld/ff2jpg.c
diff --git a/farbfeld/ff2pam.1 b/utils/farbfeld/ff2pam.1
index 3f4acfe..3f4acfe 100644
--- a/farbfeld/ff2pam.1
+++ b/utils/farbfeld/ff2pam.1
diff --git a/farbfeld/ff2pam.c b/utils/farbfeld/ff2pam.c
index fca5c6f..fca5c6f 100644
--- a/farbfeld/ff2pam.c
+++ b/utils/farbfeld/ff2pam.c
diff --git a/farbfeld/ff2png.1 b/utils/farbfeld/ff2png.1
index d8e1fab..d8e1fab 100644
--- a/farbfeld/ff2png.1
+++ b/utils/farbfeld/ff2png.1
diff --git a/farbfeld/ff2png.c b/utils/farbfeld/ff2png.c
index 193b375..193b375 100644
--- a/farbfeld/ff2png.c
+++ b/utils/farbfeld/ff2png.c
diff --git a/farbfeld/ff2ppm.1 b/utils/farbfeld/ff2ppm.1
index 1687346..1687346 100644
--- a/farbfeld/ff2ppm.1
+++ b/utils/farbfeld/ff2ppm.1
diff --git a/farbfeld/ff2ppm.c b/utils/farbfeld/ff2ppm.c
index 9b82d9c..9b82d9c 100644
--- a/farbfeld/ff2ppm.c
+++ b/utils/farbfeld/ff2ppm.c
diff --git a/farbfeld/jpg2ff.1 b/utils/farbfeld/jpg2ff.1
index 6ae67e2..6ae67e2 100644
--- a/farbfeld/jpg2ff.1
+++ b/utils/farbfeld/jpg2ff.1
diff --git a/farbfeld/jpg2ff.c b/utils/farbfeld/jpg2ff.c
index 360ace4..360ace4 100644
--- a/farbfeld/jpg2ff.c
+++ b/utils/farbfeld/jpg2ff.c
diff --git a/farbfeld/png2ff.1 b/utils/farbfeld/png2ff.1
index 5ede5c9..5ede5c9 100644
--- a/farbfeld/png2ff.1
+++ b/utils/farbfeld/png2ff.1
diff --git a/farbfeld/png2ff.c b/utils/farbfeld/png2ff.c
index 74109d8..74109d8 100644
--- a/farbfeld/png2ff.c
+++ b/utils/farbfeld/png2ff.c
diff --git a/farbfeld/util.c b/utils/farbfeld/util.c
index 6418bc9..6418bc9 100644
--- a/farbfeld/util.c
+++ b/utils/farbfeld/util.c
diff --git a/farbfeld/util.h b/utils/farbfeld/util.h
index f6e32c6..f6e32c6 100644
--- a/farbfeld/util.h
+++ b/utils/farbfeld/util.h
diff --git a/nsxiv/.editorconfig b/utils/nsxiv/.editorconfig
index 72b2e5e..72b2e5e 100644
--- a/nsxiv/.editorconfig
+++ b/utils/nsxiv/.editorconfig
diff --git a/nsxiv/.github/workflows/build.yml b/utils/nsxiv/.github/workflows/build.yml
index 69fcaea..69fcaea 100644
--- a/nsxiv/.github/workflows/build.yml
+++ b/utils/nsxiv/.github/workflows/build.yml
diff --git a/nsxiv/.gitignore b/utils/nsxiv/.gitignore
index b0c0928..b0c0928 100644
--- a/nsxiv/.gitignore
+++ b/utils/nsxiv/.gitignore
diff --git a/nsxiv/CHANGELOG.md b/utils/nsxiv/CHANGELOG.md
index 96cad92..96cad92 100644
--- a/nsxiv/CHANGELOG.md
+++ b/utils/nsxiv/CHANGELOG.md
diff --git a/nsxiv/CONTRIBUTING.md b/utils/nsxiv/CONTRIBUTING.md
index 05331c3..05331c3 100644
--- a/nsxiv/CONTRIBUTING.md
+++ b/utils/nsxiv/CONTRIBUTING.md
diff --git a/nsxiv/LICENSE b/utils/nsxiv/LICENSE
index d159169..d159169 100644
--- a/nsxiv/LICENSE
+++ b/utils/nsxiv/LICENSE
diff --git a/nsxiv/Makefile b/utils/nsxiv/Makefile
index 0779d35..1e51e69 100644
--- a/nsxiv/Makefile
+++ b/utils/nsxiv/Makefile
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 .POSIX:
 
 # nsxiv version
diff --git a/nsxiv/README.md b/utils/nsxiv/README.md
index 4857866..4857866 100644
--- a/nsxiv/README.md
+++ b/utils/nsxiv/README.md
diff --git a/nsxiv/autoreload.c b/utils/nsxiv/autoreload.c
index d51e008..d51e008 100644
--- a/nsxiv/autoreload.c
+++ b/utils/nsxiv/autoreload.c
diff --git a/nsxiv/commands.c b/utils/nsxiv/commands.c
index 9ee83ec..9ee83ec 100644
--- a/nsxiv/commands.c
+++ b/utils/nsxiv/commands.c
diff --git a/nsxiv/commands.h b/utils/nsxiv/commands.h
index 74e2638..74e2638 100644
--- a/nsxiv/commands.h
+++ b/utils/nsxiv/commands.h
diff --git a/nsxiv/config.def.h b/utils/nsxiv/config.def.h
index 1e102fe..1e102fe 100644
--- a/nsxiv/config.def.h
+++ b/utils/nsxiv/config.def.h
diff --git a/nsxiv/examples/image-info b/utils/nsxiv/examples/image-info
index 5f06123..5f06123 100755
--- a/nsxiv/examples/image-info
+++ b/utils/nsxiv/examples/image-info
diff --git a/nsxiv/examples/key-handler b/utils/nsxiv/examples/key-handler
index 3fe741d..3fe741d 100755
--- a/nsxiv/examples/key-handler
+++ b/utils/nsxiv/examples/key-handler
diff --git a/nsxiv/examples/thumb-info b/utils/nsxiv/examples/thumb-info
index b422f9c..b422f9c 100755
--- a/nsxiv/examples/thumb-info
+++ b/utils/nsxiv/examples/thumb-info
diff --git a/nsxiv/examples/win-title b/utils/nsxiv/examples/win-title
index ac7b982..ac7b982 100755
--- a/nsxiv/examples/win-title
+++ b/utils/nsxiv/examples/win-title
diff --git a/nsxiv/icon/128x128.png b/utils/nsxiv/icon/128x128.png
index d45250b..d45250b 100644
--- a/nsxiv/icon/128x128.png
+++ b/utils/nsxiv/icon/128x128.png
diff --git a/nsxiv/icon/16x16.png b/utils/nsxiv/icon/16x16.png
index a19074a..a19074a 100644
--- a/nsxiv/icon/16x16.png
+++ b/utils/nsxiv/icon/16x16.png
diff --git a/nsxiv/icon/32x32.png b/utils/nsxiv/icon/32x32.png
index e18ccf8..e18ccf8 100644
--- a/nsxiv/icon/32x32.png
+++ b/utils/nsxiv/icon/32x32.png
diff --git a/nsxiv/icon/48x48.png b/utils/nsxiv/icon/48x48.png
index 442a96c..442a96c 100644
--- a/nsxiv/icon/48x48.png
+++ b/utils/nsxiv/icon/48x48.png
diff --git a/nsxiv/icon/64x64.png b/utils/nsxiv/icon/64x64.png
index 3ce0d27..3ce0d27 100644
--- a/nsxiv/icon/64x64.png
+++ b/utils/nsxiv/icon/64x64.png
diff --git a/nsxiv/icon/README.md b/utils/nsxiv/icon/README.md
index 3ddd7f8..3ddd7f8 100644
--- a/nsxiv/icon/README.md
+++ b/utils/nsxiv/icon/README.md
diff --git a/nsxiv/icon/data.gen.h b/utils/nsxiv/icon/data.gen.h
index 0bb7a84..0bb7a84 100644
--- a/nsxiv/icon/data.gen.h
+++ b/utils/nsxiv/icon/data.gen.h
diff --git a/nsxiv/icon/data.h b/utils/nsxiv/icon/data.h
index 98ac5f3..98ac5f3 100644
--- a/nsxiv/icon/data.h
+++ b/utils/nsxiv/icon/data.h
diff --git a/nsxiv/icon/img2data.c b/utils/nsxiv/icon/img2data.c
index 2223bf0..2223bf0 100644
--- a/nsxiv/icon/img2data.c
+++ b/utils/nsxiv/icon/img2data.c
diff --git a/nsxiv/image.c b/utils/nsxiv/image.c
index 2904887..2904887 100644
--- a/nsxiv/image.c
+++ b/utils/nsxiv/image.c
diff --git a/nsxiv/main.c b/utils/nsxiv/main.c
index 976bd5f..976bd5f 100644
--- a/nsxiv/main.c
+++ b/utils/nsxiv/main.c
diff --git a/nsxiv/nsxiv.1 b/utils/nsxiv/nsxiv.1
index 4488146..4488146 100644
--- a/nsxiv/nsxiv.1
+++ b/utils/nsxiv/nsxiv.1
diff --git a/nsxiv/nsxiv.desktop b/utils/nsxiv/nsxiv.desktop
index de90437..de90437 100644
--- a/nsxiv/nsxiv.desktop
+++ b/utils/nsxiv/nsxiv.desktop
diff --git a/nsxiv/nsxiv.h b/utils/nsxiv/nsxiv.h
index f9f5600..f9f5600 100644
--- a/nsxiv/nsxiv.h
+++ b/utils/nsxiv/nsxiv.h
diff --git a/nsxiv/options.c b/utils/nsxiv/options.c
index 96cf092..96cf092 100644
--- a/nsxiv/options.c
+++ b/utils/nsxiv/options.c
diff --git a/nsxiv/thumbs.c b/utils/nsxiv/thumbs.c
index 52820d4..52820d4 100644
--- a/nsxiv/thumbs.c
+++ b/utils/nsxiv/thumbs.c
diff --git a/nsxiv/utf8.h b/utils/nsxiv/utf8.h
index a9be2d4..a9be2d4 100644
--- a/nsxiv/utf8.h
+++ b/utils/nsxiv/utf8.h
diff --git a/nsxiv/util.c b/utils/nsxiv/util.c
index d580839..d580839 100644
--- a/nsxiv/util.c
+++ b/utils/nsxiv/util.c
diff --git a/nsxiv/window.c b/utils/nsxiv/window.c
index 69c7b66..69c7b66 100644
--- a/nsxiv/window.c
+++ b/utils/nsxiv/window.c
diff --git a/scroll-0.1/Makefile b/utils/scroll-0.1/Makefile
index cacccd2..cacccd2 100644
--- a/scroll-0.1/Makefile
+++ b/utils/scroll-0.1/Makefile
diff --git a/scroll-0.1/README b/utils/scroll-0.1/README
index 7ddb949..7ddb949 100644
--- a/scroll-0.1/README
+++ b/utils/scroll-0.1/README
diff --git a/scroll-0.1/TODO b/utils/scroll-0.1/TODO
index 84ffd33..84ffd33 100644
--- a/scroll-0.1/TODO
+++ b/utils/scroll-0.1/TODO
diff --git a/scroll-0.1/config.def.h b/utils/scroll-0.1/config.def.h
index 536db70..536db70 100644
--- a/scroll-0.1/config.def.h
+++ b/utils/scroll-0.1/config.def.h
diff --git a/scroll-0.1/config.h b/utils/scroll-0.1/config.h
index 536db70..536db70 100644
--- a/scroll-0.1/config.h
+++ b/utils/scroll-0.1/config.h
diff --git a/scroll-0.1/config.mk b/utils/scroll-0.1/config.mk
index 620cc36..bc30144 100644
--- a/scroll-0.1/config.mk
+++ b/utils/scroll-0.1/config.mk
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 # scroll version
 VERSION = 0.1
 
diff --git a/scroll-0.1/ptty.c b/utils/scroll-0.1/ptty.c
index bbbb99f..bbbb99f 100644
--- a/scroll-0.1/ptty.c
+++ b/utils/scroll-0.1/ptty.c
diff --git a/scroll-0.1/scroll.1 b/utils/scroll-0.1/scroll.1
index b5524ab..b5524ab 100644
--- a/scroll-0.1/scroll.1
+++ b/utils/scroll-0.1/scroll.1
diff --git a/scroll-0.1/scroll.c b/utils/scroll-0.1/scroll.c
index 8f66d54..8f66d54 100644
--- a/scroll-0.1/scroll.c
+++ b/utils/scroll-0.1/scroll.c
diff --git a/scroll-0.1/up.log b/utils/scroll-0.1/up.log
index 5f40226..5f40226 100644
--- a/scroll-0.1/up.log
+++ b/utils/scroll-0.1/up.log
diff --git a/scroll-0.1/up.sh b/utils/scroll-0.1/up.sh
index fa28a80..fa28a80 100755
--- a/scroll-0.1/up.sh
+++ b/utils/scroll-0.1/up.sh
diff --git a/st-0.8.5/FAQ b/utils/st-0.8.5/FAQ
index 969b195..969b195 100644
--- a/st-0.8.5/FAQ
+++ b/utils/st-0.8.5/FAQ
diff --git a/st-0.8.5/LEGACY b/utils/st-0.8.5/LEGACY
index bf28b1e..bf28b1e 100644
--- a/st-0.8.5/LEGACY
+++ b/utils/st-0.8.5/LEGACY
diff --git a/st-0.8.5/LICENSE b/utils/st-0.8.5/LICENSE
index d80eb47..d80eb47 100644
--- a/st-0.8.5/LICENSE
+++ b/utils/st-0.8.5/LICENSE
diff --git a/st-0.8.5/Makefile b/utils/st-0.8.5/Makefile
index 470ac86..470ac86 100644
--- a/st-0.8.5/Makefile
+++ b/utils/st-0.8.5/Makefile
diff --git a/st-0.8.5/README b/utils/st-0.8.5/README
index 6a846ed..6a846ed 100644
--- a/st-0.8.5/README
+++ b/utils/st-0.8.5/README
diff --git a/st-0.8.5/TODO b/utils/st-0.8.5/TODO
index 5f74cd5..5f74cd5 100644
--- a/st-0.8.5/TODO
+++ b/utils/st-0.8.5/TODO
diff --git a/st-0.8.5/arg.h b/utils/st-0.8.5/arg.h
index a22e019..a22e019 100644
--- a/st-0.8.5/arg.h
+++ b/utils/st-0.8.5/arg.h
diff --git a/st-0.8.5/config.def.h b/utils/st-0.8.5/config.def.h
index 98b3900..98b3900 100644
--- a/st-0.8.5/config.def.h
+++ b/utils/st-0.8.5/config.def.h
diff --git a/st-0.8.5/config.h b/utils/st-0.8.5/config.h
index be9198f..1b024b8 100644
--- a/st-0.8.5/config.h
+++ b/utils/st-0.8.5/config.h
@@ -1,4 +1,4 @@
-#include "../colors.h"
+#include "../../colors.h"
 /* See LICENSE file for copyright and license details. */
 
 /*
diff --git a/st-0.8.5/config.mk b/utils/st-0.8.5/config.mk
index 0114bad..0114bad 100644
--- a/st-0.8.5/config.mk
+++ b/utils/st-0.8.5/config.mk
diff --git a/st-0.8.5/patches/st-alpha-20220206-0.8.5.diff b/utils/st-0.8.5/patches/st-alpha-20220206-0.8.5.diff
index ab029f6..ab029f6 100644
--- a/st-0.8.5/patches/st-alpha-20220206-0.8.5.diff
+++ b/utils/st-0.8.5/patches/st-alpha-20220206-0.8.5.diff
diff --git a/st-0.8.5/patches/st-blinking_cursor-20211116-2f6e597.diff b/utils/st-0.8.5/patches/st-blinking_cursor-20211116-2f6e597.diff
index 91c871a..91c871a 100644
--- a/st-0.8.5/patches/st-blinking_cursor-20211116-2f6e597.diff
+++ b/utils/st-0.8.5/patches/st-blinking_cursor-20211116-2f6e597.diff
diff --git a/st-0.8.5/patches/st-graphics.diff b/utils/st-0.8.5/patches/st-graphics.diff
index 1bc4d48..1bc4d48 100644
--- a/st-0.8.5/patches/st-graphics.diff
+++ b/utils/st-0.8.5/patches/st-graphics.diff
diff --git a/st-0.8.5/patches/st-hidecursor-0.8.3.diff b/utils/st-0.8.5/patches/st-hidecursor-0.8.3.diff
index 4895a66..4895a66 100644
--- a/st-0.8.5/patches/st-hidecursor-0.8.3.diff
+++ b/utils/st-0.8.5/patches/st-hidecursor-0.8.3.diff
diff --git a/st-0.8.5/patches/st-scrollback-ringbuffer-0.8.5.diff b/utils/st-0.8.5/patches/st-scrollback-ringbuffer-0.8.5.diff
index 7c060c5..7c060c5 100644
--- a/st-0.8.5/patches/st-scrollback-ringbuffer-0.8.5.diff
+++ b/utils/st-0.8.5/patches/st-scrollback-ringbuffer-0.8.5.diff
diff --git a/st-0.8.5/st.1 b/utils/st-0.8.5/st.1
index 39120b4..39120b4 100644
--- a/st-0.8.5/st.1
+++ b/utils/st-0.8.5/st.1
diff --git a/st-0.8.5/st.c b/utils/st-0.8.5/st.c
index 3c2646a..3c2646a 100644
--- a/st-0.8.5/st.c
+++ b/utils/st-0.8.5/st.c
diff --git a/st-0.8.5/st.h b/utils/st-0.8.5/st.h
index f425fb6..f425fb6 100644
--- a/st-0.8.5/st.h
+++ b/utils/st-0.8.5/st.h
diff --git a/st-0.8.5/st.info b/utils/st-0.8.5/st.info
index 8201ad6..8201ad6 100644
--- a/st-0.8.5/st.info
+++ b/utils/st-0.8.5/st.info
diff --git a/st-0.8.5/win.h b/utils/st-0.8.5/win.h
index e6e4369..e6e4369 100644
--- a/st-0.8.5/win.h
+++ b/utils/st-0.8.5/win.h
diff --git a/st-0.8.5/x.c b/utils/st-0.8.5/x.c
index 601fc0d..601fc0d 100644
--- a/st-0.8.5/x.c
+++ b/utils/st-0.8.5/x.c
diff --git a/surf/LICENSE b/utils/surf/LICENSE
index 2cdab7c..2cdab7c 100644
--- a/surf/LICENSE
+++ b/utils/surf/LICENSE
diff --git a/surf/Makefile b/utils/surf/Makefile
index 1edf820..1edf820 100644
--- a/surf/Makefile
+++ b/utils/surf/Makefile
diff --git a/surf/README b/utils/surf/README
index da4577f..da4577f 100644
--- a/surf/README
+++ b/utils/surf/README
diff --git a/surf/TODO.md b/utils/surf/TODO.md
index da5f44d..da5f44d 100644
--- a/surf/TODO.md
+++ b/utils/surf/TODO.md
diff --git a/surf/ads.txt b/utils/surf/ads.txt
index 85c4c5e..85c4c5e 100644
--- a/surf/ads.txt
+++ b/utils/surf/ads.txt
diff --git a/surf/arg.h b/utils/surf/arg.h
index ba3fb3f..ba3fb3f 100644
--- a/surf/arg.h
+++ b/utils/surf/arg.h
diff --git a/surf/common.h b/utils/surf/common.h
index 3990c42..3990c42 100644
--- a/surf/common.h
+++ b/utils/surf/common.h
diff --git a/surf/config.def.h b/utils/surf/config.def.h
index 9545af2..9545af2 100644
--- a/surf/config.def.h
+++ b/utils/surf/config.def.h
diff --git a/surf/config.h b/utils/surf/config.h
index 22dca0d..22dca0d 100644
--- a/surf/config.h
+++ b/utils/surf/config.h
diff --git a/surf/config.mk b/utils/surf/config.mk
index 3b53c9c..9586502 100644
--- a/surf/config.mk
+++ b/utils/surf/config.mk
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 
 # surf version
 VERSION = 2.1
diff --git a/surf/patch/surf-2.0-homepage.diff b/utils/surf/patch/surf-2.0-homepage.diff
index f32016f..f32016f 100644
--- a/surf/patch/surf-2.0-homepage.diff
+++ b/utils/surf/patch/surf-2.0-homepage.diff
diff --git a/surf/patch/surf-2.1-history.diff b/utils/surf/patch/surf-2.1-history.diff
index 453750d..453750d 100644
--- a/surf/patch/surf-2.1-history.diff
+++ b/utils/surf/patch/surf-2.1-history.diff
diff --git a/surf/patch/surf-bookmarks-20170722-723ff26.diff b/utils/surf/patch/surf-bookmarks-20170722-723ff26.diff
index 323ba55..323ba55 100644
--- a/surf/patch/surf-bookmarks-20170722-723ff26.diff
+++ b/utils/surf/patch/surf-bookmarks-20170722-723ff26.diff
diff --git a/surf/patch/surf-short-title-20210206-7dcce9e.diff b/utils/surf/patch/surf-short-title-20210206-7dcce9e.diff
index 4a0a8a4..4a0a8a4 100644
--- a/surf/patch/surf-short-title-20210206-7dcce9e.diff
+++ b/utils/surf/patch/surf-short-title-20210206-7dcce9e.diff
diff --git a/surf/patch/surf-websearch-20190510-d068a38.diff b/utils/surf/patch/surf-websearch-20190510-d068a38.diff
index 7e7f92a..7e7f92a 100644
--- a/surf/patch/surf-websearch-20190510-d068a38.diff
+++ b/utils/surf/patch/surf-websearch-20190510-d068a38.diff
diff --git a/surf/script.js b/utils/surf/script.js
index f33fca3..f33fca3 100644
--- a/surf/script.js
+++ b/utils/surf/script.js
diff --git a/surf/surf-open.sh b/utils/surf/surf-open.sh
index c22edc2..c22edc2 100755
--- a/surf/surf-open.sh
+++ b/utils/surf/surf-open.sh
diff --git a/surf/surf.1 b/utils/surf/surf.1
index 38d76ec..38d76ec 100644
--- a/surf/surf.1
+++ b/utils/surf/surf.1
diff --git a/surf/surf.c b/utils/surf/surf.c
index 252a79a..252a79a 100644
--- a/surf/surf.c
+++ b/utils/surf/surf.c
diff --git a/surf/surf.png b/utils/surf/surf.png
index f5b2ab1..f5b2ab1 100644
--- a/surf/surf.png
+++ b/utils/surf/surf.png
diff --git a/surf/webext-surf.c b/utils/surf/webext-surf.c
index d087219..d087219 100644
--- a/surf/webext-surf.c
+++ b/utils/surf/webext-surf.c
diff --git a/tabbed/LICENSE b/utils/tabbed/LICENSE
index add8a53..add8a53 100644
--- a/tabbed/LICENSE
+++ b/utils/tabbed/LICENSE
diff --git a/tabbed/Makefile b/utils/tabbed/Makefile
index 32cc25b..32cc25b 100644
--- a/tabbed/Makefile
+++ b/utils/tabbed/Makefile
diff --git a/tabbed/README b/utils/tabbed/README
index 4ed6bbe..4ed6bbe 100644
--- a/tabbed/README
+++ b/utils/tabbed/README
diff --git a/tabbed/TODO b/utils/tabbed/TODO
index 8e1986d..8e1986d 100644
--- a/tabbed/TODO
+++ b/utils/tabbed/TODO
diff --git a/tabbed/arg.h b/utils/tabbed/arg.h
index a345b0b..a345b0b 100644
--- a/tabbed/arg.h
+++ b/utils/tabbed/arg.h
diff --git a/tabbed/config.def.h b/utils/tabbed/config.def.h
index ceda9f7..ceda9f7 100644
--- a/tabbed/config.def.h
+++ b/utils/tabbed/config.def.h
diff --git a/tabbed/config.h b/utils/tabbed/config.h
index 107b526..0ead353 100644
--- a/tabbed/config.h
+++ b/utils/tabbed/config.h
@@ -1,4 +1,4 @@
-#include "../colors.h"
+#include "../../colors.h"
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
diff --git a/tabbed/config.mk b/utils/tabbed/config.mk
index 3d3168b..426c93b 100644
--- a/tabbed/config.mk
+++ b/utils/tabbed/config.mk
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 # tabbed version
 VERSION = 0.6
 
diff --git a/tabbed/tabbed.1 b/utils/tabbed/tabbed.1
index 0ae29ce..0ae29ce 100644
--- a/tabbed/tabbed.1
+++ b/utils/tabbed/tabbed.1
diff --git a/tabbed/tabbed.c b/utils/tabbed/tabbed.c
index d30206b..d30206b 100644
--- a/tabbed/tabbed.c
+++ b/utils/tabbed/tabbed.c
diff --git a/wmname/LICENSE b/utils/wmname/LICENSE
index bf73bff..bf73bff 100644
--- a/wmname/LICENSE
+++ b/utils/wmname/LICENSE
diff --git a/wmname/Makefile b/utils/wmname/Makefile
index 61e7027..014349a 100644
--- a/wmname/Makefile
+++ b/utils/wmname/Makefile
@@ -1,7 +1,7 @@
 # wmname - prints/sets the WM name
 
 include config.mk
-include ../config.mk
+include ../../config.mk
 
 SRC = wmname.c
 OBJ = ${SRC:.c=.o}
diff --git a/wmname/README b/utils/wmname/README
index a7d4b2c..a7d4b2c 100644
--- a/wmname/README
+++ b/utils/wmname/README
diff --git a/wmname/config.mk b/utils/wmname/config.mk
index 6b58a5c..282cd94 100644
--- a/wmname/config.mk
+++ b/utils/wmname/config.mk
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 # wmname version
 VERSION = 0.1
 
diff --git a/wmname/wmname.c b/utils/wmname/wmname.c
index 7d846f3..7d846f3 100644
--- a/wmname/wmname.c
+++ b/utils/wmname/wmname.c
diff --git a/wm/Makefile b/wm/Makefile
new file mode 100644
index 0000000..badaa3f
--- /dev/null
+++ b/wm/Makefile
@@ -0,0 +1,17 @@
+include ../config.mk
+wm:
+	make -C $(DWM)
+	make -C $(DMENU)
+	make -C slock-1.4
+	make -C dwmblocks
+clean-wm:
+	make clean -C $(DWM)
+	make clean -C $(DMENU)
+	make clean -C slock-1.4
+	make clean -C dwmblocks
+install-wm:
+	make install -C $(DWM)
+	make install -C $(DMENU)
+	make install -C slock-1.4
+	make install -C dwmblocks
+
diff --git a/dmenu-5.1/LICENSE b/wm/dmenu-5.1/LICENSE
index 2a64b28..2a64b28 100644
--- a/dmenu-5.1/LICENSE
+++ b/wm/dmenu-5.1/LICENSE
diff --git a/dmenu-5.1/Makefile b/wm/dmenu-5.1/Makefile
index a03a95c..a03a95c 100644
--- a/dmenu-5.1/Makefile
+++ b/wm/dmenu-5.1/Makefile
diff --git a/dmenu-5.1/README b/wm/dmenu-5.1/README
index a8fcdfe..a8fcdfe 100644
--- a/dmenu-5.1/README
+++ b/wm/dmenu-5.1/README
diff --git a/dmenu-5.1/arg.h b/wm/dmenu-5.1/arg.h
index e94e02b..e94e02b 100644
--- a/dmenu-5.1/arg.h
+++ b/wm/dmenu-5.1/arg.h
diff --git a/dmenu-5.1/config.def.h b/wm/dmenu-5.1/config.def.h
index 1edb647..1edb647 100644
--- a/dmenu-5.1/config.def.h
+++ b/wm/dmenu-5.1/config.def.h
diff --git a/dmenu-5.1/config.h b/wm/dmenu-5.1/config.h
index 2085cc2..2085cc2 100644
--- a/dmenu-5.1/config.h
+++ b/wm/dmenu-5.1/config.h
diff --git a/dmenu-5.1/config.mk b/wm/dmenu-5.1/config.mk
index 0df3fc8..0df3fc8 100644
--- a/dmenu-5.1/config.mk
+++ b/wm/dmenu-5.1/config.mk
diff --git a/dmenu-5.1/dmenu-allow-color-font-5.0.diff b/wm/dmenu-5.1/dmenu-allow-color-font-5.0.diff
index 767b466..767b466 100644
--- a/dmenu-5.1/dmenu-allow-color-font-5.0.diff
+++ b/wm/dmenu-5.1/dmenu-allow-color-font-5.0.diff
diff --git a/dmenu-5.1/dmenu.1 b/wm/dmenu-5.1/dmenu.1
index 323f93c..323f93c 100644
--- a/dmenu-5.1/dmenu.1
+++ b/wm/dmenu-5.1/dmenu.1
diff --git a/dmenu-5.1/dmenu.c b/wm/dmenu-5.1/dmenu.c
index d95e6c6..d95e6c6 100644
--- a/dmenu-5.1/dmenu.c
+++ b/wm/dmenu-5.1/dmenu.c
diff --git a/dmenu-5.1/dmenu_path b/wm/dmenu-5.1/dmenu_path
index 3a7cda7..3a7cda7 100755
--- a/dmenu-5.1/dmenu_path
+++ b/wm/dmenu-5.1/dmenu_path
diff --git a/dmenu-5.1/dmenu_run b/wm/dmenu-5.1/dmenu_run
index 834ede5..834ede5 100755
--- a/dmenu-5.1/dmenu_run
+++ b/wm/dmenu-5.1/dmenu_run
diff --git a/dmenu-5.1/drw.c b/wm/dmenu-5.1/drw.c
index 7a5bc0d..7a5bc0d 100644
--- a/dmenu-5.1/drw.c
+++ b/wm/dmenu-5.1/drw.c
diff --git a/dmenu-5.1/drw.h b/wm/dmenu-5.1/drw.h
index 4c67419..4c67419 100644
--- a/dmenu-5.1/drw.h
+++ b/wm/dmenu-5.1/drw.h
diff --git a/dmenu-5.1/stest.1 b/wm/dmenu-5.1/stest.1
index 2667d8a..2667d8a 100644
--- a/dmenu-5.1/stest.1
+++ b/wm/dmenu-5.1/stest.1
diff --git a/dmenu-5.1/stest.c b/wm/dmenu-5.1/stest.c
index e27d3a5..e27d3a5 100644
--- a/dmenu-5.1/stest.c
+++ b/wm/dmenu-5.1/stest.c
diff --git a/dmenu-5.1/util.c b/wm/dmenu-5.1/util.c
index fe044fc..fe044fc 100644
--- a/dmenu-5.1/util.c
+++ b/wm/dmenu-5.1/util.c
diff --git a/dmenu-5.1/util.h b/wm/dmenu-5.1/util.h
index f633b51..f633b51 100644
--- a/dmenu-5.1/util.h
+++ b/wm/dmenu-5.1/util.h
diff --git a/dwm-6.3/LICENSE b/wm/dwm-6.3/LICENSE
index d221f09..d221f09 100644
--- a/dwm-6.3/LICENSE
+++ b/wm/dwm-6.3/LICENSE
diff --git a/dwm-6.3/Makefile b/wm/dwm-6.3/Makefile
index 3009009..3009009 100644
--- a/dwm-6.3/Makefile
+++ b/wm/dwm-6.3/Makefile
diff --git a/dwm-6.3/README b/wm/dwm-6.3/README
index 95d4fd0..95d4fd0 100644
--- a/dwm-6.3/README
+++ b/wm/dwm-6.3/README
diff --git a/dwm-6.3/cmd.h b/wm/dwm-6.3/cmd.h
index e734f59..e734f59 100644
--- a/dwm-6.3/cmd.h
+++ b/wm/dwm-6.3/cmd.h
diff --git a/dwm-6.3/config.def.h b/wm/dwm-6.3/config.def.h
index 72aada7..72aada7 100644
--- a/dwm-6.3/config.def.h
+++ b/wm/dwm-6.3/config.def.h
diff --git a/dwm-6.3/config.h b/wm/dwm-6.3/config.h
index fb9ed41..f76e03b 100644
--- a/dwm-6.3/config.h
+++ b/wm/dwm-6.3/config.h
@@ -16,7 +16,7 @@ static const char *fonts[]          = { "Source Code Pro:size=9" , "NotoColorEmo
 static const char dmenufont[]       = "Source Code Pro:size=9";
 static const unsigned int baralpha = 0xd0;
 static const unsigned int borderalpha = OPAQUE;
-#include "../colors.h"
+#include "../../colors.h"
 static const char *colors[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
diff --git a/dwm-6.3/config.mk b/wm/dwm-6.3/config.mk
index 6ec65e3..ebb872b 100644
--- a/dwm-6.3/config.mk
+++ b/wm/dwm-6.3/config.mk
@@ -1,4 +1,4 @@
-include ../config.mk
+include ../../config.mk
 # dwm version
 VERSION = 6.3
 
diff --git a/dwm-6.3/drw.c b/wm/dwm-6.3/drw.c
index 45baf67..45baf67 100644
--- a/dwm-6.3/drw.c
+++ b/wm/dwm-6.3/drw.c
diff --git a/dwm-6.3/drw.h b/wm/dwm-6.3/drw.h
index a56f523..a56f523 100644
--- a/dwm-6.3/drw.h
+++ b/wm/dwm-6.3/drw.h
diff --git a/dwm-6.3/dwm.1 b/wm/dwm-6.3/dwm.1
index ddc8321..ddc8321 100644
--- a/dwm-6.3/dwm.1
+++ b/wm/dwm-6.3/dwm.1
diff --git a/dwm-6.3/dwm.c b/wm/dwm-6.3/dwm.c
index b9d29c3..b9d29c3 100644
--- a/dwm-6.3/dwm.c
+++ b/wm/dwm-6.3/dwm.c
diff --git a/dwm-6.3/dwm.png b/wm/dwm-6.3/dwm.png
index b1f9ba7..b1f9ba7 100644
--- a/dwm-6.3/dwm.png
+++ b/wm/dwm-6.3/dwm.png
diff --git a/dwm-6.3/patches/dwm-activetagindicatorbar-6.2.diff b/wm/dwm-6.3/patches/dwm-activetagindicatorbar-6.2.diff
index 4450099..4450099 100644
--- a/dwm-6.3/patches/dwm-activetagindicatorbar-6.2.diff
+++ b/wm/dwm-6.3/patches/dwm-activetagindicatorbar-6.2.diff
diff --git a/dwm-6.3/patches/dwm-alpha-20201019-61bb8b2.diff b/wm/dwm-6.3/patches/dwm-alpha-20201019-61bb8b2.diff
index 9a8e92a..9a8e92a 100644
--- a/dwm-6.3/patches/dwm-alpha-20201019-61bb8b2.diff
+++ b/wm/dwm-6.3/patches/dwm-alpha-20201019-61bb8b2.diff
diff --git a/dwm-6.3/patches/dwm-cool-autostart-6.2.diff b/wm/dwm-6.3/patches/dwm-cool-autostart-6.2.diff
index 84a93ea..84a93ea 100644
--- a/dwm-6.3/patches/dwm-cool-autostart-6.2.diff
+++ b/wm/dwm-6.3/patches/dwm-cool-autostart-6.2.diff
diff --git a/dwm-6.3/patches/dwm-statuscmd-20210405-67d76bd.diff b/wm/dwm-6.3/patches/dwm-statuscmd-20210405-67d76bd.diff
index 4b26420..4b26420 100644
--- a/dwm-6.3/patches/dwm-statuscmd-20210405-67d76bd.diff
+++ b/wm/dwm-6.3/patches/dwm-statuscmd-20210405-67d76bd.diff
diff --git a/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff b/wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff
index 1dc5c53..1dc5c53 100644
--- a/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff
+++ b/wm/dwm-6.3/patches/dwm-statuscmd-nosignal-20210402-67d76bd.diff
diff --git a/dwm-6.3/patches/dwm-swallow-20201211-61bb8b2.diff b/wm/dwm-6.3/patches/dwm-swallow-20201211-61bb8b2.diff
index 6bc0a1f..6bc0a1f 100644
--- a/dwm-6.3/patches/dwm-swallow-20201211-61bb8b2.diff
+++ b/wm/dwm-6.3/patches/dwm-swallow-20201211-61bb8b2.diff
diff --git a/dwm-6.3/patches/dwm-vanitygaps-6.2.diff b/wm/dwm-6.3/patches/dwm-vanitygaps-6.2.diff
index 18cbd6d..18cbd6d 100644
--- a/dwm-6.3/patches/dwm-vanitygaps-6.2.diff
+++ b/wm/dwm-6.3/patches/dwm-vanitygaps-6.2.diff
diff --git a/dwm-6.3/transient.c b/wm/dwm-6.3/transient.c
index 040adb5..040adb5 100644
--- a/dwm-6.3/transient.c
+++ b/wm/dwm-6.3/transient.c
diff --git a/dwm-6.3/util.c b/wm/dwm-6.3/util.c
index fe044fc..fe044fc 100644
--- a/dwm-6.3/util.c
+++ b/wm/dwm-6.3/util.c
diff --git a/dwm-6.3/util.h b/wm/dwm-6.3/util.h
index f633b51..f633b51 100644
--- a/dwm-6.3/util.h
+++ b/wm/dwm-6.3/util.h
diff --git a/dwm-6.3/vanitygaps.c b/wm/dwm-6.3/vanitygaps.c
index d81f8c6..d81f8c6 100644
--- a/dwm-6.3/vanitygaps.c
+++ b/wm/dwm-6.3/vanitygaps.c
diff --git a/dwmblocks/LICENSE b/wm/dwmblocks/LICENSE
index 3ec2656..3ec2656 100644
--- a/dwmblocks/LICENSE
+++ b/wm/dwmblocks/LICENSE
diff --git a/dwmblocks/Makefile b/wm/dwmblocks/Makefile
index 75109ac..75109ac 100644
--- a/dwmblocks/Makefile
+++ b/wm/dwmblocks/Makefile
diff --git a/dwmblocks/README.md b/wm/dwmblocks/README.md
index dda2259..dda2259 100644
--- a/dwmblocks/README.md
+++ b/wm/dwmblocks/README.md
diff --git a/dwmblocks/blocks.def.h b/wm/dwmblocks/blocks.def.h
index 9c22d68..9c22d68 100644
--- a/dwmblocks/blocks.def.h
+++ b/wm/dwmblocks/blocks.def.h
diff --git a/dwmblocks/blocks.h b/wm/dwmblocks/blocks.h
index 6b84963..6b84963 100644
--- a/dwmblocks/blocks.h
+++ b/wm/dwmblocks/blocks.h
diff --git a/dwmblocks/dwmblocks-battery b/wm/dwmblocks/dwmblocks-battery
index 66f1d1f..66f1d1f 100755
--- a/dwmblocks/dwmblocks-battery
+++ b/wm/dwmblocks/dwmblocks-battery
diff --git a/dwmblocks/dwmblocks-brightness b/wm/dwmblocks/dwmblocks-brightness
index 420518d..420518d 100755
--- a/dwmblocks/dwmblocks-brightness
+++ b/wm/dwmblocks/dwmblocks-brightness
diff --git a/dwmblocks/dwmblocks-forecast b/wm/dwmblocks/dwmblocks-forecast
index 3c2482e..3c2482e 100755
--- a/dwmblocks/dwmblocks-forecast
+++ b/wm/dwmblocks/dwmblocks-forecast
diff --git a/dwmblocks/dwmblocks-mpc b/wm/dwmblocks/dwmblocks-mpc
index c468ec8..c468ec8 100755
--- a/dwmblocks/dwmblocks-mpc
+++ b/wm/dwmblocks/dwmblocks-mpc
diff --git a/dwmblocks/dwmblocks-volume b/wm/dwmblocks/dwmblocks-volume
index 048fa04..048fa04 100755
--- a/dwmblocks/dwmblocks-volume
+++ b/wm/dwmblocks/dwmblocks-volume
diff --git a/dwmblocks/dwmblocks.c b/wm/dwmblocks/dwmblocks.c
index 62c481c..62c481c 100644
--- a/dwmblocks/dwmblocks.c
+++ b/wm/dwmblocks/dwmblocks.c
diff --git a/slock-1.4/LICENSE b/wm/slock-1.4/LICENSE
index 2e4419b..2e4419b 100644
--- a/slock-1.4/LICENSE
+++ b/wm/slock-1.4/LICENSE
diff --git a/slock-1.4/Makefile b/wm/slock-1.4/Makefile
index 0f308b7..0f308b7 100644
--- a/slock-1.4/Makefile
+++ b/wm/slock-1.4/Makefile
diff --git a/slock-1.4/README b/wm/slock-1.4/README
index a81290d..a81290d 100644
--- a/slock-1.4/README
+++ b/wm/slock-1.4/README
diff --git a/slock-1.4/arg.h b/wm/slock-1.4/arg.h
index 0b23c53..0b23c53 100644
--- a/slock-1.4/arg.h
+++ b/wm/slock-1.4/arg.h
diff --git a/slock-1.4/config.def.h b/wm/slock-1.4/config.def.h
index eb88b3d..eb88b3d 100644
--- a/slock-1.4/config.def.h
+++ b/wm/slock-1.4/config.def.h
diff --git a/slock-1.4/config.h b/wm/slock-1.4/config.h
index 64f13ed..64f13ed 100644
--- a/slock-1.4/config.h
+++ b/wm/slock-1.4/config.h
diff --git a/slock-1.4/config.mk b/wm/slock-1.4/config.mk
index 987819e..987819e 100644
--- a/slock-1.4/config.mk
+++ b/wm/slock-1.4/config.mk
diff --git a/slock-1.4/explicit_bzero.c b/wm/slock-1.4/explicit_bzero.c
index 3e33ca8..3e33ca8 100644
--- a/slock-1.4/explicit_bzero.c
+++ b/wm/slock-1.4/explicit_bzero.c
diff --git a/slock-1.4/lockscreen.jpg b/wm/slock-1.4/lockscreen.jpg
index 08e4321..08e4321 100644
--- a/slock-1.4/lockscreen.jpg
+++ b/wm/slock-1.4/lockscreen.jpg
diff --git a/slock-1.4/slock-background-image-20220318-1c5a538.diff b/wm/slock-1.4/slock-background-image-20220318-1c5a538.diff
index 2d4caf4..2d4caf4 100644
--- a/slock-1.4/slock-background-image-20220318-1c5a538.diff
+++ b/wm/slock-1.4/slock-background-image-20220318-1c5a538.diff
diff --git a/slock-1.4/slock.1 b/wm/slock-1.4/slock.1
index 82cdcd6..82cdcd6 100644
--- a/slock-1.4/slock.1
+++ b/wm/slock-1.4/slock.1
diff --git a/slock-1.4/slock.c b/wm/slock-1.4/slock.c
index 33f0a50..33f0a50 100644
--- a/slock-1.4/slock.c
+++ b/wm/slock-1.4/slock.c
diff --git a/slock-1.4/util.h b/wm/slock-1.4/util.h
index 6f748b8..6f748b8 100644
--- a/slock-1.4/util.h
+++ b/wm/slock-1.4/util.h