diff --git a/rofi/config.rasi b/rofi/config.rasi
index 9118622..d8885aa 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -30,7 +30,7 @@ window {
     location: center;
     anchor: center;
     fullscreen: false;
-    width: 400px;
+    width: 1200px;
     border-radius: 10px;
     cursor: "default";
     background-color: rgba(20, 20, 20, 0.70);
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 1fc4bff..08ce790 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -2,20 +2,18 @@
   "layer": "top",
   "position": "top",
   "mode": "dock",
-  "reload_style_on_change": true,
   "gtk-layer-shell": true,
 
   // <<--< Positions >-->>
 
   "modules-left": [
-    "custom/ws",            // window icon
     "custom/left1",
 
     "hyprland/workspaces",  // workspaces
     "custom/right1",
 
-    "custom/paddw",
-    "hyprland/window"       // window title
+    "custom/paddw"
+   // "hyprland/window"       // window title
   ],
 
   "modules-center": [
@@ -50,7 +48,7 @@
   ],
 
   "modules-right": [
-    "mpris",                // media info
+    //"mpris",                // media info
 
     "custom/left6",
     "pulseaudio",           // output device
@@ -67,23 +65,9 @@
 
   // <<--< Modules >-->>
 
-  "custom/ws": {
-    "exec": "~/.config/waybar/scripts/current-theme.sh",
-    "return-type": "json",
-    "format": " 󰤕 ",
-    "on-click": "~/.config/waybar/scripts/theme-switcher.sh",
-    "min-length": 3,
-    "max-length": 3
-  },
-
   "hyprland/workspaces": {
-    "persistent-workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": []
-    }
+      "format": "{name}",
+      "active-only": true
   },
 
   "hyprland/window": {
@@ -268,7 +252,7 @@
     "return-type": "json",
     "format": "{}",
     "on-click": "~/.config/waybar/scripts/wifi-menu.sh",
-    "on-click-right": "kitty --title '󰤨  Network Manager TUI' bash -c nmtui",
+    "on-click-right": "ghostty --title='󰤨  Network Manager TUI' -e zsh -c nmtui",
     "interval": 1,
     "min-length": 1,
     "max-length": 1
@@ -301,7 +285,7 @@
       ":: {device_alias}: 󱊣 {device_battery_percentage}%",
 
     "on-click": "~/.config/waybar/scripts/bluetooth-menu.sh",
-    "on-click-right": "kitty --title '󰂯  Bluetooth TUI' bash -c bluetui",
+    "on-click-right": "ghostty --title='󰂯  Bluetooth TUI' -e zsh -c bluetui",
     "interval": 1,
     "min-length": 1,
     "max-length": 1