diff --git a/de/home/.config/sway/config b/de/home/.config/sway/config
index a4470cd..6506eef 100644
--- a/de/home/.config/sway/config
+++ b/de/home/.config/sway/config
@@ -3,18 +3,23 @@
 #
 
 # audio configs
-include $HOME/.config/sway/audio-config.d/*
-exec "paplay $HOME/.config/sway/assets/sounds/login.ogg &"
+#include $HOME/.config/sway/audio-config.d/*
+#exec "paplay $HOME/.config/sway/assets/sounds/login.ogg &"
 
 # display config
 #include $HOME/.config/sway/config.d/display
 
 # Variables
-include $HOME/.config/sway/config-vars${DESKTOP_MODE}.d/*
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/vars.d/*
 include $HOME/.config/de-vars/colors/active/sway
 
 # Configs
-include $HOME/.config/sway/config${DESKTOP_MODE}.d/*
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/display
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/autostart
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/workspaces
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/input
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/layout
+include $HOME/.config/sway/config${DESKTOP_MODE}.d/window_rules
 
 # Environment Setup
 exec "dbus-update-activation-environment --systemd --all"
diff --git a/de/home/.config/sway/config-vars-htpc.d/keys b/de/home/.config/sway/config-htpc.d/vars.d/keys
similarity index 100%
rename from de/home/.config/sway/config-vars-htpc.d/keys
rename to de/home/.config/sway/config-htpc.d/vars.d/keys
diff --git a/de/home/.config/sway/config-vars-htpc.d/programs b/de/home/.config/sway/config-htpc.d/vars.d/programs
similarity index 100%
rename from de/home/.config/sway/config-vars-htpc.d/programs
rename to de/home/.config/sway/config-htpc.d/vars.d/programs