diff --git a/modules/common.nix b/modules/common.nix
index ee57bf9..cbdb041 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -39,7 +39,7 @@
   environment.pathsToLink = [ "/libexec" ];
   environment.systemPackages = with pkgs; [
     curl
-    htop
+    btop
     pciutils
     psmisc
   ];
diff --git a/modules/shell/utils.nix b/modules/shell/utils.nix
index 173d761..97f16a0 100644
--- a/modules/shell/utils.nix
+++ b/modules/shell/utils.nix
@@ -8,11 +8,21 @@ in
     enable = lib.mkEnableOption "Basic shell utils";
   };
   config = lib.mkIf cfg.enable {
+    hm.programs = {
+      fzf = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+
+      eza = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+    };
+
     environment.systemPackages = with pkgs; [
       bat
-      eza
       fd
-      fzf
       jq
       ripgrep
       tldr
diff --git a/modules/system/input/greek.nix b/modules/system/input/greek.nix
index c42898c..35535ff 100644
--- a/modules/system/input/greek.nix
+++ b/modules/system/input/greek.nix
@@ -22,7 +22,7 @@ in
     };
 
     environment.variables = {
-      GTK_IM_MODULE = "fcitx";
+      # GTK_IM_MODULE = "fcitx";
       QT_IM_MODULE = "fcitx";
       XMODIFIERS = "@im=fcitx";
     };
diff --git a/modules/system/input/japanese.nix b/modules/system/input/japanese.nix
index 7baffdf..49fa801 100644
--- a/modules/system/input/japanese.nix
+++ b/modules/system/input/japanese.nix
@@ -15,11 +15,14 @@ in
     i18n.inputMethod = {
       type = "fcitx5";
       enable = true;
-      fcitx5.addons = with pkgs; [
-        fcitx5-mozc-ut
-        fcitx5-gtk
-        fcitx5-nord
-      ];
+      fcitx5 = {
+        waylandFrontend = true;
+        addons = with pkgs; [
+          fcitx5-mozc-ut
+          fcitx5-gtk
+          fcitx5-nord
+        ];
+      };
     };
 
     fonts.packages = with pkgs; [
@@ -29,7 +32,7 @@ in
     ];
 
     environment.variables = {
-      GTK_IM_MODULE = "fcitx";
+      # GTK_IM_MODULE = "fcitx";
       QT_IM_MODULE = "fcitx";
       XMODIFIERS = "@im=fcitx";
     };