diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf
index 5551f0c..3d1917f 100644
--- a/dot_config/hypr/hyprland.conf
+++ b/dot_config/hypr/hyprland.conf
@@ -160,7 +160,7 @@ misc {
 #    vfr = true
 
 #    animate_mouse_windowdragging = true
-    focus_on_activate = false
+    focus_on_activate = true
 
     mouse_move_enables_dpms = true
     key_press_enables_dpms = true
@@ -207,8 +207,30 @@ windowrulev2 = center, title:^(Move files)$
 # transparency
 windowrulev2 = opacity 1.0 override 0.9 override, class:^(kitty|foot|footclient|floating-foot|VSCodium|Code)$
 
-# games
-# windowrulev2 = workspace 4, class:^(steam_app_*|osu\!|org.prismlauncher.PrismLauncher|steam_app_671860|com.usebottles.bottles|moe.launcher.an-anime-game-launcher|moe.launcher.the-honkers-railway-launcher|genshinimpact.exe|starrail.exe|trackma-*|cs2|csgo_linux64)$
+# 1 terminal
+windowrulev2 = workspace 1, class:^(kitty|foot|footclient)$
+
+# 2 browser
+windowrulev2 = workspace 2, class:^(mullvadbrowser|floorp|firefox*|Pulse Browser|librewolf*|LibreWolf*|org.qutebrowser.qutebrowser|chromium|thorium*|brave*|vivaldi*)
+
+# 3 files
+windowrulev2 = workspace 3, class:^(thunar|org.qbittorrent.qBittorrent|org.kde.dolphin|pcmanfm-qt|deluge)$|^(org.gnome.Nautilus)$|^(org.gnome.NautilusDevel)$|^(nemo*)|fm-term
+windowrulev2 = workspace 3, title:^Syncplay*
+
+# 4 games, gaming
+windowrulev2 = workspace 4, class:^(steam_app_*|osu\!|org.prismlauncher.PrismLauncher|steam_app_671860|com.usebottles.bottles|moe.launcher.an-anime-game-launcher|moe.launcher.the-honkers-railway-launcher|genshinimpact.exe|starrail.exe|trackma-*|cs2|csgo_linux64)$
+
+# 5 code
+windowrulev2 = workspace 5, class:^(VSCodium|org.remmina.Remmina|Code|Pixelorama)$
+
+# 6 media
+windowrulev2 = workspace 6, class:^(mpv|Spotify)$
+
+# 7 communication
+windowrulev2 = workspace 7, class:^(WebCord|discord|org.telegram.desktop|Signal|teams-for-linux)$
+
+# 8 settings
+windowrulev2 = workspace 9, class:^(sc-controller|pavucontrol)$
 
 
 ####################
@@ -446,7 +468,7 @@ env = QT_QPA_PLATFORMTHEME,qt6ct
 env = HYPRCURSOR_SIZE,24
 env = XCURSOR_SIZE,24
 #env = HYPRCURSOR_THEME,qogir_hl
-#env = XCURSOR_THEME,Qogir
+env = XCURSOR_THEME,Qogir-dark
 #env = WLR_NO_HARDWARE_CURSORS,1
 
 
diff --git a/dot_config/tofi/config b/dot_config/tofi/config
index 48973b4..6da4dd6 100644
--- a/dot_config/tofi/config
+++ b/dot_config/tofi/config
@@ -1,48 +1,58 @@
 
 # Font
-font = Lexend
-font-size = 15
+font = FiraCode Nerd Font Mono, Semibold
+font-size = 13
 
 # Window Style
-horizontal = true
-anchor = top
-width = 100%
-height = 42
+horizontal = false
+anchor = center
+width = 30%
+height = 500
+
+outline-color= #24273a
+outline-width = 4
+
+border-color = #f4dbd6
+border-width = 5
 
-outline-width = 0
-border-width = 0
 min-input-width = 120
 result-spacing = 30
-padding-top = 8
-padding-bottom = 0
+padding-top = 14
+padding-bottom = 14
 padding-left = 14
-padding-right = 0
+padding-right = 14
 
 # Text style
 prompt-text = "~>"
 prompt-padding = 30
 
-# macchiato
-border-color = #f4dbd6
 
-background-color = #1e203077
+background-color = #24273a
 text-color = #cad3f5
 
-prompt-color = #1e2030
+corner-radius = 10
+
+prompt-color = #181926
 prompt-background = #f4dbd6
 prompt-background-padding = 4, 10
 prompt-background-corner-radius = 5
 
-input-color = #1e2030
+input-color = #181926
 input-background = #f4dbd6
 input-background-padding = 4, 10
 input-background-corner-radius = 5
 
-# alternate-result-background = #b8daf3
+default-result-color = #cad3f5
+default-result-background = #363a4f
+default-result-background-padding = 4, 10
+default-result-background-corner-radius = 5
+
+alternate-result-color = #cad3f5
+alternate-result-background = #494d64
 alternate-result-background-padding = 4, 10
 alternate-result-background-corner-radius = 5
 
-selection-color = #1e2030
+selection-color = #181926
 selection-background = #f4dbd6
 selection-background-padding = 4, 10
 selection-background-corner-radius = 5
diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc
index 7d30851..b5cd748 100644
--- a/dot_config/waybar/config.jsonc
+++ b/dot_config/waybar/config.jsonc
@@ -4,9 +4,9 @@
   "position": "top",
   "height": 32,
   "modules-left": [
-    //"hyprland/workspaces",
+    "hyprland/workspaces",
     //"sway/workspaces#sway"
-    "river/tags",
+    //"river/tags",
     //"river/layout",
 
     "group/visualisation"
@@ -82,11 +82,21 @@
     "active-only": false,
     "disable-scroll": true,
     "all-outputs": false,
-    "format": "{name}",
+    "format": "{icon}",
     "sort-by-number": true,
     "format-icons": {
-      "active": "",
+      "1": " ",
+      "2": " ",
+      "3": " ",
+      "4": " ",
+      "5": " ",
+      "6": " ",
+      "7": " ",
+      "8": " ",
       "default": ""
+    },
+    "persistent-workspaces": {
+      "*": 4
     }
   },
   "sway/workspaces#sway": {