diff --git a/de/home/.config/sway/config.d/input b/de/home/.config/sway/config.d/input
index 66a63c1..5300aa7 100644
--- a/de/home/.config/sway/config.d/input
+++ b/de/home/.config/sway/config.d/input
@@ -1,22 +1,26 @@
+input {
 #macbook touchpad
-input 1452:641:Apple_Internal_Keyboard_/_Trackpad {
-  scroll_factor 1
-  dwt disabled
-}
-
+  1452:641:Apple_Internal_Keyboard_/_Trackpad {
+    scroll_factor 1
+    dwt disabled
+  }
 #p135g touchpad
-input 1160:4122:DELL0A36:00_0488:101A_Touchpad {
-  natural_scroll enabled
-  click_method clickfinger
-  dwt disabled
-}
-
+  1160:4122:DELL0A36:00_0488:101A_Touchpad {
+    natural_scroll enabled
+    click_method clickfinger
+    dwt disabled
+  }
 #t16g2 touchpad
-input 1267:12811:ELAN0683:00_04F3:320B_Touchpad {
-  natural_scroll enabled
-  click_method clickfinger
-  dwt disabled
+  1267:12811:ELAN0683:00_04F3:320B_Touchpad {
+    natural_scroll enabled
+    click_method clickfinger
+    dwt disabled
+  }
+#numlock
+  * xkb_numlock enabled
 }
 
 seat * hide_cursor 5000
 focus_follows_mouse yes
+
+include $HOME/.config/sway/config.d/keys.d/*
diff --git a/de/home/.config/sway/config.d/keys b/de/home/.config/sway/config.d/keys
deleted file mode 100644
index 24f2967..0000000
--- a/de/home/.config/sway/config.d/keys
+++ /dev/null
@@ -1 +0,0 @@
-include $HOME/.config/sway/config.d/keys.d/*
diff --git a/de/home/.config/sway/config.d/keys.d/special b/de/home/.config/sway/config.d/keys.d/special
index cdd4c1a..068c21f 100644
--- a/de/home/.config/sway/config.d/keys.d/special
+++ b/de/home/.config/sway/config.d/keys.d/special
@@ -1,49 +1,33 @@
+#enable wob
+set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
+exec_always 'killall wob; rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob'
 
-# Enable wob
-  set $WOBSOCK $XDG_RUNTIME_DIR/wob.sock
-  exec_always 'killall wob; rm -f $WOBSOCK && mkfifo $WOBSOCK && tail -f $WOBSOCK | wob'
+bindsym {
+# Volume Keys
+#vol up
+  XF86AudioRaiseVolume exec "$HOME/.config/sway/scripts/volume.sh up"
+#vol down
+  XF86AudioLowerVolume exec "$HOME/.config/sway/scripts/volume.sh down"
+#vol mute
+  XF86AudioMute exec "$HOME/.config/sway/scripts/volume.sh mute"
 
-#
-# Volume
-#
-
-# Vol Up
-  bindsym XF86AudioRaiseVolume exec "$HOME/.config/sway/scripts/volume.sh up"
-# Vol Down
-  bindsym XF86AudioLowerVolume exec "$HOME/.config/sway/scripts/volume.sh down"
-# Vol Mute
-  bindsym XF86AudioMute exec "$HOME/.config/sway/scripts/volume.sh mute"
-
-#
 # Media Keys
-#
+#previous
+  XF86AudioPrev exec playerctl previous
+#skip
+  XF86AudioNext exec playerctl next
+#play/pause
+  XF86AudioPlay exec playerctl play-pause
 
-# Previous
-  bindsym XF86AudioPrev exec playerctl previous
-# Skip
-  bindsym XF86AudioNext exec playerctl next
-# Play/Pause
-  bindsym XF86AudioPlay exec playerctl play-pause
-
-
-#
 # Brightness
-#
-
-# Brightness Up
+#brightness up
   bindsym XF86MonBrightnessUp exec "$HOME/.config/sway/scripts/brightness.sh up"
-# Brightness Down
+#brightness down
   bindsym XF86MonBrightnessDown exec "$HOME/.config/sway/scripts/brightness.sh down"
 
-#
 # Keyboard Brightness
-#
-
-# Brightness Up
+#brightness up
   bindsym $mod+XF86AudioRaiseVolume exec "$HOME/.config/sway/scripts/kb_brightness up"
-# Brightness Down
+#brightness down
   bindsym $mod+XF86AudioLowerVolume exec "$HOME/.config/sway/scripts/kb_brightness down"
-  
-
-# Numlock
-  input * xkb_numlock enabled
+}  
diff --git a/de/home/.config/sway/config.d/keys.d/windows b/de/home/.config/sway/config.d/keys.d/windows
index 2ab6add..c3a8cf8 100644
--- a/de/home/.config/sway/config.d/keys.d/windows
+++ b/de/home/.config/sway/config.d/keys.d/windows
@@ -1,43 +1,34 @@
-#
 # Window Management
-#
 
-# Kill Focused Window
-  bindsym $mod+Shift+q kill
+bindsym {
+#kill focused window
+  $mod+Shift+q kill
+#move focus around
+  $mod+Left focus left
+  $mod+Down focus down
+  $mod+Up focus up
+  $mod+Right focus right
+#move focused window
+  $mod+Shift+Left move left
+  $mod+Shift+Down move down
+  $mod+Shift+Up move up
+  $mod+Shift+Right move right
+#fullscreen
+  $mod+f fullscreen
+#change split orientation
+  $mod+comma splith
+  $mod+period splitv
+  $mod+slash layout toggle split
+#change layout style
+  $mod+semicolon layout stacking
+  $mod+apostrophe layout tabbed
+#focus parent
+  $mod+a focus parent
+#toggle floating
+  $mod+Shift+space floating toggle
+#swap between tiles and floats
+  $mod+space focus mode_toggle
+}
 
-# Move Floating Window
-  floating_modifier $mod normal
-
-# Move Focus Around
-  bindsym $mod+Left focus left
-  bindsym $mod+Down focus down
-  bindsym $mod+Up focus up
-  bindsym $mod+Right focus right
-
-# Move Focused Window
-  bindsym $mod+Shift+Left move left
-  bindsym $mod+Shift+Down move down
-  bindsym $mod+Shift+Up move up
-  bindsym $mod+Shift+Right move right
-
-# Fullscreen
-  bindsym $mod+f fullscreen
-
-# Change Split Orientation
-# < splits windows horizontally, > splits vertically
-  bindsym $mod+comma splith
-  bindsym $mod+period splitv
-  bindsym $mod+slash layout toggle split
-
-# Change Layout Style
-  bindsym $mod+semicolon layout stacking
-  bindsym $mod+apostrophe layout tabbed
-
-# Focus Parent
-  bindsym $mod+a focus parent
-
-# Toggle Floating
-  bindsym $mod+Shift+space floating toggle
-
-# Swap Between Tiles and Floats
-  bindsym $mod+space focus mode_toggle
+#move floating window
+floating_modifier $mod normal