diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf
index de316d7..5551f0c 100644
--- a/dot_config/hypr/hyprland.conf
+++ b/dot_config/hypr/hyprland.conf
@@ -148,9 +148,8 @@ dwindle {
 }
 
 master {
-    always_center_master = false
+    always_center_master = true
     mfact = 0.60
-    no_gaps_when_only = 0
 }
 
 misc {
@@ -161,7 +160,7 @@ misc {
 #    vfr = true
 
 #    animate_mouse_windowdragging = true
-    focus_on_activate = true
+    focus_on_activate = false
 
     mouse_move_enables_dpms = true
     key_press_enables_dpms = true
@@ -208,30 +207,8 @@ windowrulev2 = center, title:^(Move files)$
 # transparency
 windowrulev2 = opacity 1.0 override 0.9 override, class:^(kitty|foot|footclient|floating-foot|VSCodium|Code)$
 
-# 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)$
+# 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)$
 
 
 ####################
@@ -313,10 +290,8 @@ bind = $mod, down, movefocus, d
 
 bind = $mod, h, movefocus, l
 bind = $mod, l, movefocus, r
-# bind = $mod, k, movefocus, u
-# bind = $mod, j, movefocus, d
-bind = $mod, k, layoutmsg, cycleprev
-bind = $mod, j, layoutmsg, cyclenext
+bind = $mod, k, movefocus, u
+bind = $mod, j, movefocus, d
 
 bind = $mod SHIFT, left, movewindow, l
 bind = $mod SHIFT, right, movewindow, r
@@ -334,8 +309,6 @@ bind = $mod CONTROL, right, layoutmsg, orientationright
 bind = $mod CONTROL, up   , layoutmsg, orientationtop
 bind = $mod CONTROL, down , layoutmsg, orientationbottom
 bind = $mod CONTROL, c , layoutmsg, orientationcenter
-bind = $mod SHIFT CONTROL, h , layoutmsg, addmaster 
-bind = $mod SHIFT CONTROL, l , layoutmsg, removemaster
 
 # workspace
 bind = $mod, 1, workspace, 1
@@ -473,7 +446,7 @@ env = QT_QPA_PLATFORMTHEME,qt6ct
 env = HYPRCURSOR_SIZE,24
 env = XCURSOR_SIZE,24
 #env = HYPRCURSOR_THEME,qogir_hl
-env = XCURSOR_THEME,Qogir-dark
+#env = XCURSOR_THEME,Qogir
 #env = WLR_NO_HARDWARE_CURSORS,1
 
 
diff --git a/dot_config/tofi/config b/dot_config/tofi/config
index 07c2e0c..48973b4 100644
--- a/dot_config/tofi/config
+++ b/dot_config/tofi/config
@@ -1,58 +1,48 @@
 
 # Font
-font = FiraCode Nerd Font Mono, Semibold
-font-size = 13
+font = Lexend
+font-size = 15
 
 # Window Style
-horizontal = false
-anchor = center
-width = 30%
-height = 500
+horizontal = true
+anchor = top
+width = 100%
+height = 42
 
-outline-color= #24273a
 outline-width = 0
-
-border-color = #f4dbd6
-border-width = 5
-
+border-width = 0
 min-input-width = 120
 result-spacing = 30
-padding-top = 14
-padding-bottom = 14
+padding-top = 8
+padding-bottom = 0
 padding-left = 14
-padding-right = 14
+padding-right = 0
 
 # Text style
 prompt-text = "~>"
 prompt-padding = 30
 
+# macchiato
+border-color = #f4dbd6
 
-background-color = #24273a
+background-color = #1e203077
 text-color = #cad3f5
 
-corner-radius = 10
-
-prompt-color = #181926
+prompt-color = #1e2030
 prompt-background = #f4dbd6
 prompt-background-padding = 4, 10
 prompt-background-corner-radius = 5
 
-input-color = #181926
+input-color = #1e2030
 input-background = #f4dbd6
 input-background-padding = 4, 10
 input-background-corner-radius = 5
 
-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 = #b8daf3
 alternate-result-background-padding = 4, 10
 alternate-result-background-corner-radius = 5
 
-selection-color = #181926
+selection-color = #1e2030
 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 b5cd748..7d30851 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,21 +82,11 @@
     "active-only": false,
     "disable-scroll": true,
     "all-outputs": false,
-    "format": "{icon}",
+    "format": "{name}",
     "sort-by-number": true,
     "format-icons": {
-      "1": " ",
-      "2": " ",
-      "3": " ",
-      "4": " ",
-      "5": " ",
-      "6": " ",
-      "7": " ",
-      "8": " ",
+      "active": "",
       "default": ""
-    },
-    "persistent-workspaces": {
-      "*": 4
     }
   },
   "sway/workspaces#sway": {