diff --git a/users/modules/desktop/niri.nix b/users/modules/desktop/niri.nix
index 283d940..1f6a1bf 100644
--- a/users/modules/desktop/niri.nix
+++ b/users/modules/desktop/niri.nix
@@ -163,13 +163,13 @@ in
       Mod+Shift+Q { close-window; }
       Alt+F4 { close-window; }
       Mod+Left  { focus-column-left; }
-      Mod+Down  { focus-window-down; }
-      Mod+Up    { focus-window-up; }
+      Mod+Down  { focus-window-or-workspace-down; }
+      Mod+Up    { focus-window-or-workspace-up; }
       Mod+Right { focus-column-right; }
       Mod+H     { focus-column-left; }
       Mod+L     { focus-column-right; }
-      Mod+J     { focus-window-down; }
-      Mod+K     { focus-window-up; }
+      Mod+J     { focus-window-or-workspace-down; }
+      Mod+K     { focus-window-or-workspace-up; }
       Ctrl+Alt+J    { focus-workspace-down; }
       Ctrl+Alt+K    { focus-workspace-up; }
       Ctrl+Alt+Down { focus-workspace-down; }
diff --git a/users/modules/stylix.nix b/users/modules/stylix.nix
index 13ba8b6..f1c7e44 100644
--- a/users/modules/stylix.nix
+++ b/users/modules/stylix.nix
@@ -46,7 +46,7 @@
         name = "FiraCode Nerd Font";
       };
       emoji = {
-        package = pkgs.noto-fonts-emoji;
+        package = pkgs.noto-fonts-color-emoji;
         name = "Noto Color Emoji";
       };
       sizes = {