diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 1e832fb..68acdf3 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -12,8 +12,8 @@
               src = pkgs.fetchFromGitHub {
                 owner = "virchau13";
                 repo = "tree-sitter-astro";
-                rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f";
-                sha256 = "LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg=";
+                rev = "4be180759ec13651f72bacee65fa477c64222a1a";
+                sha256 = "qc9InFEQgeFfFReJuQd8WjTNK4fFMEaWcqQUcGxxuBI=";
               };
             };
           };
@@ -31,7 +31,6 @@
     tree-sitter-dot
     tree-sitter-elisp
     tree-sitter-glsl
-    tree-sitter-haskell
     tree-sitter-html
     tree-sitter-java
     tree-sitter-javascript
@@ -59,12 +58,11 @@
     tree-sitter-astro
     tree-sitter-vim
     tree-sitter-yaml
-    tree-sitter-zig
   ];
 
   custom-emacs =
     with newpkgs;
-    ((emacsPackagesFor (emacs30-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
+    ((emacsPackagesFor (emacs29-pgtk.override { withNativeCompilation = true; })).emacsWithPackages (epkgs: with epkgs; [
       avy
       better-jumper
       company
@@ -81,13 +79,11 @@
       fussy
       glsl-mode
       groovy-mode
-      haskell-ts-mode
       just-mode
       kotlin-mode
       lsp-mode
       lsp-treemacs
       lsp-ui
-      lsp-haskell
       lsp-java
       magit
       markdown-mode
@@ -108,7 +104,6 @@
       vertico
       which-key
       ws-butler
-      zig-ts-mode
     ]));
 in {
   home-manager.users.${config.main-user} = {
diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix
index 2c57f34..c93011f 100644
--- a/modules/user/dev-support.nix
+++ b/modules/user/dev-support.nix
@@ -6,9 +6,7 @@
     kotlin-language-server
     typescript-language-server
     astro-language-server
-    haskell-language-server
     glslls
-    zls
 
     bear
     gdb
diff --git a/modules/user/general.nix b/modules/user/general.nix
index b4f18f0..196d820 100644
--- a/modules/user/general.nix
+++ b/modules/user/general.nix
@@ -38,7 +38,6 @@
   programs.ssh = {
     enableAskPassword = true;
     askPassword = lib.getExe pkgs.lxqt.lxqt-openssh-askpass;
-    startAgent = true;
   };
 
   systemd = {
@@ -104,7 +103,6 @@
       ./modules/dolphin
       ./modules/firefox
       ./modules/element.nix
-      ./modules/keepassxc
       ./dev-support.nix
     ];
 
@@ -119,6 +117,7 @@
       curl
       cantata
       logseq
+      bitwarden
       lxqt.pavucontrol-qt
       helvum
       htop
diff --git a/modules/user/modules/firefox/default.nix b/modules/user/modules/firefox/default.nix
index 49f22e2..0120f51 100755
--- a/modules/user/modules/firefox/default.nix
+++ b/modules/user/modules/firefox/default.nix
@@ -220,7 +220,7 @@ in {
         settings = modules.general;
 
         extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [
-          keepassxc-browser
+          bitwarden
           darkreader
           github-reposize
           sidebery
@@ -251,7 +251,7 @@ in {
         settings = modules.trusted;
 
         extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [
-          keepassxc-browser
+          bitwarden
           darkreader
           github-reposize
           sidebery
@@ -268,7 +268,7 @@ in {
         settings = modules.trusted;
 
         extensions = with pkgs.nur.repos.rycee.firefox-addons; with extra-addons; [
-          keepassxc-browser
+          bitwarden
           darkreader
           github-reposize
           sidebery
diff --git a/modules/user/modules/keepassxc/default.nix b/modules/user/modules/keepassxc/default.nix
deleted file mode 100644
index 20b213c..0000000
--- a/modules/user/modules/keepassxc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ lib, pkgs, ... }: let
-  keepassxc = pkgs.keepassxc.overrideAttrs (prev: {
-    patches = prev.patches ++ [
-      (pkgs.fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/keepassxreboot/keepassxc/pull/11692.patch";
-        sha256 = "S/Oy4dAxER2NkoJQYAdsz5rphn5SW2TH50F//5Xmf+Y=";
-      })
-      (pkgs.fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/keepassxreboot/keepassxc/pull/11693.patch";
-        sha256 = "SV4DX/EzJBjFKvcw0TjTw6V5Xex/d5gc7oFa0JGGOts=";
-      })
-    ];
-  });
-in {
-  home.packages = [ keepassxc ];
-}
diff --git a/systems/msi/mcontrolcenter.nix b/systems/msi/mcontrolcenter.nix
index bf7cdae..a7e8aef 100644
--- a/systems/msi/mcontrolcenter.nix
+++ b/systems/msi/mcontrolcenter.nix
@@ -11,9 +11,8 @@
   systemd.user.services.mcontrolcenter = {
     description = "Launch mcontrolcenter";
     requires = [ "tray.target" ];
-    after = [ "tray.target" ];
+    after = [ "graphical-session-pre.target" "tray.target" ];
     partOf = [ "graphical-session.target" ];
-    wantedBy = [ "graphical-session.target" ];
     script = lib.getExe pkgs.mcontrolcenter;
   };
 }