diff --git a/flakes/de_plasma/de_plasma.nix b/flakes/de_plasma/de_plasma.nix
index 30b33276..066f5fa0 100644
--- a/flakes/de_plasma/de_plasma.nix
+++ b/flakes/de_plasma/de_plasma.nix
@@ -107,7 +107,6 @@ in
       };
       services.desktopManager.plasma6.enable = true;
 
-
       # Audio / IPC
       services.pipewire = {
         enable = true;
@@ -131,34 +130,39 @@ in
       # KDEConnect
       programs.kdeconnect.enable = true;
 
-       # Useful KDE packages
-       environment.systemPackages = with pkgs; [
-         # Core KDE tools
-         kdePackages.kde-gtk-config
-         kdePackages.konsole
-         kdePackages.dolphin
-         kdePackages.spectacle
-         kdePackages.plasma-browser-integration
-         # kdePackages.plasma-workspace-wallpapers
- 
-         # Panel applets required for widgets
-         kdePackages.plasma-nm # org.kde.plasma.networkmanagement
-         kdePackages.bluedevil # org.kde.plasma.bluetooth
-         kdePackages.plasma-pa # org.kde.plasma.volume
-         kdePackages.kdeplasma-addons # extra widgets
-         kdePackages.powerdevil # power management services
- 
-         # Wayland clipboard helpers
-         wl-clipboard
-         wl-clip-persist
-       ];
+      # Useful KDE packages
+      environment.systemPackages = with pkgs; [
+        # Core KDE tools
+        kdePackages.kde-gtk-config
+        kdePackages.konsole
+        kdePackages.dolphin
+        kdePackages.spectacle
+        kdePackages.plasma-browser-integration
+        # kdePackages.plasma-workspace-wallpapers
 
+        # Panel applets required for widgets
+        kdePackages.plasma-nm # org.kde.plasma.networkmanagement
+        kdePackages.bluedevil # org.kde.plasma.bluetooth
+        kdePackages.plasma-pa # org.kde.plasma.volume
+        kdePackages.kdeplasma-addons # extra widgets
+        kdePackages.powerdevil # power management services
+
+        # Wayland clipboard helpers
+        wl-clipboard
+        wl-clip-persist
+      ];
 
-      # Keyboard like sway/i3
       console.useXkbConfig = true;
       services.xserver.xkb = {
         layout = "us";
-        options = "caps:escape";
+      };
+      services.keyd = {
+        enable = true;
+        keyboards.default.settings = {
+          main = {
+            capslock = "escape";
+          };
+        };
       };
 
       # Home Manager modules (plasma-manager + our HM layer)
@@ -247,6 +251,30 @@ in
       };
     })
 
+    # Japanese
+    ({
+      i18n.inputMethod = {
+        enable = true;
+        type = "fcitx5";
+        fcitx5 = {
+          waylandFrontend = true;
+          ignoreUserConfig = true;
+          addons = with pkgs; [ fcitx5-mozc ];
+          settings = {
+            inputMethod = {
+              "Groups/0" = {
+                Name = "Default";
+                "Default Layout" = "us";
+                DefaultIM = "keyboard-us";
+              };
+              "Groups/0/Items/0".Name = "keyboard-us";
+              "Groups/0/Items/1".Name = "mozc";
+            };
+          };
+        };
+      };
+    })
+
     {
       assertions = [
         {
diff --git a/flakes/de_plasma/home_manager/default.nix b/flakes/de_plasma/home_manager/default.nix
index 44de2234..b0d640ae 100644
--- a/flakes/de_plasma/home_manager/default.nix
+++ b/flakes/de_plasma/home_manager/default.nix
@@ -58,9 +58,7 @@ in
         keyboard = {
           layouts = [
             { layout = "us"; }
-            { layout = "jp"; }
           ];
-          options = [ "caps:escape" ];
         };
         mice = [
           # {
@@ -304,7 +302,9 @@ in
       configFile = {
         kwalletrc.Wallet.Enabled = false;
         plasmanotifyrc.Notifications.PopupPosition = "TopRight";
-
+        ksmserverrc.General.loginMode = "restorePreviousLogout";
+        kwinrc.Wayland.InputMethod =
+          "/run/current-system/sw/share/applications/org.fcitx.Fcitx5.desktop";
       };
     };
   };
diff --git a/flakes/de_plasma/home_manager/shortcuts.nix b/flakes/de_plasma/home_manager/shortcuts.nix
index 4500d231..0211a29d 100644
--- a/flakes/de_plasma/home_manager/shortcuts.nix
+++ b/flakes/de_plasma/home_manager/shortcuts.nix
@@ -53,7 +53,7 @@ in
         "Lock Session" = "Meta+Shift+L";
       };
 
-      "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+K";
+      # "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+K";
     };
 
     # Custom hotkey commands