diff --git a/bashrc b/bashrc
index 241a2dc..699f234 100644
--- a/bashrc
+++ b/bashrc
@@ -1,2 +1,2 @@
-setxkbmap -option caps:escape
+setxkbmap -option caps:swapescape
 alias vim=nvim
diff --git a/i3config b/i3config
index 8249f0c..05995ec 100644
--- a/i3config
+++ b/i3config
@@ -1,6 +1,6 @@
 # i3 config file (v4)
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
-assign [title="Surfshark"] $ws8
+assign [class="surfshark"] $ws8
 
 # Set mod key (Mod1=<Alt>, Mod4=<Super>)
 set $mod Mod4
diff --git a/zshrc b/zshrc
index 61f3acd..a9962d6 100644
--- a/zshrc
+++ b/zshrc
@@ -1,3 +1,3 @@
 # Created by newuser for 5.8
-setxkbmap -option caps:escape
+setxkbmap -option caps:swapescape
 alias vim=nvim