diff --git a/.config/kak/kakrc b/.config/kak/kakrc
index b44720f5..a992470c 100644
--- a/.config/kak/kakrc
+++ b/.config/kak/kakrc
@@ -117,9 +117,11 @@ define-command bar-buflist %{
         while read buf; do
         index=$(($index + 1))
         # if [ "$buf" = "$kak_bufname" ]; then
-        list="$list  $index $buf"
+        cur=$(printf '[%s] %s' "$index" "$buf")
+        list="$list $cur"
         done <<< $(printf '%s\n' "$kak_buflist" | tr ' ' '\n')
-        quoted=$(printf '%q' "$list" | sed "s/\\*/\*/g")
+        quoted=$(printf '%q' "$list" | sed -e 's/\\\*/\*/g' -e 's/\\\[/\[/g' -e 's/\\\]/\]/g')
+
         printf "set-option -add global ui_options terminal_title=%s" "$quoted"
     }
 }
diff --git a/.config/waybar/config##hostname.dbox b/.config/waybar/config##hostname.dbox
index c5d93365..dc1de49b 100644
--- a/.config/waybar/config##hostname.dbox
+++ b/.config/waybar/config##hostname.dbox
@@ -1,133 +1,138 @@
 [
-  // TOP BAR
-  {
-    // "output": "DP-1",
-    "layer": "top",
-    "position": "top",
-    "modules-left": [
-      "custom/colcount"
-    ],
-    "modules-center": [
-      "niri/window"
-    ],
-    "modules-right": [
-      "clock"
-    ],
-    "niri/window": {
-      "max-length": 100,
-      "separate-outputs": true
+    // TOP BAR
+    {
+        // "output": "DP-1",
+        "layer": "top",
+        "position": "top",
+        "modules-left": [
+            "custom/colcount"
+        ],
+        "modules-center": [
+            "niri/window"
+        ],
+        "modules-right": [
+            "clock"
+        ],
+        "niri/window": {
+            "max-length": 100,
+            "separate-outputs": true,
+            "expand": true,
+            "format": "{}",
+            "rewrite": {
+                "(.*) - Kakoune": "$1"
+            }
+        },
+        "custom/colcount": {
+            "exec": "~/dev/niri-windows/niri-windows.py",
+            "return-type": "json",
+            "restart-interval": "never",
+            "format": "{} "
+        },
+        "clock": {
+            "format-alt": "{:%a, %d. %b  %H:%M}"
+        }
     },
-    "custom/colcount": {
-      "exec": "~/dev/niri-windows/niri-windows.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "format": "{} "
+    // bottom bar
+    {
+        "output": "DP-1",
+        "layer": "top",
+        "position": "bottom",
+        "modules-left": [
+            "cava"
+        ],
+        "modules-center": [
+            "cpu",
+            "custom/delim",
+            "memory",
+            "custom/delim",
+            "pulseaudio"
+        ],
+        "modules-right": [
+            "custom/recorder",
+            "tray"
+        ],
+        "niri/window": {
+            "max-length": 50,
+            "separate-outputs": true
+        },
+        "custom/colcount": {
+            "exec": "~/dev/niri-windows/niri-windows.py",
+            "return-type": "json",
+            "restart-interval": "never",
+            "format": "{} "
+        },
+        "custom/recorder": {
+            "exec": "~/dev/utils/wayland-utils/recorder/recorder.py",
+            "return-type": "json",
+            "restart-interval": "never",
+            "on-click": "~/dev/utils/wayland-utils/recorder/recorder.sh screen",
+            "on-click-right": "~/dev/utils/wayland-utils/recorder/recorder.sh region",
+            "format": " {} "
+        },
+        "custom/delim": {
+            "format": "|"
+        },
+        "cava": {
+            "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
+            "format-icons": [
+                "▁",
+                "▂",
+                "▃",
+                "▄",
+                "▅",
+                "▆",
+                "▇",
+                "█"
+            ],
+            "actions": {
+                "on-click-right": "mode"
+            }
+        },
+        "battery": {
+            "format": "{capacity}% 󰁹",
+            "format-charging": "{capacity}% ",
+            "format-plugged": "{capacity}% "
+        },
+        "pulseaudio": {
+            "scroll-step": 5,
+            "max-volume": 150,
+            "format": "󰕾 {volume}%",
+            "format-muted": "󰖁",
+            "nospacing": 1,
+            "on-click": "pavucontrol",
+            "on-click-right": "~/.config/waybar/scripts/cycle-sinks.fish",
+            "on-click-middle": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+            "tooltip": false
+        },
+        "cpu": {
+            "interval": 10,
+            "format": " {usage}%",
+            "max-length": 10
+        },
+        "memory": {
+            "interval": 30,
+            "format": " {percentage}%",
+            "max-length": 10
+        }
     },
-    "clock": {
-      "format-alt": "{:%a, %d. %b  %H:%M}"
+    // LEFT BAR
+    {
+        // "output": "DP-1",
+        "layer": "top",
+        "exclusive": false,
+        "gtk-layer-shell": true,
+        "name": "leftbar",
+        "width": 14,
+        "position": "left",
+        "modules-left": [
+            "niri/workspaces"
+        ],
+        "niri/workspaces": {
+            "format": "{icon}",
+            "format-icons": {
+                "active": "",
+                "default": ""
+            }
+        }
     }
-  },
-  // bottom bar
-  {
-    "output": "DP-1",
-    "layer": "top",
-    "position": "bottom",
-    "modules-left": [
-      "cava"
-    ],
-    "modules-center": [
-      "cpu",
-      "custom/delim",
-      "memory",
-      "custom/delim",
-      "pulseaudio"
-    ],
-    "modules-right": [
-      "custom/recorder",
-      "tray"
-    ],
-    "niri/window": {
-      "max-length": 50,
-      "separate-outputs": true
-    },
-    "custom/colcount": {
-      "exec": "~/dev/niri-windows/niri-windows.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "format": "{} "
-    },
-    "custom/recorder": {
-      "exec": "~/dev/utils/wayland-utils/recorder/recorder.py",
-      "return-type": "json",
-      "restart-interval": "never",
-      "on-click": "~/dev/utils/wayland-utils/recorder/recorder.sh screen",
-      "on-click-right": "~/dev/utils/wayland-utils/recorder/recorder.sh region",
-      "format": " {} "
-    },
-    "custom/delim": {
-      "format": "|"
-    },
-    "cava": {
-      "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
-      "format-icons": [
-        "▁",
-        "▂",
-        "▃",
-        "▄",
-        "▅",
-        "▆",
-        "▇",
-        "█"
-      ],
-      "actions": {
-        "on-click-right": "mode"
-      }
-    },
-    "battery": {
-      "format": "{capacity}% 󰁹",
-      "format-charging": "{capacity}% ",
-      "format-plugged": "{capacity}% "
-    },
-    "pulseaudio": {
-      "scroll-step": 5,
-      "max-volume": 150,
-      "format": "󰕾 {volume}%",
-      "format-muted": "󰖁",
-      "nospacing": 1,
-      "on-click": "pavucontrol",
-      "on-click-right": "~/.config/waybar/scripts/cycle-sinks.fish",
-      "on-click-middle": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
-      "tooltip": false
-    },
-    "cpu": {
-      "interval": 10,
-      "format": " {usage}%",
-      "max-length": 10
-    },
-    "memory": {
-      "interval": 30,
-      "format": " {percentage}%",
-      "max-length": 10
-    }
-  },
-  // LEFT BAR
-  {
-    // "output": "DP-1",
-    "layer": "top",
-    "exclusive": false,
-    "gtk-layer-shell": true,
-    "name": "leftbar",
-    "width": 14,
-    "position": "left",
-    "modules-left": [
-      "niri/workspaces"
-    ],
-    "niri/workspaces": {
-      "format": "{icon}",
-      "format-icons": {
-        "active": "",
-        "default": ""
-      }
-    }
-  }
-]
+]
\ No newline at end of file