diff --git a/home/colors.nix b/home/colors.nix
index 7e3d9f5..c1fafc8 100644
--- a/home/colors.nix
+++ b/home/colors.nix
@@ -182,7 +182,7 @@ in
       name = "Adwaita-dark";
       package = pkgs.gnome-themes-extra;
     };
-    # Nudge towards dark theme
+
     gtk3.extraConfig = {
       gtk-application-prefer-dark-theme = true;
     };
@@ -195,12 +195,25 @@ in
     gtk4.extraCss = gtkColorOverrides;
   };
 
+  home.packages = with pkgs; [
+    gnome-themes-extra # already present
+    libsForQt5.qt5ct
+    kdePackages.qt6ct
+    libsForQt5.qtstyleplugins # for qt5 extra GTK integration
+    kdePackages.qtstyleplugin-kvantum
+  ];
+
   qt = {
     enable = true;
-    platformTheme.name = "gtk";
-    style.name = "gtk";
+
+    # Make Qt follow your GTK theme
+    platformTheme.name = "gtk"; # "gtk3" is not valid, just use "gtk"
+
+    # Use Adwaita Dark for Qt
+    style = {
+      name = "adwaita-dark";
+      package = pkgs.adwaita-qt;
+    };
   };
 
-  home.packages = with pkgs; [ gnome-themes-extra ];
-
 }
diff --git a/home/fcitx5.nix b/home/fcitx5.nix
index 08e6b98..f0dd138 100644
--- a/home/fcitx5.nix
+++ b/home/fcitx5.nix
@@ -1,40 +1,49 @@
 { pkgs, lib, ... }:
-
 {
   i18n.inputMethod = {
     enable = true;
     type = "fcitx5";
-
     fcitx5 = {
       waylandFrontend = true;
       addons = with pkgs; [
-        fcitx5-gtk
+        fcitx5-rime
         fcitx5-mozc
-        catppuccin-fcitx5
+        fcitx5-gtk
+        fcitx5-configtool
+        libsForQt5.fcitx5-qt
+        fcitx5-tokyonight
       ];
 
-      themes = {
-        catppuccin = {
-          highlightImage = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/highlight.svg";
-          panelImage = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/panel.svg";
-          theme = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/theme.conf";
-        };
-      };
-
       settings = {
-        addons.classicui.globalSection = {
-          Theme = "catppuccin";
-        };
-        globalOptions."Global" = {
+        # Correct hotkey section:
+        globalOptions.Hotkey = {
           TriggerKey = "Control+space";
         };
-        inputMethod."Default" = {
-          Enabled = "xkb:us::eng,xkb:no::nob,xkb:jp::jpn,mozc";
+
+        inputMethod = {
+          "Groups/0" = {
+            Name = "Default";
+            "Default Layout" = "us";
+            "DefaultIM" = "keyboard-us";
+          };
+          "Groups/0/Items/0" = {
+            Name = "keyboard-us";
+            Layout = "us";
+          };
+          "Groups/0/Items/1" = {
+            Name = "mozc";
+            Layout = "";
+          };
+          "Groups/0/Items/2" = {
+            Name = "keyboard-no";
+            Layout = "no";
+          };
+          "Groups" = {
+            GroupOrder = "Default";
+          };
         };
+
       };
     };
   };
-
-  systemd.user.services.fcitx5-daemon.Service.ExecStart =
-    lib.mkForce "${pkgs.fcitx5-with-addons}/bin/fcitx5";
 }
diff --git a/home/gunalx.nix b/home/gunalx.nix
index 624de4d..e7f61e1 100644
--- a/home/gunalx.nix
+++ b/home/gunalx.nix
@@ -25,6 +25,7 @@
     ./mako.nix
     ./foot.nix
     ./zed.nix
+    ./neovim.nix
     ./fcitx5.nix
 
     #secrets
diff --git a/home/neovim.nix b/home/neovim.nix
new file mode 100644
index 0000000..28f0553
--- /dev/null
+++ b/home/neovim.nix
@@ -0,0 +1,41 @@
+{ pkgs, ... }:
+{
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    defaultEditor = true;
+    withPython3 = true;
+    withNodeJs = true;
+
+    extraConfig = ''
+      set backspace=indent,eol,start
+      syntax on
+      set tabstop=2 softtabstop=0 autoindent expandtab shiftwidth=2 smarttab
+    '';
+
+    extraLuaConfig = ''
+      vim.wo.number = true
+      -- vim.wo.relativenumber = true
+    '';
+
+    extraPackages = [ pkgs.fzf ]; # For fzf-vim functionality
+
+    plugins = with pkgs.vimPlugins; [
+      vim-nix
+      vim-lastplace
+      vim-yaml
+      fzf-vim
+      chadtree
+
+    ];
+
+    # CoC configuration (replacing coc-rust-analyzer plugin)
+    coc.enable = true;
+    coc.settings = {
+      "coc.globalExtensions" = [
+        "coc-rust-analyzer"
+      ];
+    };
+  };
+}
diff --git a/home/niri.nix b/home/niri.nix
index c6c5bdb..0c05633 100644
--- a/home/niri.nix
+++ b/home/niri.nix
@@ -11,8 +11,9 @@ let
             // KDL‐format niri config
 
             input {
-              keyboard { xkb { layout "us,no"; options "grp:ctrl_space_toggle"; }; }
-              touchpad {
+              //keyboard { xkb { layout "us,no,mozc"; options "grp:ctrl_space_toggle"; }; }
+              keyboard { xkb { layout "us,no";}; }
+                touchpad {
                 tap
                 natural-scroll
                 accel-speed 0.1
diff --git a/hosts/legolas/configuration.nix b/hosts/legolas/configuration.nix
index 1177bf8..328625e 100644
--- a/hosts/legolas/configuration.nix
+++ b/hosts/legolas/configuration.nix
@@ -16,6 +16,7 @@
     ../../modules/boot.nix
     ../../modules/zram.nix
     ../../modules/displaymanager.nix
+    ../../modules/polkit.nix
     ../../modules/nix.nix
     ../../secrets/sops.nix
     ../../secrets/sopsconf.nix
diff --git a/modules/polkit.nix b/modules/polkit.nix
new file mode 100644
index 0000000..96956f0
--- /dev/null
+++ b/modules/polkit.nix
@@ -0,0 +1,26 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  imports = [ ];
+  systemd = {
+    user.services.polkit-gnome-authentication-agent-1 = {
+      description = "polkit-gnome-authentication-agent-1";
+      wantedBy = [ "graphical-session.target" ];
+      wants = [ "graphical-session.target" ];
+      after = [ "graphical-session.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
+        Restart = "on-failure";
+        RestartSec = 1;
+        TimeoutStopSec = 10;
+      };
+    };
+  };
+
+}