diff --git a/i3/conf/client/Cyb3r/assignments b/i3/conf/client/Cyb3r/assignments
index 8ab44d4..c0cc733 100644
--- a/i3/conf/client/Cyb3r/assignments
+++ b/i3/conf/client/Cyb3r/assignments
@@ -16,6 +16,6 @@
     # Mail
         workspace $ws5 gaps outer 0
         workspace $ws5 gaps inner 0
-        assign [class="Thunderbird"] $ws5
+        assign [instance="mail"] $ws5
     # KeepassXC
         assign [class="keepassxc"] $ws10
diff --git a/i3/conf/client/ThinkPad/assignments b/i3/conf/client/ThinkPad/assignments
new file mode 100644
index 0000000..4e21bba
--- /dev/null
+++ b/i3/conf/client/ThinkPad/assignments
@@ -0,0 +1,16 @@
+# {{{ WORKSPACES }}}
+
+    # Browser
+        workspace $ws1 gaps outer 0
+        workspace $ws1 gaps inner 0
+        assign [class="Firefox"] $ws1
+
+    # Terminal
+        assign [class="URxvt"]   $ws2
+
+    # Mail
+        workspace $ws5 gaps outer 0
+        workspace $ws5 gaps inner 0
+        assign [instance="mail"] $ws5
+    # KeepassXC
+        assign [class="keepassxc"] $ws10
diff --git a/i3/conf/client/default/assignments b/i3/conf/client/default/assignments
index 6b58d0d..4e21bba 100644
--- a/i3/conf/client/default/assignments
+++ b/i3/conf/client/default/assignments
@@ -11,6 +11,6 @@
     # Mail
         workspace $ws5 gaps outer 0
         workspace $ws5 gaps inner 0
-        assign [class="Thunderbird"] $ws5
+        assign [instance="mail"] $ws5
     # KeepassXC
         assign [class="keepassxc"] $ws10