diff --git a/hosts/totsugeki/home-manager/desktop/cursor.nix b/hosts/totsugeki/home-manager/desktop/cursor.nix
index 816819a..d1fed6e 100644
--- a/hosts/totsugeki/home-manager/desktop/cursor.nix
+++ b/hosts/totsugeki/home-manager/desktop/cursor.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }: {
   home.pointerCursor = {
     gtk.enable = true;
-    package = pkgs.catppuccin-cursors.mochaMauve;
-    name = "catppuccin-mocha-mauve-cursors";
+    package = pkgs.phinger-cursors;
+    name = "phinger-cursors-dark";
     size = 32;
   };
 }
diff --git a/hosts/totsugeki/home-manager/desktop/kitty.nix b/hosts/totsugeki/home-manager/desktop/kitty.nix
index f4bcfe6..36e5c4f 100644
--- a/hosts/totsugeki/home-manager/desktop/kitty.nix
+++ b/hosts/totsugeki/home-manager/desktop/kitty.nix
@@ -2,7 +2,7 @@
   programs.kitty = {
     enable = true;
     font = {
-      name = "Iosevka Nerd Font";
+      name = "UbuntuMono Nerd Font";
       size = 14;
     };
     keybindings = {
diff --git a/hosts/totsugeki/home-manager/desktop/sway.nix b/hosts/totsugeki/home-manager/desktop/sway.nix
index a9cbc60..e2101db 100644
--- a/hosts/totsugeki/home-manager/desktop/sway.nix
+++ b/hosts/totsugeki/home-manager/desktop/sway.nix
@@ -32,6 +32,8 @@ in {
       in {
         "Ctrl+Alt+T" = "exec ${cfg.terminal}";
         "${Super}+Space" = "exec ags -t launcher";
+        "${Super}+C" = "exec ags -t bar_extended";
+        "${Hyper}+C" = "exec ags -t popup_clock";
         # Workspace management
         "${Super}+1" = "workspace number 1";
         "${Super}+2" = "workspace number 2";
@@ -102,7 +104,7 @@ in {
         };
       };
       output.DP-1.resolution = "2560x1440@165Hz";
-      seat."*".xcursor_theme = "catppuccin-mocha-mauve-cursors 32";
+      seat."*".xcursor_theme = "phinger-cursors-dark 32";
       startup = [
         { command = "swww-daemon"; }
         { command = "autotiling"; }
@@ -119,7 +121,9 @@ in {
       default_dim_inactive 0.4
       default_border none
       layer_effects bar blur enable; blur_ignore_transparent enable
-      layer_effects launcher blur enable; corner_radius 8 
+      layer_effects bar_extended blur enable; blur_ignore_transparent enable
+      layer_effects bar_extended blur enable; blur_ignore_transparent enable
+      layer_effects launcher blur enable; blur_ignore_transparent enable
     '';
   };
 }
diff --git a/hosts/totsugeki/nixos/default.nix b/hosts/totsugeki/nixos/default.nix
index 56ee2d0..c755839 100644
--- a/hosts/totsugeki/nixos/default.nix
+++ b/hosts/totsugeki/nixos/default.nix
@@ -48,14 +48,15 @@
   fonts = {
     packages = with pkgs; [
       inter
-      (nerdfonts.override { fonts = [ "Iosevka" ]; })
+      ubuntu-sans
+      (nerdfonts.override { fonts = [ "Iosevka" "UbuntuMono" ]; })
     ];
 
     fontconfig = {
       defaultFonts = {
-        serif = [ "Inter" ];
-        sansSerif = [ "Inter" ];
-        monospace = [ "Iosevka Nerd Font" ];
+        serif = [ "Ubuntu Sans" ];
+        sansSerif = [ "Ubuntu Sans" ];
+        monospace = [ "Ubuntu Mono Nerd Font" ];
       };
     };
   };