diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix
index 7ac2c2f..5e2a8f1 100644
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@@ -9,7 +9,6 @@ in {
   home-manager.users.balsoft = lib.mkIf (config.deviceSpecific.goodMachine) {
     home.packages = with pkgs; [
       plasma-integration
-      plasma5.xdg-desktop-portal-kde
       plasma-browser-integration
     ];
     home.file.".mozilla/native-messaging-hosts".source = pkgs.symlinkJoin {
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 40781c2..c119fb7 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -54,7 +54,6 @@
       gnumeric
       gcalcli
       google-drive-ocamlfuse
-      kdeconnect
       trojita
       nix-zsh-completions
       papirus-icon-theme
diff --git a/modules/users.nix b/modules/users.nix
index 8cdfc71..f5d6526 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -33,8 +33,6 @@
     after = [ "linkGeneration" ];
     before = [ ];
   };
-  home-manager.users.balsoft.home.sessionVariables.XDG_RUNTIME_DIR =
-    "/run/user/1000";
 
   services.udev.extraRules = ''
     ACTION=="remove", ATTRS{idVendor}=="1050", RUN+="${pkgs.systemd}/bin/loginctl lock-sessions"
diff --git a/modules/workspace/gtk.nix b/modules/workspace/gtk.nix
index b369468..15ea954 100644
--- a/modules/workspace/gtk.nix
+++ b/modules/workspace/gtk.nix
@@ -44,8 +44,8 @@ in {
       '';
     };
   })];
+  services.dbus.packages = with pkgs; [ gnome3.dconf ];
   home-manager.users.balsoft = {
-    home.packages = [pkgs.generated-gtk-theme];
     gtk = {
       enable = true;
       iconTheme = {
@@ -56,13 +56,10 @@ in {
         name = "Generated";
         package = pkgs.generated-gtk-theme;
       };
-      font = 
-      {
-        package = pkgs.roboto;
-        name = "Roboto 11";
+      font = {
+        name = "Roboto 12";
       };
       gtk3.extraConfig.gtk-cursor-theme-name = "breeze";
     };
   };
-  environment.sessionVariables.GTK_THEME = "Generated";
 }
diff --git a/modules/workspace/kde/default.nix b/modules/workspace/kde/default.nix
index d50a5e0..e9a889e 100644
--- a/modules/workspace/kde/default.nix
+++ b/modules/workspace/kde/default.nix
@@ -2,7 +2,7 @@
 with import ../../../support.nix { inherit lib config; }; {
   xdg.portal.enable = true;
   # services.flatpak.enable = true;
-  xdg.portal.extraPortals = [ pkgs.plasma5.xdg-desktop-portal-kde ];
+  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
   services.dbus.packages = [
     pkgs.plasma5.xdg-desktop-portal-kde
     pkgs.flatpak
@@ -10,7 +10,6 @@ with import ../../../support.nix { inherit lib config; }; {
     pkgs.systemd
   ];
   nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
-  home-manager.users.balsoft.home.packages = [ pkgs.qt5ct ];
   environment.sessionVariables = {
     DESKTOP_SESSION = "kde";
     QT_XFT = "true";
@@ -19,11 +18,9 @@ with import ../../../support.nix { inherit lib config; }; {
     KDE_SESSION_VERSION = "5";
     QT_SCALE_FACTOR = "1";
     QT_AUTO_SCREEN_SCALE_FACTOR = "0";
-    GTK_USE_PORTAL = "1";
     DE = "kde";
     QT_QPA_PLATFORMTHEME = "kde";
   };
-  #home-manager.users.balsoft.xdg.configFile."qt5ct/qt5ct.conf".source = ./qt5ct.conf;
   home-manager.users.balsoft.xdg.configFile."kdeglobals".text = genIni {
     "Colors:Button" = {
       BackgroundAlternate = thmDec.dark;
diff --git a/modules/workspace/locale.nix b/modules/workspace/locale.nix
index 38375a3..f2df901 100644
--- a/modules/workspace/locale.nix
+++ b/modules/workspace/locale.nix
@@ -2,6 +2,11 @@
   console.font = "cyr-sun16";
   console.keyMap = "ruwin_cplk-UTF-8";
 
+  environment.sessionVariables = {
+    XKB_DEFAULT_LAYOUT = "us,ru";
+    XKB_DEFAULT_OPTIONS = "grp:lctrl_toggle,grp_led:caps,ctrl:nocaps";
+  };
+
   time.timeZone = "Europe/Moscow"; # Mother Russia
   home-manager.users.balsoft.home.language = let
     en = "en_GB.UTF-8";
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index a078e23..1da6f19 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -8,8 +8,6 @@
     VISUAL = config.defaultApplications.editor.cmd;
     LESS = "-asrRix8";
     XDG_SESSION_TYPE = "wayland";
-    XKB_DEFAULT_LAYOUT = "us,ru";
-    XKB_DEFAULT_OPTIONS = "grp:lctrl_toggle,grp_led:caps,ctrl:nocaps";
     QT_QPA_PLATFORM = "wayland";
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     NIX_AUTO_RUN = "1";
@@ -67,5 +65,6 @@
     home.file.".icons/default".source =
       "${pkgs.breeze-qt5}/share/icons/breeze_cursors";
     systemd.user.startServices = true;
+    services.kdeconnect.enable = true;
   };
 }
diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix
index ebad3f9..aab6852 100755
--- a/modules/workspace/sway/default.nix
+++ b/modules/workspace/sway/default.nix
@@ -7,6 +7,8 @@ let
 in {
   environment.sessionVariables._JAVA_AWT_WM_NONREPARENTING = "1";
 
+  programs.sway.wrapperFeatures.gtk = true;
+
   home-manager.users.balsoft.wayland.windowManager.sway = {
     enable = true;
     config = rec {
@@ -70,8 +72,7 @@ in {
         ];
       };
       startup = [
-        { command = apps.browser.cmd; }
-        { command = "${pkgs.kdeconnect}/libexec/kdeconnectd"; }
+        { command = "GTK_USE_PORTAL=1 ${apps.browser.cmd}"; }
         {
           command =
             "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
@@ -89,6 +90,12 @@ in {
         {
           command = "swayidle -w before-sleep '${lock_fork}' lock '${lock_fork}' unlock 'pkill -9 swaylock'";
         }
+        {
+          command = "${pkgs.xdg-desktop-portal-kde}/libexec/xdg-desktop-portal-kde";
+        }
+        {
+          command = "${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal";
+        }
       ];
 
       keybindings = let
diff --git a/modules/workspace/xresources.nix b/modules/workspace/xresources.nix
index b0cef6c..d867c25 100644
--- a/modules/workspace/xresources.nix
+++ b/modules/workspace/xresources.nix
@@ -39,10 +39,5 @@
       # "emacs.color15" = fg;
 
     };
-    home.activation.xrdb = {
-      after = ["linkGeneration"];
-      before = [];
-      data = "DISPLAY=:0 ${pkgs.xorg.xrdb}/bin/xrdb -merge ${config.users.users.balsoft.home}/.Xresources";
-    };
   };
 }