diff --git a/de/home/.config/sway/config.d/autostart b/de/home/.config/sway/config.d/autostart
index 553bbab..e68cb83 100644
--- a/de/home/.config/sway/config.d/autostart
+++ b/de/home/.config/sway/config.d/autostart
@@ -3,31 +3,46 @@
 # WM Stuff
 #
 
-# Run on reload
-#exec_always $HOME/.config/sway/scripts/autostart
-exec_always 'eww kill;eww daemon'
-exec_always 'killall autotiling;autotiling -l 4'
-#exec_always 'swaync'
-#exec_always 'killall waybar;waybar'
-#exec_always 'swaync'
+#run at start
+exec {
+  eww daemon
+  autotiling -l 4
+  nm-applet
+  blueman-applet
+  copyq --start-server
+  swayidle
+  '/usr/lib/$(uname -m)-linux-gnu/libexec/kdeconnectd'
+  '/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1'
+  udiskie -at
+  keepassxc ~/Documents/Server/Server_Admin_Keychain.kdbx ~/Nextcloud/Security/Passwords.kdbx
+  'sleep 5;nextcloud --background'
+  'sleep 5;aik_launcher rss_guard'
+  'sleep 5;tokodon'
+  'diskspace-check'
+}
 
+# Run on reload
+#exec_always {
+#  'eww kill;eww daemon'
+#  'killall autotiling;autotiling -l 4'
+#}
 
 # Run only at start
 #exec $HOME/.config/sway/scripts/autostart_apps
-exec --no-startup-id '/usr/libexec/xdg-desktop-portal-wlr -r'
-exec 'nm-applet'
-exec 'blueman-applet'
-exec 'copyq --start-server'
-exec 'swayidle'
-exec '/usr/lib/$(uname -m)-linux-gnu/libexec/kdeconnectd'
-exec '/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1'
-exec 'udiskie -at'
-exec 'keepassxc ~/Documents/Server/Server_Admin_Keychain.kdbx ~/Nextcloud/Security/Passwords.kdbx'
+#exec '/usr/libexec/xdg-desktop-portal-wlr -r'
+#exc 'nm-applet'
+#exec 'blueman-applet'
+#exec 'copyq --start-server'
+#exec 'swayidle'
+#exec '/usr/lib/$(uname -m)-linux-gnu/libexec/kdeconnectd'
+#exec '/usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1'
+#exec 'udiskie -at'
+#exec 'keepassxc ~/Documents/Server/Server_Admin_Keychain.kdbx ~/Nextcloud/Security/Passwords.kdbx'
 #exec 'sleep 5;gtk-launch syncthing-gtk'
-exec 'sleep 5;nextcloud --background'
-exec 'sleep 5;aik_launcher rss_guard'
-exec 'sleep 5;tokodon'
+#exec 'sleep 5;nextcloud --background'
+#exec 'sleep 5;aik_launcher rss_guard'
+#exec 'sleep 5;tokodon'
 #exec 'sleep 5;protonmail-bridge -n'
