Resolved conflict, indulging new file layout

190 files changed, 191 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index f574378..0dd6688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,12 @@
 # build artifacts
 *.o
 # binaries
-/dmenu/dmenu
-/dmenu/dmenu_path
-/dmenu/dmenu_run
-/dmenu/stest
-/dwm/dwm
-/slock/slock
-/st/st
+/core/dmenu/dmenu
+/core/dmenu/stest
+/core/dwm/dwm
+/core/slock/slock
+/core/slock/config.h
+/core/st/st
+/core/slogin/slogin
 /tools/exofetch
 /tools/colorstagger
-/slogin/slogin
diff --git a/Makefile b/Makefile
index 18bfc1b..4c4190e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = dmenu dwm slock st tools slogin
+SUBDIRS = core/dmenu core/dwm core/slock core/st core/slogin tools
 
 .PHONY: all $(SUBDIRS) clean
 
diff --git a/oldresources/breathing-exo-daemon/breathing.d b/archive/breathing-exo-daemon/breathing.d
index 8114ecb..8114ecb 100755..100644
--- a/oldresources/breathing-exo-daemon/breathing.d
+++ b/archive/breathing-exo-daemon/breathing.d
diff --git a/oldresources/breathing-exo-daemon/display/display b/archive/breathing-exo-daemon/display/display
index b181258..b181258 100755..100644
--- a/oldresources/breathing-exo-daemon/display/display
+++ b/archive/breathing-exo-daemon/display/display
diff --git a/oldresources/breathing-exo-daemon/display/display-shm-x.c b/archive/breathing-exo-daemon/display/display-shm-x.c
index 2695fd0..2695fd0 100644
--- a/oldresources/breathing-exo-daemon/display/display-shm-x.c
+++ b/archive/breathing-exo-daemon/display/display-shm-x.c
diff --git a/oldresources/breathing-exo-daemon/display/display-shm.c b/archive/breathing-exo-daemon/display/display-shm.c
index 435077a..435077a 100644
--- a/oldresources/breathing-exo-daemon/display/display-shm.c
+++ b/archive/breathing-exo-daemon/display/display-shm.c
diff --git a/oldresources/breathing-exo-daemon/display/display-x b/archive/breathing-exo-daemon/display/display-x
index 87622d2..87622d2 100755..100644
--- a/oldresources/breathing-exo-daemon/display/display-x
+++ b/archive/breathing-exo-daemon/display/display-x
diff --git a/oldresources/breathing-exo-daemon/exo.c b/archive/breathing-exo-daemon/exo.c
index 858cd57..858cd57 100644
--- a/oldresources/breathing-exo-daemon/exo.c
+++ b/archive/breathing-exo-daemon/exo.c
diff --git a/oldresources/breathing-exo-daemon/v2/breathing.d b/archive/breathing-exo-daemon/v2/breathing.d
index 2af754c..2af754c 100755..100644
--- a/oldresources/breathing-exo-daemon/v2/breathing.d
+++ b/archive/breathing-exo-daemon/v2/breathing.d
diff --git a/oldresources/breathing-exo-daemon/v2/exo.c b/archive/breathing-exo-daemon/v2/exo.c
index 98027af..98027af 100644
--- a/oldresources/breathing-exo-daemon/v2/exo.c
+++ b/archive/breathing-exo-daemon/v2/exo.c
diff --git a/oldresources/breathing-exo-daemon/v3-shm/breathing.d b/archive/breathing-exo-daemon/v3-shm/breathing.d
index 469ea6a..469ea6a 100755..100644
--- a/oldresources/breathing-exo-daemon/v3-shm/breathing.d
+++ b/archive/breathing-exo-daemon/v3-shm/breathing.d
diff --git a/oldresources/breathing-exo-daemon/v3-shm/exo.c b/archive/breathing-exo-daemon/v3-shm/exo.c
index 5898280..5898280 100644
--- a/oldresources/breathing-exo-daemon/v3-shm/exo.c
+++ b/archive/breathing-exo-daemon/v3-shm/exo.c
diff --git a/oldresources/breathing-exo-daemon/v3-shm/exo.c.oldnosync b/archive/breathing-exo-daemon/v3-shm/exo.c.oldnosync
index 29ac2a6..29ac2a6 100644
--- a/oldresources/breathing-exo-daemon/v3-shm/exo.c.oldnosync
+++ b/archive/breathing-exo-daemon/v3-shm/exo.c.oldnosync
diff --git a/oldresources/breathing-exo-daemon/v4-clean-shm/Makefile b/archive/breathing-exo-daemon/v4-clean-shm/Makefile
index 2fef9cc..2fef9cc 100644
--- a/oldresources/breathing-exo-daemon/v4-clean-shm/Makefile
+++ b/archive/breathing-exo-daemon/v4-clean-shm/Makefile
diff --git a/oldresources/breathing-exo-daemon/v4-clean-shm/breathing.d b/archive/breathing-exo-daemon/v4-clean-shm/breathing.d
index cc85b67..cc85b67 100755..100644
--- a/oldresources/breathing-exo-daemon/v4-clean-shm/breathing.d
+++ b/archive/breathing-exo-daemon/v4-clean-shm/breathing.d
diff --git a/oldresources/breathing-exo-daemon/v4-clean-shm/exo.c b/archive/breathing-exo-daemon/v4-clean-shm/exo.c
index 9ab1f24..9ab1f24 100644
--- a/oldresources/breathing-exo-daemon/v4-clean-shm/exo.c
+++ b/archive/breathing-exo-daemon/v4-clean-shm/exo.c
diff --git a/oldresources/breathing-exo-daemon/v4-clean-shm/loadtest.c b/archive/breathing-exo-daemon/v4-clean-shm/loadtest.c
index 8cb3162..8cb3162 100644
--- a/oldresources/breathing-exo-daemon/v4-clean-shm/loadtest.c
+++ b/archive/breathing-exo-daemon/v4-clean-shm/loadtest.c
diff --git a/oldresources/breathing-exo-daemon/v4-clean-shm/test b/archive/breathing-exo-daemon/v4-clean-shm/test
index 501cf97..501cf97 100755..100644
--- a/oldresources/breathing-exo-daemon/v4-clean-shm/test
+++ b/archive/breathing-exo-daemon/v4-clean-shm/test
diff --git a/dwm/LICENSE b/archive/dwm/LICENSE
index 995172f..995172f 100644
--- a/dwm/LICENSE
+++ b/archive/dwm/LICENSE
diff --git a/dwm/Makefile b/archive/dwm/Makefile
index ffa69b4..ffa69b4 100644
--- a/dwm/Makefile
+++ b/archive/dwm/Makefile
diff --git a/dwm/README b/archive/dwm/README
index 95d4fd0..95d4fd0 100644
--- a/dwm/README
+++ b/archive/dwm/README
diff --git a/oldresources/dwm/config.def.h b/archive/dwm/config.def.h
index 5f18da4..5f18da4 100644
--- a/oldresources/dwm/config.def.h
+++ b/archive/dwm/config.def.h
diff --git a/oldresources/dwm/config.def.h.orig b/archive/dwm/config.def.h.orig
index a9980e2..a9980e2 100644
--- a/oldresources/dwm/config.def.h.orig
+++ b/archive/dwm/config.def.h.orig
diff --git a/oldresources/dwm/config.h b/archive/dwm/config.h
index 737caba..737caba 100644
--- a/oldresources/dwm/config.h
+++ b/archive/dwm/config.h
diff --git a/oldresources/dwm/config.mk b/archive/dwm/config.mk
index 8efca9a..8efca9a 100644
--- a/oldresources/dwm/config.mk
+++ b/archive/dwm/config.mk
diff --git a/oldresources/dwm/drw.c b/archive/dwm/drw.c
index 6be5dee..6be5dee 100644
--- a/oldresources/dwm/drw.c
+++ b/archive/dwm/drw.c
diff --git a/oldresources/dwm/drw.c.orig b/archive/dwm/drw.c.orig
index c41e6af..c41e6af 100644
--- a/oldresources/dwm/drw.c.orig
+++ b/archive/dwm/drw.c.orig
diff --git a/oldresources/dwm/drw.h b/archive/dwm/drw.h
index bdbf950..bdbf950 100644
--- a/oldresources/dwm/drw.h
+++ b/archive/dwm/drw.h
diff --git a/oldresources/dwm/drw.h.orig b/archive/dwm/drw.h.orig
index 6471431..6471431 100644
--- a/oldresources/dwm/drw.h.orig
+++ b/archive/dwm/drw.h.orig
diff --git a/oldresources/dwm/dwm.1 b/archive/dwm/dwm.1
index 3d310ac..3d310ac 100644
--- a/oldresources/dwm/dwm.1
+++ b/archive/dwm/dwm.1
diff --git a/oldresources/dwm/dwm.c b/archive/dwm/dwm.c
index 6cf64e6..6cf64e6 100644
--- a/oldresources/dwm/dwm.c
+++ b/archive/dwm/dwm.c
diff --git a/oldresources/dwm/dwm.c.bac b/archive/dwm/dwm.c.bac
index a225e80..a225e80 100644
--- a/oldresources/dwm/dwm.c.bac
+++ b/archive/dwm/dwm.c.bac
diff --git a/oldresources/dwm/dwm.c.cpy b/archive/dwm/dwm.c.cpy
index 9a5f110..9a5f110 100644
--- a/oldresources/dwm/dwm.c.cpy
+++ b/archive/dwm/dwm.c.cpy
diff --git a/oldresources/dwm/dwm.c.orig b/archive/dwm/dwm.c.orig
index 33c5cf9..33c5cf9 100644
--- a/oldresources/dwm/dwm.c.orig
+++ b/archive/dwm/dwm.c.orig
diff --git a/dwm/dwm.png b/archive/dwm/dwm.png
index b1f9ba7..b1f9ba7 100644
--- a/dwm/dwm.png
+++ b/archive/dwm/dwm.png
diff --git a/oldresources/dwm/patches/dwm-actualfullscreen-20211013-cb3f58a.diff b/archive/dwm/patches/dwm-actualfullscreen-20211013-cb3f58a.diff
index d3be230..d3be230 100644
--- a/oldresources/dwm/patches/dwm-actualfullscreen-20211013-cb3f58a.diff
+++ b/archive/dwm/patches/dwm-actualfullscreen-20211013-cb3f58a.diff
diff --git a/oldresources/dwm/patches/dwm-fullgaps-6.4.diff b/archive/dwm/patches/dwm-fullgaps-6.4.diff
index dc52139..dc52139 100644
--- a/oldresources/dwm/patches/dwm-fullgaps-6.4.diff
+++ b/archive/dwm/patches/dwm-fullgaps-6.4.diff
diff --git a/oldresources/dwm/patches/dwm-scratchpad-20240321-061e9fe.diff b/archive/dwm/patches/dwm-scratchpad-20240321-061e9fe.diff
index cb218b6..cb218b6 100644
--- a/oldresources/dwm/patches/dwm-scratchpad-20240321-061e9fe.diff
+++ b/archive/dwm/patches/dwm-scratchpad-20240321-061e9fe.diff
diff --git a/oldresources/dwm/patches/dwm-xresources-20210827-138b405.diff b/archive/dwm/patches/dwm-xresources-20210827-138b405.diff
index 29852a9..29852a9 100644
--- a/oldresources/dwm/patches/dwm-xresources-20210827-138b405.diff
+++ b/archive/dwm/patches/dwm-xresources-20210827-138b405.diff
diff --git a/dwm/transient.c b/archive/dwm/transient.c
index 040adb5..040adb5 100644
--- a/dwm/transient.c
+++ b/archive/dwm/transient.c
diff --git a/dmenu/util.c b/archive/dwm/util.c
index 8e26a51..8e26a51 100644
--- a/dmenu/util.c
+++ b/archive/dwm/util.c
diff --git a/dmenu/util.h b/archive/dwm/util.h
index c0a50d4..c0a50d4 100644
--- a/dmenu/util.h
+++ b/archive/dwm/util.h
diff --git a/oldresources/st/FAQ b/archive/st/FAQ
index b4d0b8a..b4d0b8a 100644
--- a/oldresources/st/FAQ
+++ b/archive/st/FAQ
diff --git a/oldresources/st/LEGACY b/archive/st/LEGACY
index bf28b1e..bf28b1e 100644
--- a/oldresources/st/LEGACY
+++ b/archive/st/LEGACY
diff --git a/oldresources/st/LICENSE b/archive/st/LICENSE
index 3cbf420..3cbf420 100644
--- a/oldresources/st/LICENSE
+++ b/archive/st/LICENSE
diff --git a/oldresources/st/Makefile b/archive/st/Makefile
index 2b3859a..2b3859a 100644
--- a/oldresources/st/Makefile
+++ b/archive/st/Makefile
diff --git a/oldresources/st/README b/archive/st/README
index 6a846ed..6a846ed 100644
--- a/oldresources/st/README
+++ b/archive/st/README
diff --git a/oldresources/st/README.md b/archive/st/README.md
index dccaa15..dccaa15 100644
--- a/oldresources/st/README.md
+++ b/archive/st/README.md
diff --git a/oldresources/st/TODO b/archive/st/TODO
index 5f74cd5..5f74cd5 100644
--- a/oldresources/st/TODO
+++ b/archive/st/TODO
diff --git a/oldresources/st/arg.h b/archive/st/arg.h
index a22e019..a22e019 100644
--- a/oldresources/st/arg.h
+++ b/archive/st/arg.h
diff --git a/oldresources/st/config.def.h b/archive/st/config.def.h
index 2dcaef7..2dcaef7 100644
--- a/oldresources/st/config.def.h
+++ b/archive/st/config.def.h
diff --git a/oldresources/st/config.h b/archive/st/config.h
index 5e56b49..5e56b49 100644
--- a/oldresources/st/config.h
+++ b/archive/st/config.h
diff --git a/oldresources/st/config.mk b/archive/st/config.mk
index 36e98ce..36e98ce 100644
--- a/oldresources/st/config.mk
+++ b/archive/st/config.mk
diff --git a/oldresources/st/hb.c b/archive/st/hb.c
index db845e7..db845e7 100644
--- a/oldresources/st/hb.c
+++ b/archive/st/hb.c
diff --git a/oldresources/st/hb.h b/archive/st/hb.h
index 0e8c1a4..0e8c1a4 100644
--- a/oldresources/st/hb.h
+++ b/archive/st/hb.h
diff --git a/oldresources/st/patch/alpha.c b/archive/st/patch/alpha.c
index 146bf4b..146bf4b 100644
--- a/oldresources/st/patch/alpha.c
+++ b/archive/st/patch/alpha.c
diff --git a/oldresources/st/patch/alpha.h b/archive/st/patch/alpha.h
index 2d01830..2d01830 100644
--- a/oldresources/st/patch/alpha.h
+++ b/archive/st/patch/alpha.h
diff --git a/oldresources/st/patch/background_image_x.c b/archive/st/patch/background_image_x.c
index 3bbb189..3bbb189 100644
--- a/oldresources/st/patch/background_image_x.c
+++ b/archive/st/patch/background_image_x.c
diff --git a/oldresources/st/patch/background_image_x.h b/archive/st/patch/background_image_x.h
index e96edd2..e96edd2 100644
--- a/oldresources/st/patch/background_image_x.h
+++ b/archive/st/patch/background_image_x.h
diff --git a/oldresources/st/patch/boxdraw.c b/archive/st/patch/boxdraw.c
index 3cc5b51..3cc5b51 100644
--- a/oldresources/st/patch/boxdraw.c
+++ b/archive/st/patch/boxdraw.c
diff --git a/oldresources/st/patch/boxdraw.h b/archive/st/patch/boxdraw.h
index 12df637..12df637 100644
--- a/oldresources/st/patch/boxdraw.h
+++ b/archive/st/patch/boxdraw.h
diff --git a/oldresources/st/patch/copyurl.c b/archive/st/patch/copyurl.c
index 90d96db..90d96db 100644
--- a/oldresources/st/patch/copyurl.c
+++ b/archive/st/patch/copyurl.c
diff --git a/oldresources/st/patch/copyurl.h b/archive/st/patch/copyurl.h
index 88059af..88059af 100644
--- a/oldresources/st/patch/copyurl.h
+++ b/archive/st/patch/copyurl.h
diff --git a/oldresources/st/patch/externalpipe.c b/archive/st/patch/externalpipe.c
index 37d8848..37d8848 100644
--- a/oldresources/st/patch/externalpipe.c
+++ b/archive/st/patch/externalpipe.c
diff --git a/oldresources/st/patch/externalpipe.h b/archive/st/patch/externalpipe.h
index 764504b..764504b 100644
--- a/oldresources/st/patch/externalpipe.h
+++ b/archive/st/patch/externalpipe.h
diff --git a/oldresources/st/patch/fixkeyboardinput.c b/archive/st/patch/fixkeyboardinput.c
index 75f8f40..75f8f40 100644
--- a/oldresources/st/patch/fixkeyboardinput.c
+++ b/archive/st/patch/fixkeyboardinput.c
diff --git a/oldresources/st/patch/font2.c b/archive/st/patch/font2.c
index 9fc0e2d..9fc0e2d 100644
--- a/oldresources/st/patch/font2.c
+++ b/archive/st/patch/font2.c
diff --git a/oldresources/st/patch/font2.h b/archive/st/patch/font2.h
index c0f9ff5..c0f9ff5 100644
--- a/oldresources/st/patch/font2.h
+++ b/archive/st/patch/font2.h
diff --git a/oldresources/st/patch/fullscreen_x.c b/archive/st/patch/fullscreen_x.c
index 3fa65f7..3fa65f7 100644
--- a/oldresources/st/patch/fullscreen_x.c
+++ b/archive/st/patch/fullscreen_x.c
diff --git a/oldresources/st/patch/fullscreen_x.h b/archive/st/patch/fullscreen_x.h
index 28a833b..28a833b 100644
--- a/oldresources/st/patch/fullscreen_x.h
+++ b/archive/st/patch/fullscreen_x.h
diff --git a/oldresources/st/patch/invert.c b/archive/st/patch/invert.c
index 2260b5d..2260b5d 100644
--- a/oldresources/st/patch/invert.c
+++ b/archive/st/patch/invert.c
diff --git a/oldresources/st/patch/invert.h b/archive/st/patch/invert.h
index 0b0931f..0b0931f 100644
--- a/oldresources/st/patch/invert.h
+++ b/archive/st/patch/invert.h
diff --git a/oldresources/st/patch/iso14755.c b/archive/st/patch/iso14755.c
index a2fbd79..a2fbd79 100644
--- a/oldresources/st/patch/iso14755.c
+++ b/archive/st/patch/iso14755.c
diff --git a/oldresources/st/patch/iso14755.h b/archive/st/patch/iso14755.h
index 45a3d7a..45a3d7a 100644
--- a/oldresources/st/patch/iso14755.h
+++ b/archive/st/patch/iso14755.h
diff --git a/oldresources/st/patch/keyboardselect_st.c b/archive/st/patch/keyboardselect_st.c
index 7599d9d..7599d9d 100644
--- a/oldresources/st/patch/keyboardselect_st.c
+++ b/archive/st/patch/keyboardselect_st.c
diff --git a/oldresources/st/patch/keyboardselect_st.h b/archive/st/patch/keyboardselect_st.h
index 3fa1ad7..3fa1ad7 100644
--- a/oldresources/st/patch/keyboardselect_st.h
+++ b/archive/st/patch/keyboardselect_st.h
diff --git a/oldresources/st/patch/keyboardselect_x.c b/archive/st/patch/keyboardselect_x.c
index 16af3e1..16af3e1 100644
--- a/oldresources/st/patch/keyboardselect_x.c
+++ b/archive/st/patch/keyboardselect_x.c
diff --git a/oldresources/st/patch/keyboardselect_x.h b/archive/st/patch/keyboardselect_x.h
index 6b1241a..6b1241a 100644
--- a/oldresources/st/patch/keyboardselect_x.h
+++ b/archive/st/patch/keyboardselect_x.h
diff --git a/oldresources/st/patch/netwmicon.h b/archive/st/patch/netwmicon.h
index 5e9c654..5e9c654 100644
--- a/oldresources/st/patch/netwmicon.h
+++ b/archive/st/patch/netwmicon.h
diff --git a/oldresources/st/patch/newterm.c b/archive/st/patch/newterm.c
index d4a1735..d4a1735 100644
--- a/oldresources/st/patch/newterm.c
+++ b/archive/st/patch/newterm.c
diff --git a/oldresources/st/patch/newterm.h b/archive/st/patch/newterm.h
index ea7292c..ea7292c 100644
--- a/oldresources/st/patch/newterm.h
+++ b/archive/st/patch/newterm.h
diff --git a/oldresources/st/patch/normalMode.c b/archive/st/patch/normalMode.c
index bbc9cfb..bbc9cfb 100644
--- a/oldresources/st/patch/normalMode.c
+++ b/archive/st/patch/normalMode.c
diff --git a/oldresources/st/patch/normalMode.h b/archive/st/patch/normalMode.h
index d910dca..d910dca 100644
--- a/oldresources/st/patch/normalMode.h
+++ b/archive/st/patch/normalMode.h
diff --git a/oldresources/st/patch/opencopied.c b/archive/st/patch/opencopied.c
index 9b07c58..9b07c58 100644
--- a/oldresources/st/patch/opencopied.c
+++ b/archive/st/patch/opencopied.c
diff --git a/oldresources/st/patch/opencopied.h b/archive/st/patch/opencopied.h
index 3734ac7..3734ac7 100644
--- a/oldresources/st/patch/opencopied.h
+++ b/archive/st/patch/opencopied.h
diff --git a/oldresources/st/patch/openurlonclick.c b/archive/st/patch/openurlonclick.c
index 626cde6..626cde6 100644
--- a/oldresources/st/patch/openurlonclick.c
+++ b/archive/st/patch/openurlonclick.c
diff --git a/oldresources/st/patch/openurlonclick.h b/archive/st/patch/openurlonclick.h
index 5aa09de..5aa09de 100644
--- a/oldresources/st/patch/openurlonclick.h
+++ b/archive/st/patch/openurlonclick.h
diff --git a/oldresources/st/patch/rightclicktoplumb_st.c b/archive/st/patch/rightclicktoplumb_st.c
index c60b946..c60b946 100644
--- a/oldresources/st/patch/rightclicktoplumb_st.c
+++ b/archive/st/patch/rightclicktoplumb_st.c
diff --git a/oldresources/st/patch/rightclicktoplumb_st.h b/archive/st/patch/rightclicktoplumb_st.h
index 98e42ab..98e42ab 100644
--- a/oldresources/st/patch/rightclicktoplumb_st.h
+++ b/archive/st/patch/rightclicktoplumb_st.h
diff --git a/oldresources/st/patch/rightclicktoplumb_x.c b/archive/st/patch/rightclicktoplumb_x.c
index 1b9b2bc..1b9b2bc 100644
--- a/oldresources/st/patch/rightclicktoplumb_x.c
+++ b/archive/st/patch/rightclicktoplumb_x.c
diff --git a/oldresources/st/patch/rightclicktoplumb_x.h b/archive/st/patch/rightclicktoplumb_x.h
index d0c8b88..d0c8b88 100644
--- a/oldresources/st/patch/rightclicktoplumb_x.h
+++ b/archive/st/patch/rightclicktoplumb_x.h
diff --git a/oldresources/st/patch/scrollback.c b/archive/st/patch/scrollback.c
index 2644cfe..2644cfe 100644
--- a/oldresources/st/patch/scrollback.c
+++ b/archive/st/patch/scrollback.c
diff --git a/oldresources/st/patch/scrollback.h b/archive/st/patch/scrollback.h
index 08940f0..08940f0 100644
--- a/oldresources/st/patch/scrollback.h
+++ b/archive/st/patch/scrollback.h
diff --git a/oldresources/st/patch/sixel_st.c b/archive/st/patch/sixel_st.c
index 13e1062..13e1062 100644
--- a/oldresources/st/patch/sixel_st.c
+++ b/archive/st/patch/sixel_st.c
diff --git a/oldresources/st/patch/sixel_st.h b/archive/st/patch/sixel_st.h
index cf2f0e1..cf2f0e1 100644
--- a/oldresources/st/patch/sixel_st.h
+++ b/archive/st/patch/sixel_st.h
diff --git a/oldresources/st/patch/sixel_x.c b/archive/st/patch/sixel_x.c
index 0f74f53..0f74f53 100644
--- a/oldresources/st/patch/sixel_x.c
+++ b/archive/st/patch/sixel_x.c
diff --git a/oldresources/st/patch/st_embedder_x.c b/archive/st/patch/st_embedder_x.c
index c73c389..c73c389 100644
--- a/oldresources/st/patch/st_embedder_x.c
+++ b/archive/st/patch/st_embedder_x.c
diff --git a/oldresources/st/patch/st_embedder_x.h b/archive/st/patch/st_embedder_x.h
index 6910fb9..6910fb9 100644
--- a/oldresources/st/patch/st_embedder_x.h
+++ b/archive/st/patch/st_embedder_x.h
diff --git a/oldresources/st/patch/st_include.c b/archive/st/patch/st_include.c
index 6772a6e..6772a6e 100644
--- a/oldresources/st/patch/st_include.c
+++ b/archive/st/patch/st_include.c
diff --git a/oldresources/st/patch/st_include.h b/archive/st/patch/st_include.h
index c30a752..c30a752 100644
--- a/oldresources/st/patch/st_include.h
+++ b/archive/st/patch/st_include.h
diff --git a/oldresources/st/patch/sync.c b/archive/st/patch/sync.c
index a0a815c..a0a815c 100644
--- a/oldresources/st/patch/sync.c
+++ b/archive/st/patch/sync.c
diff --git a/oldresources/st/patch/sync.h b/archive/st/patch/sync.h
index 6c2ebe7..6c2ebe7 100644
--- a/oldresources/st/patch/sync.h
+++ b/archive/st/patch/sync.h
diff --git a/oldresources/st/patch/utils.h b/archive/st/patch/utils.h
index 5ecea0d..5ecea0d 100644
--- a/oldresources/st/patch/utils.h
+++ b/archive/st/patch/utils.h
diff --git a/oldresources/st/patch/x_include.c b/archive/st/patch/x_include.c
index cbea418..cbea418 100644
--- a/oldresources/st/patch/x_include.c
+++ b/archive/st/patch/x_include.c
diff --git a/oldresources/st/patch/x_include.h b/archive/st/patch/x_include.h
index 6505909..6505909 100644
--- a/oldresources/st/patch/x_include.h
+++ b/archive/st/patch/x_include.h
diff --git a/oldresources/st/patch/xresources.c b/archive/st/patch/xresources.c
index ba3d985..ba3d985 100644
--- a/oldresources/st/patch/xresources.c
+++ b/archive/st/patch/xresources.c
diff --git a/oldresources/st/patch/xresources.h b/archive/st/patch/xresources.h
index c184852..c184852 100644
--- a/oldresources/st/patch/xresources.h
+++ b/archive/st/patch/xresources.h
diff --git a/oldresources/st/patches.def.h b/archive/st/patches.def.h
index 013cc10..013cc10 100644
--- a/oldresources/st/patches.def.h
+++ b/archive/st/patches.def.h
diff --git a/oldresources/st/patches.h b/archive/st/patches.h
index 1833fa6..1833fa6 100644
--- a/oldresources/st/patches.h
+++ b/archive/st/patches.h
diff --git a/oldresources/st/sixel.c b/archive/st/sixel.c
index d11fbf8..d11fbf8 100644
--- a/oldresources/st/sixel.c
+++ b/archive/st/sixel.c
diff --git a/oldresources/st/sixel.h b/archive/st/sixel.h
index a7d403d..a7d403d 100644
--- a/oldresources/st/sixel.h
+++ b/archive/st/sixel.h
diff --git a/oldresources/st/sixel_hls.c b/archive/st/sixel_hls.c
index c88241c..c88241c 100644
--- a/oldresources/st/sixel_hls.c
+++ b/archive/st/sixel_hls.c
diff --git a/oldresources/st/sixel_hls.h b/archive/st/sixel_hls.h
index 6176589..6176589 100644
--- a/oldresources/st/sixel_hls.h
+++ b/archive/st/sixel_hls.h
diff --git a/oldresources/st/st b/archive/st/st
index 49193d6..49193d6 100755..100644
--- a/oldresources/st/st
+++ b/archive/st/st
diff --git a/oldresources/st/st.1 b/archive/st/st.1
index 39120b4..39120b4 100644
--- a/oldresources/st/st.1
+++ b/archive/st/st.1
diff --git a/oldresources/st/st.c b/archive/st/st.c
index 5c49eb8..5c49eb8 100644
--- a/oldresources/st/st.c
+++ b/archive/st/st.c
diff --git a/oldresources/st/st.desktop b/archive/st/st.desktop
index 14a389a..14a389a 100644
--- a/oldresources/st/st.desktop
+++ b/archive/st/st.desktop
diff --git a/oldresources/st/st.h b/archive/st/st.h
index 41af307..41af307 100644
--- a/oldresources/st/st.h
+++ b/archive/st/st.h
diff --git a/oldresources/st/st.info b/archive/st/st.info
index b286fb5..b286fb5 100644
--- a/oldresources/st/st.info
+++ b/archive/st/st.info
diff --git a/oldresources/st/st.o b/archive/st/st.o
index 48e1610..48e1610 100644
--- a/oldresources/st/st.o
+++ b/archive/st/st.o
diff --git a/oldresources/st/win.h b/archive/st/win.h
index 55bd990..55bd990 100644
--- a/oldresources/st/win.h
+++ b/archive/st/win.h
diff --git a/oldresources/st/x.c b/archive/st/x.c
index a5cc7ef..a5cc7ef 100644
--- a/oldresources/st/x.c
+++ b/archive/st/x.c
diff --git a/oldresources/st/x.o b/archive/st/x.o
index 5deb5b1..5deb5b1 100644
--- a/oldresources/st/x.o
+++ b/archive/st/x.o
diff --git a/accent.h b/core/accent.h
index 8c9c6d4..8c9c6d4 100644
--- a/accent.h
+++ b/core/accent.h
diff --git a/dmenu/LICENSE b/core/dmenu/LICENSE
index 2a64b28..2a64b28 100644
--- a/dmenu/LICENSE
+++ b/core/dmenu/LICENSE
diff --git a/dmenu/Makefile b/core/dmenu/Makefile
index 458c524..458c524 100644
--- a/dmenu/Makefile
+++ b/core/dmenu/Makefile
diff --git a/dmenu/README b/core/dmenu/README
index a8fcdfe..a8fcdfe 100644
--- a/dmenu/README
+++ b/core/dmenu/README
diff --git a/dmenu/arg.h b/core/dmenu/arg.h
index e94e02b..e94e02b 100644
--- a/dmenu/arg.h
+++ b/core/dmenu/arg.h
diff --git a/dmenu/config.def.h b/core/dmenu/config.def.h
index bc17068..bc17068 100644
--- a/dmenu/config.def.h
+++ b/core/dmenu/config.def.h
diff --git a/dmenu/config.h b/core/dmenu/config.h
index 1edb647..1edb647 100644
--- a/dmenu/config.h
+++ b/core/dmenu/config.h
diff --git a/dmenu/config.mk b/core/dmenu/config.mk
index dcc5bb3..dcc5bb3 100644
--- a/dmenu/config.mk
+++ b/core/dmenu/config.mk
diff --git a/dmenu/dmenu.1 b/core/dmenu/dmenu.1
index 323f93c..323f93c 100644
--- a/dmenu/dmenu.1
+++ b/core/dmenu/dmenu.1
diff --git a/dmenu/dmenu.c b/core/dmenu/dmenu.c
index 54a14e2..54a14e2 100644
--- a/dmenu/dmenu.c
+++ b/core/dmenu/dmenu.c
diff --git a/dmenu/drw.c b/core/dmenu/drw.c
index c41e6af..c41e6af 100644
--- a/dmenu/drw.c
+++ b/core/dmenu/drw.c
diff --git a/dmenu/drw.h b/core/dmenu/drw.h
index fd7631b..fd7631b 100644
--- a/dmenu/drw.h
+++ b/core/dmenu/drw.h
diff --git a/dmenu/stest.1 b/core/dmenu/stest.1
index 2667d8a..2667d8a 100644
--- a/dmenu/stest.1
+++ b/core/dmenu/stest.1
diff --git a/dmenu/stest.c b/core/dmenu/stest.c
index e27d3a5..e27d3a5 100644
--- a/dmenu/stest.c
+++ b/core/dmenu/stest.c
diff --git a/dwm/util.c b/core/dmenu/util.c
index 8e26a51..8e26a51 100644
--- a/dwm/util.c
+++ b/core/dmenu/util.c
diff --git a/dwm/util.h b/core/dmenu/util.h
index c0a50d4..c0a50d4 100644
--- a/dwm/util.h
+++ b/core/dmenu/util.h
diff --git a/oldresources/dwm/LICENSE b/core/dwm/LICENSE
index 995172f..995172f 100644
--- a/oldresources/dwm/LICENSE
+++ b/core/dwm/LICENSE
diff --git a/oldresources/dwm/Makefile b/core/dwm/Makefile
index ffa69b4..ffa69b4 100644
--- a/oldresources/dwm/Makefile
+++ b/core/dwm/Makefile
diff --git a/oldresources/dwm/README b/core/dwm/README
index 95d4fd0..95d4fd0 100644
--- a/oldresources/dwm/README
+++ b/core/dwm/README
diff --git a/dwm/config.def.h b/core/dwm/config.def.h
index c94f430..c94f430 100644
--- a/dwm/config.def.h
+++ b/core/dwm/config.def.h
diff --git a/dwm/config.h b/core/dwm/config.h
index c89c80d..c89c80d 100644
--- a/dwm/config.h
+++ b/core/dwm/config.h
diff --git a/dwm/config.mk b/core/dwm/config.mk
index b469a2b..b469a2b 100644
--- a/dwm/config.mk
+++ b/core/dwm/config.mk
diff --git a/dwm/drw.c b/core/dwm/drw.c
index c41e6af..c41e6af 100644
--- a/dwm/drw.c
+++ b/core/dwm/drw.c
diff --git a/dwm/drw.h b/core/dwm/drw.h
index 6471431..6471431 100644
--- a/dwm/drw.h
+++ b/core/dwm/drw.h
diff --git a/dwm/dwm.1 b/core/dwm/dwm.1
index ddc8321..ddc8321 100644
--- a/dwm/dwm.1
+++ b/core/dwm/dwm.1
diff --git a/dwm/dwm.c b/core/dwm/dwm.c
index 4adbf21..4adbf21 100644
--- a/dwm/dwm.c
+++ b/core/dwm/dwm.c
diff --git a/oldresources/dwm/dwm.png b/core/dwm/dwm.png
index b1f9ba7..b1f9ba7 100644
--- a/oldresources/dwm/dwm.png
+++ b/core/dwm/dwm.png
diff --git a/oldresources/dwm/transient.c b/core/dwm/transient.c
index 040adb5..040adb5 100644
--- a/oldresources/dwm/transient.c
+++ b/core/dwm/transient.c
diff --git a/oldresources/dwm/util.c b/core/dwm/util.c
index 8e26a51..8e26a51 100644
--- a/oldresources/dwm/util.c
+++ b/core/dwm/util.c
diff --git a/oldresources/dwm/util.h b/core/dwm/util.h
index c0a50d4..c0a50d4 100644
--- a/oldresources/dwm/util.h
+++ b/core/dwm/util.h
diff --git a/slock/LICENSE b/core/slock/LICENSE
index cb52dba..cb52dba 100644
--- a/slock/LICENSE
+++ b/core/slock/LICENSE
diff --git a/slock/Makefile b/core/slock/Makefile
index 6d74b21..6d74b21 100644
--- a/slock/Makefile
+++ b/core/slock/Makefile
diff --git a/slock/README b/core/slock/README
index dcacd01..dcacd01 100644
--- a/slock/README
+++ b/core/slock/README
diff --git a/slock/arg.h b/core/slock/arg.h
index 0b23c53..0b23c53 100644
--- a/slock/arg.h
+++ b/core/slock/arg.h
diff --git a/slock/config.def.h b/core/slock/config.def.h
index 9855e21..9855e21 100644
--- a/slock/config.def.h
+++ b/core/slock/config.def.h
diff --git a/slock/config.h b/core/slock/config.h
index 9855e21..9855e21 100644
--- a/slock/config.h
+++ b/core/slock/config.h
diff --git a/slock/config.mk b/core/slock/config.mk
index 5c17d5e..5c17d5e 100644
--- a/slock/config.mk
+++ b/core/slock/config.mk
diff --git a/slock/explicit_bzero.c b/core/slock/explicit_bzero.c
index 3e33ca8..3e33ca8 100644
--- a/slock/explicit_bzero.c
+++ b/core/slock/explicit_bzero.c
diff --git a/slock/explicit_bzero.o b/core/slock/explicit_bzero.o
index 192474c..192474c 100644
--- a/slock/explicit_bzero.o
+++ b/core/slock/explicit_bzero.o
diff --git a/slock/patches/slock-blur_pixelated_screen-1.4.diff b/core/slock/patches/slock-blur_pixelated_screen-1.4.diff
index 90d9c16..90d9c16 100644
--- a/slock/patches/slock-blur_pixelated_screen-1.4.diff
+++ b/core/slock/patches/slock-blur_pixelated_screen-1.4.diff
diff --git a/slock/patches/slock-dwmlogo-20210324.diff b/core/slock/patches/slock-dwmlogo-20210324.diff
index 90625ea..90625ea 100644
--- a/slock/patches/slock-dwmlogo-20210324.diff
+++ b/core/slock/patches/slock-dwmlogo-20210324.diff
diff --git a/slock/patches/slock-dwmlogoandblurscreen-1.0.diff b/core/slock/patches/slock-dwmlogoandblurscreen-1.0.diff
index 17ffc72..17ffc72 100644
--- a/slock/patches/slock-dwmlogoandblurscreen-1.0.diff
+++ b/core/slock/patches/slock-dwmlogoandblurscreen-1.0.diff
diff --git a/slock/patches/slock-foreground-image-20211210.diff b/core/slock/patches/slock-foreground-image-20211210.diff
index 83d807a..83d807a 100644
--- a/slock/patches/slock-foreground-image-20211210.diff
+++ b/core/slock/patches/slock-foreground-image-20211210.diff
diff --git a/slock/slock b/core/slock/slock
index 0d85d2f..0d85d2f 100755
--- a/slock/slock
+++ b/core/slock/slock
diff --git a/slock/slock.1 b/core/slock/slock.1
index 40c15e1..40c15e1 100644
--- a/slock/slock.1
+++ b/core/slock/slock.1
diff --git a/slock/slock.c b/core/slock/slock.c
index 297e076..297e076 100644
--- a/slock/slock.c
+++ b/core/slock/slock.c
diff --git a/slock/slock.o b/core/slock/slock.o
index f28cbdd..f28cbdd 100644
--- a/slock/slock.o
+++ b/core/slock/slock.o
diff --git a/slock/util.h b/core/slock/util.h
index 6f748b8..6f748b8 100644
--- a/slock/util.h
+++ b/core/slock/util.h
diff --git a/core/slogin/Makefile b/core/slogin/Makefile
new file mode 100644
index 0000000..4d8c919
--- /dev/null
+++ b/core/slogin/Makefile
@@ -0,0 +1,16 @@
+CC = cc
+CFLAGS = -std=c99 -Wall -Wextra -pedantic -Os
+LDFLAGS = -lX11 -lcrypt
+PREFIX ?= /usr/local
+
+all: slogin
+
+slogin: slogin.c
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+
+clean:
+	rm -f slogin
+
+install: slogin
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp -f slogin $(DESTDIR)$(PREFIX)/bin
diff --git a/core/slogin/slogin.c b/core/slogin/slogin.c
new file mode 100644
index 0000000..856585b
--- /dev/null
+++ b/core/slogin/slogin.c
@@ -0,0 +1,166 @@
+#define _XOPEN_SOURCE 700
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <ctype.h>
+#include <grp.h>
+#include <pwd.h>
+#if HAVE_SHADOW_H
+#include <shadow.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <crypt.h>
+#include "../accent.h"
+
+#define WIDTH 400
+#define HEIGHT 100
+
+static int
+auth(const char *user, const char *pass)
+{
+	struct passwd *pw = getpwnam(user);
+	const char *hash;
+	if (!pw)
+		return 0;
+#if HAVE_SHADOW_H
+	struct spwd *sp = getspnam(user);
+	hash = sp ? sp->sp_pwdp : pw->pw_passwd;
+#else
+	hash = pw->pw_passwd;
+#endif
+	if (!hash || hash[0] == '!' || hash[0] == '*')
+		return 0;
+	return strcmp(crypt(pass, hash), hash) == 0;
+}
+
+static void
+draw(Display *dpy, Window win, GC gc, const char *prompt,
+     const char *input, int hidden)
+{
+	XClearWindow(dpy, win);
+	XDrawString(dpy, win, gc, 10, 25, prompt, strlen(prompt));
+	if (input && *input) {
+		char buf[128];
+		const char *show = input;
+		if (hidden) {
+			size_t n = strlen(input);
+			if (n >= sizeof buf)
+				n = sizeof buf - 1;
+			memset(buf, '*', n);
+			buf[n] = '\0';
+			show = buf;
+		}
+		XDrawString(dpy, win, gc, 10, 50, show, strlen(show));
+	}
+	XFlush(dpy);
+}
+
+int
+main(void)
+{
+	Display *dpy;
+	Window win;
+	XEvent ev;
+	GC gc;
+	XFontStruct *font;
+	int screen;
+	Colormap cmap;
+	XColor xcol;
+	ColorShm *blk = NULL;
+	char accent[8] = "#005577";
+
+	if (!(dpy = XOpenDisplay(NULL))) {
+		fprintf(stderr, "slogin: cannot open display\n");
+		return 1;
+	}
+	readaccent(&blk, accent);
+	screen = DefaultScreen(dpy);
+	cmap = DefaultColormap(dpy, screen);
+	XParseColor(dpy, cmap, accent, &xcol);
+	XAllocColor(dpy, cmap, &xcol);
+	win = XCreateSimpleWindow(dpy, RootWindow(dpy, screen),
+		DisplayWidth(dpy, screen)/2 - WIDTH/2,
+		DisplayHeight(dpy, screen)/2 - HEIGHT/2,
+		WIDTH, HEIGHT, 2, xcol.pixel, BlackPixel(dpy, screen));
+	XStoreName(dpy, win, "slogin");
+	XSelectInput(dpy, win, ExposureMask | KeyPressMask);
+	XMapRaised(dpy, win);
+	gc = XCreateGC(dpy, win, 0, NULL);
+	XSetForeground(dpy, gc, xcol.pixel);
+	font = XLoadQueryFont(dpy, "fixed");
+	if (font)
+		XSetFont(dpy, gc, font->fid);
+
+	char user[64] = "";
+	char pass[64] = "";
+	int stage = 0;
+	draw(dpy, win, gc, "user:", user, 0);
+
+	for (;;) {
+		if (XPending(dpy)) {
+			XNextEvent(dpy, &ev);
+			if (ev.type == Expose) {
+				draw(dpy, win, gc, stage ? "pass:" : "user:",
+					stage ? pass : user, stage);
+			} else if (ev.type == KeyPress) {
+				char buf[32];
+				KeySym ksym;
+				int len = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, NULL);
+				if (ksym == XK_Return) {
+					if (stage == 0) {
+						stage = 1;
+						draw(dpy, win, gc, "pass:", pass, 1);
+					} else {
+						if (auth(user, pass)) {
+							struct passwd *pw = getpwnam(user);
+							if (!pw)
+								exit(1);
+							chdir(pw->pw_dir);
+							setenv("HOME", pw->pw_dir, 1);
+							setenv("SHELL", pw->pw_shell, 1);
+							setenv("USER", pw->pw_name, 1);
+							setenv("LOGNAME", pw->pw_name, 1);
+							initgroups(pw->pw_name, pw->pw_gid);
+							setgid(pw->pw_gid);
+							setuid(pw->pw_uid);
+							execlp(pw->pw_shell, pw->pw_shell, "-l", NULL);
+							perror("execlp");
+							exit(1);
+						} else {
+							user[0] = pass[0] = '\0';
+							stage = 0;
+							draw(dpy, win, gc, "user:", user, 0);
+						}
+					}
+				} else if (ksym == XK_BackSpace) {
+					if (stage == 0) {
+						size_t n = strlen(user);
+						if (n) user[n-1] = '\0';
+						draw(dpy, win, gc, "user:", user, 0);
+					} else {
+						size_t n = strlen(pass);
+						if (n) pass[n-1] = '\0';
+						draw(dpy, win, gc, "pass:", pass, 1);
+					}
+				} else if (len && !iscntrl((unsigned char)buf[0])) {
+					if (stage == 0 && strlen(user) + len < sizeof user - 1) {
+						strncat(user, buf, len);
+						draw(dpy, win, gc, "user:", user, 0);
+					} else if (stage == 1 && strlen(pass) + len < sizeof pass - 1) {
+						strncat(pass, buf, len);
+						draw(dpy, win, gc, "pass:", pass, 1);
+					}
+				}
+			}
+		}
+		if (readaccent(&blk, accent)) {
+			XParseColor(dpy, cmap, accent, &xcol);
+			XAllocColor(dpy, cmap, &xcol);
+			XSetForeground(dpy, gc, xcol.pixel);
+			XSetWindowBorder(dpy, win, xcol.pixel);
+		}
+		usleep(20000);
+	}
+}
diff --git a/st/FAQ b/core/st/FAQ
index 6287a27..6287a27 100644
--- a/st/FAQ
+++ b/core/st/FAQ
diff --git a/st/LEGACY b/core/st/LEGACY
index bf28b1e..bf28b1e 100644
--- a/st/LEGACY
+++ b/core/st/LEGACY
diff --git a/st/LICENSE b/core/st/LICENSE
index 3cbf420..3cbf420 100644
--- a/st/LICENSE
+++ b/core/st/LICENSE
diff --git a/st/Makefile b/core/st/Makefile
index 15db421..15db421 100644
--- a/st/Makefile
+++ b/core/st/Makefile
diff --git a/st/README b/core/st/README
index 6a846ed..6a846ed 100644
--- a/st/README
+++ b/core/st/README
diff --git a/st/TODO b/core/st/TODO
index 5f74cd5..5f74cd5 100644
--- a/st/TODO
+++ b/core/st/TODO
diff --git a/st/arg.h b/core/st/arg.h
index a22e019..a22e019 100644
--- a/st/arg.h
+++ b/core/st/arg.h
diff --git a/st/config.def.h b/core/st/config.def.h
index 563ab55..563ab55 100644
--- a/st/config.def.h
+++ b/core/st/config.def.h
diff --git a/st/config.h b/core/st/config.h
index 563ab55..563ab55 100644
--- a/st/config.h
+++ b/core/st/config.h
diff --git a/st/config.mk b/core/st/config.mk
index 2fc854e..2fc854e 100644
--- a/st/config.mk
+++ b/core/st/config.mk
diff --git a/st/st.1 b/core/st/st.1
index 39120b4..39120b4 100644
--- a/st/st.1
+++ b/core/st/st.1
diff --git a/st/st.c b/core/st/st.c
index 8e57991..8e57991 100644
--- a/st/st.c
+++ b/core/st/st.c
diff --git a/st/st.h b/core/st/st.h
index fd3b0d8..fd3b0d8 100644
--- a/st/st.h
+++ b/core/st/st.h
diff --git a/st/st.info b/core/st/st.info
index efab2cf..efab2cf 100644
--- a/st/st.info
+++ b/core/st/st.info
diff --git a/st/win.h b/core/st/win.h
index 6de960d..6de960d 100644
--- a/st/win.h
+++ b/core/st/win.h
diff --git a/st/x.c b/core/st/x.c
index d73152b..d73152b 100644
--- a/st/x.c
+++ b/core/st/x.c
diff --git a/tools/exofetch.c b/tools/exofetch.c
index 826464d..361aeae 100644
--- a/tools/exofetch.c
+++ b/tools/exofetch.c
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <locale.h>
-#include "../accent.h"
+#include "../core/accent.h"
 
 static ColorShm *accentshm;
 static char accentcol[8] = "#005577";