diff --git a/.config/sway/config b/.config/sway/config
index c611c73..68c0455 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -303,6 +303,11 @@ exec ~/.config/sway/workspace_rename.py
 
 for_window [class="Tor Browser"] floating enable
 
+for_window [app_id="kitty-scratch"] {
+    move to scratchpad
+    scratchpad show
+}
+
 workspace 1 output eDP-1
 exec $term
 
diff --git a/.config/sway/status.toml b/.config/sway/status.toml
index 5e5b58a..5ae9f7f 100644
--- a/.config/sway/status.toml
+++ b/.config/sway/status.toml
@@ -36,12 +36,12 @@ block = "memory"
 display_type = "memory"
 format_mem = "{mem_used;M}"
 clickable = false
-on_click = "kitty btop"
+on_click = "kitty --class kitty-scratch btop"
 
 [[block]]
 block = "cpu"
 interval = 1
-on_click = "kitty btop"
+on_click = "kitty --class kitty-scratch btop"
 
 #[[block]]
 #block = "sound"
@@ -59,7 +59,7 @@ format_up_to_date = "up to date"
 hide_when_uptodate = true
 critical_updates_regex = "(^(linux-|sway|wl)|pipewire)"
 aur_command = "yay -Qua"
-on_click = "kitty zsh -i -c update"
+on_click = "kitty --class kitty-scratch zsh -i -c update"
 
 [[block]]
 block = "networkmanager"
diff --git a/.config/sway/workspace_rename.py b/.config/sway/workspace_rename.py
index 2e35a85..e3e520f 100755
--- a/.config/sway/workspace_rename.py
+++ b/.config/sway/workspace_rename.py
@@ -9,16 +9,7 @@ from i3ipc.aio import Connection
 async def main():
     sway = await Connection().connect()
 
-    def on(event, handler=None):
-        def on_wrapped(handler):
-            sway.on(event, handler)
-            return handler
-        if handler:
-            return on_wrapped(handler)
-        else:
-            return on_wrapped
-
-    @on(Event.WINDOW_FOCUS)
+    @sway.on(Event.WINDOW_FOCUS)
     async def on_window_focus(sway, e):
         focused_window = (await sway.get_tree()).find_focused()
         focused_workspace = focused_window.workspace()
@@ -42,6 +33,10 @@ async def main():
             new_name += ''
         elif app_name in ['GEMOC Studio', 'code-oss']:
             new_name += ''
+        elif 'okular' in app_name:
+            new_name += '<span font=\'FontAwesome 5 Free Solid\'></span>'
+        elif app_name == 'pavucontrol':
+            new_name += ''
         elif app_name:
             new_name += app_name