diff --git a/modules/home/games/itch/default.nix b/modules/home/games/itch/default.nix
index 71e543b..c285c64 100644
--- a/modules/home/games/itch/default.nix
+++ b/modules/home/games/itch/default.nix
@@ -2,6 +2,7 @@
   options.chimera.games.itch.enable = lib.mkEnableOption "Enable Itch.io Client";
 
   config = {
-    home.packages = lib.mkIf config.chimera.games.itch.enable [ pkgs.itch ];
+    home.packages = lib.mkIf config.chimera.games.itch.enable
+      (lib.warn "Installing the itch.io client is currently disabled as it's broken in upstream nixpkgs, skipping..." [ /* pkgs.itch */ ]);
   };
-}
\ No newline at end of file
+}
diff --git a/modules/home/gestures/default.nix b/modules/home/gestures/default.nix
index 73bdb83..f80d690 100644
--- a/modules/home/gestures/default.nix
+++ b/modules/home/gestures/default.nix
@@ -8,7 +8,7 @@
     systemd.user.startServices = "sd-switch";
 
     systemd.user.services.fusuma.Unit.X-Restart-Triggers = [
-      config.xdg.configFile."fusuma/config.yaml".source
+      config.xdg.configFile."fusuma/config.yml".source
     ];
   };
 }
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 2924d6d..5226576 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -101,7 +101,8 @@
 
     programs.eza = lib.mkIf config.chimera.shell.replacements.eza.enable {
       enable = true;
-      enableAliases = true;
+      enableZshIntegration = config.chimera.shell.zsh.enable;
+      enableBashIntegration = config.chimera.shell.bash.enable;
     };
 
     programs.ripgrep = lib.mkIf config.chimera.shell.replacements.ripgrep.enable {
diff --git a/modules/home/shell/zsh/default.nix b/modules/home/shell/zsh/default.nix
index b2491c9..693da7b 100644
--- a/modules/home/shell/zsh/default.nix
+++ b/modules/home/shell/zsh/default.nix
@@ -33,7 +33,8 @@
   config = lib.mkIf config.chimera.shell.zsh.enable {
     programs.zsh = {
       enable = true;
-      enableAutosuggestions = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
       enableCompletion = true;
       autocd = true;
       defaultKeymap = "emacs";