diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index 4571168..8feb106 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -1,17 +1,8 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  gtk = {
-    enable = true;
-    theme.name = "Adwaita";
-    theme.package = pkgs.gnome-themes-extra;
-    gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
-    gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
-  };
-
-  qt = {
-    platformTheme.name = "Adwaita-dark";
-    style.name = "Adwaita-dark";
-    style.package = pkgs.adwaita-qt;
-  };
+  gtk.enable = true;
+  gtk.theme.name = "Adwaita";
+  gtk.gtk3.extraConfig.gtk-application-prefer-dark-theme = true;
+  gtk.gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
 }
diff --git a/home/element.nix b/home/element.nix
index 6ff1131..36a0383 100644
--- a/home/element.nix
+++ b/home/element.nix
@@ -1,22 +1,23 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 let
-  element-desktop_ = pkgs.element-desktop.override {
-    element-web = pkgs.element-web.override {
-      conf = {
-        showLabsSettings = true;
-      };
-    };
+  # wrapper is needed because otherwise desktop file can't be accessed
+  element-desktop = pkgs.symlinkJoin {
+    inherit (pkgs.element-desktop) name src meta;
+    paths = [ pkgs.element-desktop ];
+    nativeBuildInputs = with pkgs; [ makeWrapper ];
+    postBuild = ''
+      rm -rf $out/share/applications
+      mkdir $out/share/applications
+      cat "${pkgs.element-desktop}/share/applications/element-desktop.desktop" \
+        >"$out/share/applications/element-desktop.desktop"
+    '';
   };
-
 in
 {
-  home.packages = with pkgs; [
-    element-desktop
-    (makeAutostartItem {
-      name = "element-desktop";
-      package = element-desktop_;
-      prependExtraArgs = [ "--hidden" ];
-    })
-  ];
+  home.packages = [ element-desktop ];
+
+  xdg.configFile."autostart/element-desktop.desktop".text =
+    builtins.replaceStrings [ "Exec=element-desktop" ] [ "Exec=element-desktop --hidden" ]
+      (builtins.readFile "${element-desktop}/share/applications/element-desktop.desktop");
 }
diff --git a/home/felschr.nix b/home/felschr.nix
index 44825a3..848ec21 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -1,4 +1,9 @@
-{ lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [
diff --git a/home/modules/firefox/tor-browser.nix b/home/modules/firefox/tor-browser.nix
index 9626100..0b19322 100644
--- a/home/modules/firefox/tor-browser.nix
+++ b/home/modules/firefox/tor-browser.nix
@@ -12,7 +12,7 @@ common.mkModule {
   name = "tor-browser";
   displayName = "Tor Browser";
   dataConfigPath = ".tor project/firefox";
-  defaultPackage = pkgs.tor-browser;
-  defaultPackageName = "pkgs.tor-browser";
+  defaultPackage = pkgs.tor-browser-bundle-bin;
+  defaultPackageName = "pkgs.tor-browser-bundle-bin";
   isSecure = true;
 }
diff --git a/home/services/easyeffects.nix b/home/services/easyeffects.nix
index 6ba9b19..1dee33a 100644
--- a/home/services/easyeffects.nix
+++ b/home/services/easyeffects.nix
@@ -45,10 +45,11 @@
   };
 
   xdg.configFile."easyeffects/autoload/input/alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo:analog-input-mic.json".text =
-    builtins.toJSON {
-      device = "alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo";
-      device-description = "Yeti Stereo Microphone Analog Stereo";
-      device-profile = "analog-input-mic";
-      preset-name = "optimised";
-    };
+    builtins.toJSON
+      {
+        device = "alsa_input.usb-Blue_Microphones_Yeti_Stereo_Microphone_REV8-00.analog-stereo";
+        device-description = "Yeti Stereo Microphone Analog Stereo";
+        device-profile = "analog-input-mic";
+        preset-name = "optimised";
+      };
 }
diff --git a/home/shell/kitty.nix b/home/shell/kitty.nix
index 36ce7fe..7ecce77 100644
--- a/home/shell/kitty.nix
+++ b/home/shell/kitty.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 with pkgs;
 with lib;
@@ -24,8 +29,6 @@ with lib;
     };
   };
 
-  xdg.configFile."kitty/pass_keys.py".source =
-    "${vimPlugins.nvim-kitty-navigator}/kitty/pass_keys.py";
-  xdg.configFile."kitty/neighboring_window.py".source =
-    "${vimPlugins.nvim-kitty-navigator}/kitty/neighboring_window.py";
+  xdg.configFile."kitty/pass_keys.py".source = "${vimPlugins.nvim-kitty-navigator}/kitty/pass_keys.py";
+  xdg.configFile."kitty/neighboring_window.py".source = "${vimPlugins.nvim-kitty-navigator}/kitty/neighboring_window.py";
 }
diff --git a/home/signal.nix b/home/signal.nix
index 265d6f4..5daf200 100644
--- a/home/signal.nix
+++ b/home/signal.nix
@@ -1,12 +1,9 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-    signal-desktop
-    (makeAutostartItem {
-      name = "signal-desktop";
-      package = signal-desktop;
-      prependExtraArgs = [ "--start-in-tray" ];
-    })
-  ];
+  home.packages = with pkgs; [ signal-desktop ];
+
+  xdg.configFile."autostart/signal-desktop.desktop".text =
+    builtins.replaceStrings [ "bin/signal-desktop" ] [ "bin/signal-desktop --start-in-tray" ]
+      (builtins.readFile "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop");
 }
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 3585b3f..198f36c 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   services.jellyfin.enable = true;