diff --git a/.config/sway/conf.d/1-set b/.config/sway/conf.d/1-set
index a81991e..eecdcb8 100644
--- a/.config/sway/conf.d/1-set
+++ b/.config/sway/conf.d/1-set
@@ -7,17 +7,14 @@ set $mod Mod4
 set $alt Mod1
 set $altgr Mod5
 
-set $left h
-set $down j
-set $up k
-set $right l
+set $left Left
+set $down Down
+set $up Up
+set $right Right
 
 set $term foot
-
-## Define outputs
-set $disp1 HDMI-A-1
-set $disp2 DP-1
-set $disp3 DP-2
+set $menu fuzzel | xargs swaymsg exec --
+set $pass_menu tessen
 
 ## Define Workspaces
 ## nerdfonts cheat sheet: https://www.nerdfonts.com/cheat-sheet
@@ -43,3 +40,50 @@ set $wsF9   19:
 set $wsF10  20:20
 set $wsF11  21:
 set $wsF12  22:󰡶
+
+
+# =================== #
+# Input configuration #
+# =================== #
+
+input "type:keyboard" {
+    xkb_layout us
+    xkb_variant altgr-intl
+    xkb_options caps:escape
+    xkb_numlock enable
+}
+
+input "type:pointer" {
+    accel_profile flat
+    pointer_accel 0.1
+    dwt disabled
+    scroll_factor 0.5
+}
+
+# ==================== #
+# Output configuration #
+# ==================== #
+
+## Define outputs
+set $disp1 HDMI-A-1
+set $disp2 DP-1
+set $disp3 DP-2
+
+output $disp1 {
+    resolution 1920x1080@60.000Hz
+    position 0,0
+    transform 270
+    bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png fill
+}
+output $disp2 {
+    resolution 1920x1080@60.000Hz
+    position 1080,550
+    bg ~/.config/sway/backgrounds/Nyarch_Wallpaper.png fill
+}
+output $disp3 {
+    #resolution 1920x1080@60.000Hz
+    resolution 1920x1080@119.982Hz
+    position 3000,550
+    bg ~/.config/sway/backgrounds/Nyarch_Wallpaper.png fill
+    adaptive_sync on
+}
diff --git a/.config/sway/conf.d/2-assigns b/.config/sway/conf.d/2-assigns
index 93c018b..8948ed1 100644
--- a/.config/sway/conf.d/2-assigns
+++ b/.config/sway/conf.d/2-assigns
@@ -55,3 +55,41 @@ workspace $wsF9   output $disp3
 workspace $wsF10  output $disp3
 workspace $wsF11  output $disp3
 workspace $wsF12  output $disp3
+
+# ================== #
+# Setup window rules #
+# ================== #
+
+for_window {
+  # Mark all windows running under XWayland as such
+  [shell="xwayland"] title_format "%title [XWayland]"
+
+  # window rules for 'special' types of windows (in x11 territory)
+  [window_role="pop-up"] floating enable
+  [window_role="bubble"] floating enable
+  [window_role="dialog"] floating enable
+  [window_role="task_dialog"] floating enable
+  [window_role="Preferences"] floating enable
+  [window_type="dialog"] floating enable
+  [window_type="menu"] floating enable
+  [instance="update_installer"] floating enable
+
+  # window rules for 'special' types of windows; in wayland we can only go by window title for now
+  [title="Sharing Indicator"] floating enable
+
+  # floating and no border for (firefox) picture in picture windows
+  [title="Picture-in-Picture"] floating enable; border none
+
+  # window rules for specific apps
+  [app_id="^org.keepassxc.KeePassXC$"] floating enable
+  [app_id="mpv"] inhibit_idle visible; border none; max_render_time off
+
+  [app_id="showmethekey-gtk"] floating enable; sticky enable
+
+  [class="steam"] max_render_time off
+  [class="steam_app"] max_render_time off
+  [class="steam_proton"] max_render_time off
+  [class="steamwebhelper"] max_render_time off
+
+  [title="Default - Wine desktop"] fullscreen
+}
diff --git a/.config/sway/conf.d/3-appearance b/.config/sway/conf.d/3-appearance
index 315a89e..b370fb2 100644
--- a/.config/sway/conf.d/3-appearance
+++ b/.config/sway/conf.d/3-appearance
@@ -3,16 +3,18 @@
 # =================== #
 
 gaps inner 0
-gaps outer 5
+gaps outer 0
 
-default_border pixel 5
+default_border pixel 2
 
 # Disable 'focus on hover'
 focus_follows_mouse no
 
-client.focused #6aa84f #38761d #ffffff #8fce00 #38761d
+#client.focused #6aa84f #38761d #ffffff #8fce00 #38761d
+client.focused #33ccff #0099ff #ffffff #5577ff #9999dd
 
-seat seat0 xcursor_theme Breeze_Snow 24
+#seat seat0 xcursor_theme Breeze_Snow 24
+seat seat0 xcursor_theme xtheme_wii 24
 
 # Sway workaround for gnome gtk settings
 set $gnome-schema org.gnome.desktop.interface
@@ -23,3 +25,7 @@ exec_always {
     gsettings set $gnome-schema cursor-theme 'Breeze_Snow'
     gsettings set $gnome-schema font-name 'Iosevka Nerd Font Mono'
 }
