diff --git a/modules/programs/sway/default.nix b/modules/programs/sway/default.nix
index 18ae90d..b3a2d6f 100644
--- a/modules/programs/sway/default.nix
+++ b/modules/programs/sway/default.nix
@@ -52,7 +52,7 @@ in {
             { command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; always = true; }
             { command = "${swayIdleWrapper}"; always = true; }
           ] ++ lib.optional config.ptw.system.i18n.enable {
-            command = "${pkgs.fcitx5}/bin/fcitx -d";
+            command = "${pkgs.fcitx5}/bin/fcitx5 -d";
             always = true;
           };
           modifier = "${modifier}";
diff --git a/modules/services/i18n/default.nix b/modules/services/i18n/default.nix
index a5fef1b..957d18b 100644
--- a/modules/services/i18n/default.nix
+++ b/modules/services/i18n/default.nix
@@ -8,9 +8,12 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # TODO: mozc cannot be configured for some reason
     i18n.inputMethod = {
       enabled = "fcitx";
-      ibus.engines = with pkgs.ibus-engines; [ mozc ];
+      fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
     };
+
+    environment.systemPackages = with pkgs; [ fcitx5-configtool fcitx5-gtk ];
   };
 }