diff --git a/home-manager/modules/hypr/waybar.nix b/home-manager/modules/hypr/waybar.nix
index 5a41af3..f995790 100644
--- a/home-manager/modules/hypr/waybar.nix
+++ b/home-manager/modules/hypr/waybar.nix
@@ -8,7 +8,11 @@
         position = "top";
         height = 20;
 
-        modules-left = [ "hyprland/workspaces" "niri/workspaces" ];
+        modules-left = [
+          "hyprland/workspaces"
+          "niri/workspaces"
+          "niri/window"
+        ];
         modules-center = [ "clock" ];
         modules-right = [
           "cpu"
@@ -32,6 +36,14 @@
           persistent-workspaces."*" = 4;
         };
 
+        "niri/workspaces" = {
+        	format = "{icon}";
+        	format-icons = {
+        		active = "";
+        		default = "";
+        	};
+        };
+
         "clock" = {
           format = " {:%H:%M:%S}";
           tooltip-format = " {:%a, %d %b}";
@@ -92,8 +104,13 @@
           background: transparent;
           border: none;
       }
+      window#waybar.empty #window {
+        background-color: transparent;
+        border: none;
+      }
 
       #workspaces,
+      #window,
       #clock,
       #cpu,
       #memory,
diff --git a/home-manager/modules/niri-config.kdl b/home-manager/modules/niri-config.kdl
index c2e5001..8726199 100644
--- a/home-manager/modules/niri-config.kdl
+++ b/home-manager/modules/niri-config.kdl
@@ -309,6 +309,7 @@ binds {
     // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
     // ...
 
+    // TODO!!!
     Mod+Shift+Page_Down { move-workspace-down; }
     Mod+Shift+Page_Up   { move-workspace-up; }
     Mod+Shift+U         { move-workspace-down; }