diff --git a/.config/sway/config b/.config/sway/config
index 63fc9df..788026c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,9 +1,9 @@
-for_window [class="^.*"] border pixel 0
-for_window [class="com.mitchellh.ghostty"] move container to workspace 1
-for_window [class="librewolf"] move container to workspace 2
+for_window [app_id="com.mitchellh.ghostty"] move container to workspace 1
+for_window [app_id="librewolf"] move container to workspace 2
 for_window [class="steam"] move container to workspace 3
 
 font pango: Maple Mono SemiBold 10
+default_border pixel 0
 gaps inner 5
 gaps outer 2
 
@@ -29,11 +29,9 @@ bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut.
 bindsym $mod+1 workspace number 1
 bindsym $mod+2 workspace number 2
 bindsym $mod+3 workspace number 3
-bindsym $mod+Shift+1 move container to workspace number 1
-bindsym $mod+Shift+2 move container to workspace number 2
-bindsym $mod+Shift+3 move container to workspace number 3
 bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
 bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
 bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
 include /etc/sway/config.d/*
+