diff --git a/docs/TODO.md b/docs/TODO.md
index 835ad64..df21f21 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -5,6 +5,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 - [ ] Nixy
   - [ ] Themes
 
+- [ ] Clipse: clipboard manager
 - [ ] Walker launcher implementation
 
 - [ ] Qutebrowser
@@ -15,7 +16,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
     - [ ] wofi: popin
     - [ ] wlogout: fade in
   - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?)
-  - [ ] Hyprlock themes
+  - [ ] Hyprlock themes (repo hyprlock-styles on github)
   - [ ] Hypridle fix: suspend not working?
 
 - [ ] Nixvim
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index ed8f9ac..b7284d9 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -55,6 +55,12 @@
           "format" = "{title:30}";
           "max-length" = 30;
           "separate-outputs" = true;
+          rewrite = {
+            "\\s*(.*)\\s+" = "$1"; # Remove trailing whitespace
+            # "\\s*" = # TODO FIXME
+            #   "\${USER}@\${HOST}"; # Replace empty string with your username
+            ".* - LibreWolf" = "LibreWolf";
+          };
         };
 
         "hyprland/workspaces" = {