diff --git a/files/.config/service/dunst/run b/files/.config/service/dunst/run
index c580c06..b633a41 100755
--- a/files/.config/service/dunst/run
+++ b/files/.config/service/dunst/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec chpst -e "$TURNSTILE_ENV_DIR" dunst
+exec dunst
diff --git a/files/.config/service/pass-sync/run b/files/.config/service/pass-sync/run
index 17ea7d6..7052d61 100755
--- a/files/.config/service/pass-sync/run
+++ b/files/.config/service/pass-sync/run
@@ -1,3 +1,2 @@
 #!/bin/sh
-
-exec chpst -e "$TURNSTILE_ENV_DIR" sh -c "pass-sync && sleep 60 || sleep 360"
\ No newline at end of file
+pass-sync && sleep 60 || sleep 360
\ No newline at end of file
diff --git a/files/.config/service/pipewire/run b/files/.config/service/pipewire/run
index 85197ea..14abda1 100755
--- a/files/.config/service/pipewire/run
+++ b/files/.config/service/pipewire/run
@@ -1,9 +1,8 @@
 #!/bin/sh
-rm -rf "/run/user/$(id -u)/pulse"
-exec chpst -e "$TURNSTILE_ENV_DIR" sh -c '
+exec 2>&1
 test -n "$DBUS_SESSION_BUS_ADDRESS" || {
 	>&2 echo "dbus not running"
 	exit 1
 }
+rm -rf "/run/user/$(id -u)/pulse"
 exec pipewire
-'
diff --git a/files/.config/service/sshfs/run b/files/.config/service/sshfs/run
index 0491741..9518ea8 100755
--- a/files/.config/service/sshfs/run
+++ b/files/.config/service/sshfs/run
@@ -1,4 +1,4 @@
 #!/bin/sh
-mkdir -p ~/nfs
-exec chpst -e "$TURNSTILE_ENV_DIR" \
-	sshfs -o auto_unmount -f kentoj.de:nfs ~/nfs
+mkdir -p "$HOME/nfs"
+exec sshfs -o auto_unmount -o uid=`id -u` -o gid=`id -g` -f kentoj.de:nfs "$HOME/nfs"
+
diff --git a/files/.config/vis/visrc.lua b/files/.config/vis/visrc.lua
index 705470f..4603d5d 100644
--- a/files/.config/vis/visrc.lua
+++ b/files/.config/vis/visrc.lua
@@ -9,6 +9,8 @@ end return require('plugins/vis-plug') end)()
 local plugins = {
 	{ 'erf/vis-sneak' },
 	{ 'kupospelov/vis-ctags' },
+	{ 'https://codeberg.org/luxanna/vis-autoclose' },
+  { 'http://forge.kentoj.de/kento2/vis-lspc.git' }
 }
 plug.init(plugins, true)
 
diff --git a/files/.cwmrc b/files/.cwmrc
index bc5dc8b..5730420 100644
--- a/files/.cwmrc
+++ b/files/.cwmrc
@@ -1,4 +1,6 @@
 ## CWM config file
+
+ignore xclock
  
 # Sticky groups: uncomment to enable worskpace-like behavior
 sticky                  yes
@@ -21,7 +23,7 @@ color menufg            "#5294E2"
 
 #Gaps (top, bottom, left, right)
 #gap                     32 8 8 8
-gap                     8 8 8 8
+gap                     18 8 8 8
  
 # Size of manually tiled Windows in %
 htile                   55
@@ -132,7 +134,7 @@ bind-key XF86AudioLowerVolume   "vol -"
 bind-key XF86AudioMute          "vol ."
 bind-key XF86AudioMicMute       "vol !"
 
-bind-key 4-y                    "playerctl play-pause"
+bind-key 4-y                    "playerctl -p spotify play-pause 2>/dev/null || playerctl play-pause"
 bind-key 4-less                 "playerctl previous"
 bind-key 4-greater              "playerctl next"
 
diff --git a/files/.profile b/files/.profile
index e6cf186..73e6bba 100644
--- a/files/.profile
+++ b/files/.profile
@@ -1,8 +1,9 @@
-export ENV="$HOME/.shrc"
+export ENV="$HOME/.kshrc"
 export PATH="$HOME/.local/bin":"$PATH"
+export MANPATH="/usr/local/man":"$MANPATH"
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/:/usr/lib/pkgconfig
 export XKB_DEFAULT_LAYOUT=de
-export XBPS_DISTDIR="$HOME/void-packages"
-
 export EDITOR=/usr/bin/vis
+
+export XBPS_DISTDIR="$HOME/void-packages"
 export CHEZSCHEMELIBDIRS="/usr/local/lib/csv10.3.0/":"$CHEZSCHEMELIBDIRS"
diff --git a/files/.xinitrc b/files/.xinitrc
index caaa44e..5e85b5d 100644
--- a/files/.xinitrc
+++ b/files/.xinitrc
@@ -1,6 +1 @@
-setxkbmap de &
-xrandr -r 144 &
-#xwallpaper --center "$HOME/.config/tanjiro.png" &
-xwallpaper --center "$HOME/dots/ssb.jpg" &
-picom --backend glx --blur-method=dual_kawase --blur-strength=3 &
-exec "$(which cwm)"
+exec dbus-run-session svscan "$HOME/.xinit-svc"
diff --git a/files/.zprofile b/files/.zprofile
index 8272e3e..6c40308 100644
--- a/files/.zprofile
+++ b/files/.zprofile
@@ -13,5 +13,5 @@ if grep -q l <<< "$-" && test "$(tty)" = '/dev/tty1'; then
 	rm -rf "$HOME"/.config/service-env
 	cd
 	echo 'Press return to start gui'
-	read && exec dbus-run-session "$HOME/.winit"
+	read && exec startx
 fi
diff --git a/pkgs.txt b/pkgs.txt
index 27d9f44..d303a4d 100644
--- a/pkgs.txt
+++ b/pkgs.txt
@@ -1,6 +1,7 @@
 alsa-pipewire
 chrony
 cwm
+daemontools
 dbus
 dmenu
 dunst