+
+bar {
+  swaybar_command waybar
+}
diff --git a/.config/sway/conf.d/autoruns b/.config/sway/conf.d/4-autoruns
similarity index 100%
rename from .config/sway/conf.d/autoruns
rename to .config/sway/conf.d/4-autoruns
diff --git a/.config/sway/conf.d/keybinds b/.config/sway/conf.d/5-keybinds
similarity index 90%
rename from .config/sway/conf.d/keybinds
rename to .config/sway/conf.d/5-keybinds
index 8390c8d..6b8ba67 100644
--- a/.config/sway/conf.d/keybinds
+++ b/.config/sway/conf.d/5-keybinds
@@ -23,8 +23,7 @@
     bindsym $mod+Shift+c reload
 
     # Lock the screen
-    bindsym $altgr+l exec swaylock -c 000000
-    bindsym $alt+l exec swaylock -c 000000
+    bindsym $mod+l exec swaylock -c 000000
     #bindsym $altgr+l exec ~/.local/bin/scripts/lock_script
 
     # Select area for screenshot and copy to clipboard
@@ -42,22 +41,12 @@
     bindsym $mod+$down focus down
     bindsym $mod+$up focus up
     bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
 
     # Move the focused window with the same, but add Shift
     bindsym $mod+Shift+$left move left
     bindsym $mod+Shift+$down move down
     bindsym $mod+Shift+$up move up
     bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
 #
 # Workspaces:
 #
@@ -158,12 +147,6 @@ mode "resize" {
     bindsym $up resize shrink height 10px
     bindsym $right resize grow width 10px
 
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
     # Return to default mode
     bindsym Return mode "default"
     bindsym Escape mode "default"
diff --git a/.config/sway/conf.d/bar b/.config/sway/conf.d/bar
deleted file mode 100644
index a9d77b5..0000000
--- a/.config/sway/conf.d/bar
+++ /dev/null
@@ -1,7 +0,0 @@
-# ============ #
-# Bar settings #
-# ============ #
-
-bar {
-  swaybar_command waybar
-}
diff --git a/.config/sway/conf.d/input b/.config/sway/conf.d/input
deleted file mode 100644
index 8dabe5a..0000000
--- a/.config/sway/conf.d/input
+++ /dev/null
@@ -1,17 +0,0 @@
-# =================== #
-# Input configuration #
-# =================== #
-
-input "type:keyboard" {
-    xkb_layout us
-    xkb_variant altgr-intl
-    xkb_options caps:escape
-    xkb_numlock enable
-}
-
-input "type:pointer" {
-    accel_profile flat
-    pointer_accel 0.1
-    dwt disabled
-    scroll_factor 0.5
-}
diff --git a/.config/sway/conf.d/launcher b/.config/sway/conf.d/launcher
deleted file mode 100644
index c94f382..0000000
--- a/.config/sway/conf.d/launcher
+++ /dev/null
@@ -1,6 +0,0 @@
-# ================= #
-# Launcher settings #
-# ================= #
-
-set $menu fuzzel | xargs swaymsg exec --
-set $pass_menu tessen
diff --git a/.config/sway/conf.d/output b/.config/sway/conf.d/output
deleted file mode 100644
index 6de5632..0000000
--- a/.config/sway/conf.d/output
+++ /dev/null
@@ -1,20 +0,0 @@
-# ==================== #
-# Output configuration #
-# ==================== #
-
-output $disp1 {
-    resolution 1920x1080@60.000Hz
-    position 0,0
-    transform 270
-    bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png fill
-}
-output $disp2 {
-    resolution 1920x1080@60.000Hz
-    position 1080,550
-    bg ~/.config/sway/backgrounds/Nyarch_Wallpaper.png fill
-}
-output $disp3 {
-    resolution 1920x1080@60.000Hz
-    position 3000,550
-    bg ~/.config/sway/backgrounds/Nyarch_Wallpaper.png fill
-}
diff --git a/.config/sway/conf.d/window-rules b/.config/sway/conf.d/window-rules
deleted file mode 100644
index 2804a71..0000000
--- a/.config/sway/conf.d/window-rules
+++ /dev/null
@@ -1,40 +0,0 @@
-# ================== #
-# Setup window rules #
-# ================== #
-
-for_window {
-  # Mark all windows running under XWayland as such
-  [shell="xwayland"] title_format "%title [XWayland]"
-
-  # window rules for 'special' types of windows (in x11 territory)
-  [window_role="pop-up"] floating enable
-  [window_role="bubble"] floating enable
-  [window_role="dialog"] floating enable
-  [window_role="task_dialog"] floating enable
-  [window_role="Preferences"] floating enable
-  [window_type="dialog"] floating enable
-  [window_type="menu"] floating enable
-  [instance="update_installer"] floating enable
-
-  # window rules for 'special' types of windows; in wayland we can only go by window title for now
-  [title="Sharing Indicator"] floating enable
-
-  # floating and no border for (firefox) picture in picture windows
-  [title="Picture-in-Picture"] floating enable; border none
-
-  # window rules for specific apps
-  [app_id="^org.keepassxc.KeePassXC$"] floating enable
-  [app_id="mpv"] inhibit_idle visible; border none; max_render_time off
-
-  # Looking Glass latency tuning. Ref.: https://looking-glass.io/wiki/Wayland_latency_tuning
-  [app_id="^looking-glass-client$"] max_render_time off
-
-  [app_id="showmethekey-gtk"] floating enable; sticky enable
-
-  [class="steam"] max_render_time off
-  [class="steam_app"] max_render_time off
-  [class="steam_proton"] max_render_time off
-  [class="steamwebhelper"] max_render_time off
-
-  [title="Default - Wine desktop"] fullscreen
-}