-exec 'diskspace-check'
+#exec 'diskspace-check'
 
 include $HOME/.config/sway/config.d/autostart.d/*
diff --git a/de/home/.config/sway/config.d/display b/de/home/.config/sway/config.d/display
index 59e3de2..513b385 100644
--- a/de/home/.config/sway/config.d/display
+++ b/de/home/.config/sway/config.d/display
@@ -1,11 +1,4 @@
-
 # Output settings
 include $HOME/.config/sway/config.d/display.d/*
 
 exec_always "killall sp-wallpaper;sp-wallpaper"
-
-# Output wallpaper
-#output * bg $HOME/.config/sway/assets/wallpaper/_default.jpg fill
-
-# Workspace-dependent wallpaper
-#exec "$HOME/.cargo/bin/multibg-sway $HOME/.config/sway/assets/wallpaper/"
diff --git a/de/home/.config/sway/config.d/input b/de/home/.config/sway/config.d/input
index 55203f1..66a63c1 100644
--- a/de/home/.config/sway/config.d/input
+++ b/de/home/.config/sway/config.d/input
@@ -1,6 +1,3 @@
-
-focus_follows_mouse yes
-
 #macbook touchpad
 input 1452:641:Apple_Internal_Keyboard_/_Trackpad {
   scroll_factor 1
@@ -22,3 +19,4 @@ input 1267:12811:ELAN0683:00_04F3:320B_Touchpad {
 }
 
 seat * hide_cursor 5000
+focus_follows_mouse yes
diff --git a/de/home/.config/sway/config.d/keys b/de/home/.config/sway/config.d/keys
new file mode 100644
index 0000000..24f2967
--- /dev/null
+++ b/de/home/.config/sway/config.d/keys
@@ -0,0 +1 @@
+include $HOME/.config/sway/config.d/keys.d/*
diff --git a/de/home/.config/sway/config.d/keys.d/launch b/de/home/.config/sway/config.d/keys.d/launch
new file mode 100644
index 0000000..b890ad0
--- /dev/null
+++ b/de/home/.config/sway/config.d/keys.d/launch
@@ -0,0 +1,37 @@
+
+# Launch Stuff
+
+bindsym {
+#terminal
+  mod+Return exec $term
+#launcher
+  $mod+d exec $menu
+#lockscreen
+  $mod+l exec sp-lock
+#profile manager
+  $mod+Shift+p exec sp-profiles
+#sway notification center
+  $mod+Shift+n exec swaync-client -t -sw
+#power menu
+  $mod+Shift+e exec sp-powermenu
+#screenshot
+  $mod+Shift+s exec sp-screenshot
+#clipboard
+  $mod+v exec sp-clipboard
+  $mod+Shift+v exec copyq show
+#profile shortcuts
+  $mod+shift+o exec sp-shortcuts
+#global shortcuts
+  $mod+shift+l exec sp-global-shortcuts
+#browser
+  $mod+shift+b exec sp-launcher browser
+  $mod+t exec sp-launcher browser-newtab
+#file browser
+  $mod+shift+f exec sp-launcher file_manager
+#calculator
+  $mod+c exec wofi-calc
+#sticky notes
+  $mod+shift+m exec stickynotes
+#gocryptfs
+  $mod+shift+g exec gocryptfs-wofi
+}
diff --git a/de/home/.config/sway/config.d/keys_other b/de/home/.config/sway/config.d/keys.d/other
similarity index 60%
rename from de/home/.config/sway/config.d/keys_other
rename to de/home/.config/sway/config.d/keys.d/other
index c5afdf8..26722c3 100644
--- a/de/home/.config/sway/config.d/keys_other
+++ b/de/home/.config/sway/config.d/keys.d/other
@@ -1,7 +1,4 @@
-
-#
 # Other
-#
 
-# Reload Sway Config
+#reload sway config
   bindsym $mod+Shift+c reload
diff --git a/de/home/.config/sway/config.d/keys.d/scratchpad b/de/home/.config/sway/config.d/keys.d/scratchpad
new file mode 100644
index 0000000..757b336
--- /dev/null
+++ b/de/home/.config/sway/config.d/keys.d/scratchpad
@@ -0,0 +1,12 @@
+# Scratchpad
+
+bindsym {
+#move to scratchpad
+  $mod+Shift+minus move scratchpad
+#cycle scratchpad
+  $mod+minus scratchpad show
+#scratchpad menu
+  $mod+equal exec '$HOME/.config/sway/scripts/scratchpadmenu.sh'
+#sticky
+  $mod+Shift+equal floating enable, sticky enable
+}
diff --git a/de/home/.config/sway/config.d/keys_special b/de/home/.config/sway/config.d/keys.d/special
similarity index 100%
rename from de/home/.config/sway/config.d/keys_special
rename to de/home/.config/sway/config.d/keys.d/special
diff --git a/de/home/.config/sway/config.d/keys_windows b/de/home/.config/sway/config.d/keys.d/windows
similarity index 100%
rename from de/home/.config/sway/config.d/keys_windows
rename to de/home/.config/sway/config.d/keys.d/windows
diff --git a/de/home/.config/sway/config.d/keys_launch b/de/home/.config/sway/config.d/keys_launch
deleted file mode 100644
index 7db6c4d..0000000
--- a/de/home/.config/sway/config.d/keys_launch
+++ /dev/null
@@ -1,54 +0,0 @@
-
-#
-# Launch Stuff
-#
-
-# Random Rat Image
-#  bindsym $mod+grave exec randomrat
-
-# Terminal
-  bindsym $mod+Return exec $term
-
-# Launcher
-  bindsym $mod+d exec $menu
-
-# Lockscreen
-  bindsym $mod+l exec sp-lock
-
-# Profile Manager
-  bindsym $mod+Shift+p exec sp-profiles
-
-# Sway Notification Center
-  bindsym $mod+Shift+n exec swaync-client -t -sw
-
-# Power Menu
-  bindsym $mod+Shift+e exec sp-powermenu
-
-# Screenshot
-  bindsym $mod+Shift+s exec sp-screenshot
-
-# Clipboard
-  bindsym $mod+v exec sp-clipboard
-  bindsym $mod+Shift+v exec copyq show
-
-# Profile Shortcuts
-  bindsym $mod+shift+o exec sp-shortcuts
-
-# Global Shortcuts
-  bindsym $mod+shift+l exec sp-global-shortcuts
-
-# Browser
-  bindsym $mod+shift+b exec sp-launcher browser
-  bindsym $mod+t exec sp-launcher browser-newtab
-
-# File Browser
-  bindsym $mod+shift+f exec sp-launcher file_manager
-
-# Calculator
-  bindsym $mod+c exec wofi-calc
-
-# Sticky Notes
-  bindsym $mod+shift+m exec stickynotes
-
-# Gocryptfs
-  bindsym $mod+shift+g exec gocryptfs-wofi
diff --git a/de/home/.config/sway/config.d/keys_scratchpad b/de/home/.config/sway/config.d/keys_scratchpad
deleted file mode 100644
index 0f59b1b..0000000
--- a/de/home/.config/sway/config.d/keys_scratchpad
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Scratchpad
-#
-
-# Move to Scratchpad
-  bindsym $mod+Shift+minus move scratchpad
-
-# Cycle Scratchpad
-  bindsym $mod+minus scratchpad show
-
-# Scratchpad Menu
-  bindsym $mod+equal exec '$HOME/.config/sway/scripts/scratchpadmenu.sh'
-
-# sticky
-  bindsym $mod+Shift+equal floating enable, sticky enable
diff --git a/de/home/.config/sway/config.d/workspaces b/de/home/.config/sway/config.d/workspaces
index d570a80..9b41d8d 100644
--- a/de/home/.config/sway/config.d/workspaces
+++ b/de/home/.config/sway/config.d/workspaces
@@ -12,7 +12,7 @@ bindsym {
   $mod+Tab workspace next
   $mod+Shift+Tab workspace prev
 #workspace rename keybind
-  bindsym $mod+Shift+r exec sp-rename
+  $mod+Shift+r exec sp-rename
 }
 
 # Switch to workspace keybinds are managed by sp-profiles
@@ -24,12 +24,13 @@ bindsym {
 
 bindgesture {
 #workspace cycle gesturebinds
-  bindgesture swipe:left workspace next
-  bindgesture swipe:right workspace prev
+  swipe:left workspace next
+  swipe:right workspace prev
 #profile cycle gesturebinds
   swipe:up exec "sp-profiles next"
   swipe:down exec "sp-profiles prev"
 }
 
 workspace_auto_back_and_forth yes
-exec "sp-profiles Personal";exec_always "sp-profiles reload"
+exec "sp-profiles Personal";
+exec_always "sleep 1;sp-profiles reload"