diff --git a/flake.lock b/flake.lock
index e10acab..51907f8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -686,6 +686,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1756578978,
@@ -1170,9 +1186,7 @@
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1756876659,
diff --git a/flake.nix b/flake.nix
index c659d4f..60e9853 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,10 +41,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    zen-browser = {
-      url = "github:0xc000022070/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
 
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
diff --git a/modules/home/application/matrix/default.nix b/modules/home/application/matrix/default.nix
index 867a94f..1a33a0c 100644
--- a/modules/home/application/matrix/default.nix
+++ b/modules/home/application/matrix/default.nix
@@ -10,10 +10,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [ fractal element-desktop ];
-
-    programs.element-desktop = {
-      enable = true;
-    };
+    home.packages = with pkgs; [ fractal ];
   };
 }
diff --git a/modules/home/application/zen/default.nix b/modules/home/application/zen/default.nix
index b7cec03..4995216 100644
--- a/modules/home/application/zen/default.nix
+++ b/modules/home/application/zen/default.nix
@@ -19,8 +19,6 @@ in
     };
 
     programs.zen-browser = {
-      enable = true;
-
       policies = {
         AutofillAddressEnabled = true;
         AutofillCreditCardEnabled = false;
diff --git a/modules/home/desktop/plasma/default.nix b/modules/home/desktop/plasma/default.nix
index 0b679a0..13476fb 100644
--- a/modules/home/desktop/plasma/default.nix
+++ b/modules/home/desktop/plasma/default.nix
@@ -64,7 +64,7 @@ in
         };
 
         kwalletrc = {
-          Wallet.Enabled = true;
+          Wallet.Enabled = false;
         };
 
         plasmarc = {
diff --git a/modules/nixos/home-manager/default.nix b/modules/nixos/home-manager/default.nix
index d147d46..1a5a964 100644
--- a/modules/nixos/home-manager/default.nix
+++ b/modules/nixos/home-manager/default.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
   config = {
-    home-manager.backupFileExtension = "homeManagerBackup";
+    home-manager.backupFileExtension = "back";
   };
 }
diff --git a/modules/nixos/services/backup/borg/default.nix b/modules/nixos/services/backup/borg/default.nix
deleted file mode 100644
index fbe5235..0000000
--- a/modules/nixos/services/backup/borg/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, pkgs, namespace, ... }:
-let
-  inherit (lib) mkIf mkEnableOption;
-
-  cfg = config.${namespace}.services.backup.borg;
-in
-{
-  options.${namespace}.services.backup.borg = {
-    enable = mkEnableOption "Borg Backup";
-  };
-
-  config = mkIf cfg.enable {
-    services = {
-      borgbackup.jobs = {
-        media = {
-          paths = "/var/media/test";
-          encryption.mode = "none";
-          environment.BORG_SSH = "ssh -i /home/chris/.ssh/id_ed25519 -4";
-          repo = "ssh://chris@beheer.hazelhof.nl:222/home/chris/backups/media";
-          compression = "auto,zstd";
-          startAt = "daily";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/nixos/services/communication/matrix/default.nix b/modules/nixos/services/communication/conduit/default.nix
similarity index 72%
rename from modules/nixos/services/communication/matrix/default.nix
rename to modules/nixos/services/communication/conduit/default.nix
index a93d7c8..3e909ff 100644
--- a/modules/nixos/services/communication/matrix/default.nix
+++ b/modules/nixos/services/communication/conduit/default.nix
@@ -3,7 +3,7 @@ let
   inherit (builtins) toString toJSON;
   inherit (lib) mkIf mkEnableOption;
 
-  cfg = config.${namespace}.services.communication.matrix;
+  cfg = config.${namespace}.services.communication.conduit;
 
   domain = "kruining.eu";
   fqn = "matrix.${domain}";
@@ -12,24 +12,43 @@ let
   database = "synapse";
 in
 {
-  options.${namespace}.services.communication.matrix = {
-    enable = mkEnableOption "Matrix server (Synapse)";
+  options.${namespace}.services.communication.conduit = {
+    enable = mkEnableOption "conduit (Matrix server)";
   };
 
   config = mkIf cfg.enable {
-    ${namespace}.services = {
-      persistance.postgresql.enable = true;
-      # virtualisation.podman.enable = true;
-    };
+    # ${namespace}.services = {
+    #   persistance.postgresql.enable = true;
+    #   virtualisation.podman.enable = true;
+    # };
 
-    networking.firewall.allowedTCPPorts = [ 4001 ];
+    networking.firewall.allowedTCPPorts = [ 4001 8448 ];
 
     services = {
+      matrix-conduit = {
+        enable = false;
+
+        settings.global = {
+          address = "::";
+          port = port;
+
+          server_name = domain;
+
+          database_backend = "rocksdb";
+          # database_path = "/var/lib/matrix-conduit/";
+
+          allow_check_for_updates = false;
+          allow_registration = false;
+
+          enable_lightning_bolt = false;
+        };
+      };
+
       matrix-synapse = {
         enable = true;
 
         extras = [ "oidc" ];
-        # plugins = with config.services.matrix-synapse.package.plugins; [];
+        plugins = with config.services.matrix-synapse.package.plugins; [];
 
         settings = {
           server_name = domain;
@@ -37,32 +56,10 @@ in
 
           enable_registration = false;
           registration_shared_secret = "tZtBnlhEmLbMwF0lQ112VH1Rl5MkZzYH9suI4pEoPXzk6nWUB8FJF4eEnwLkbstz";
-
+          
           url_preview_enabled = true;
           precence.enabled = true;
 
-          sso = {
-            client_whitelist = [ "http://[::1]:9092" ];
-            update_profile_information = true;
-          };
-
-          oidc_providers = [
-            {
-              discover = true;
-
-              idp_id = "zitadel";
-              idp_name = "Zitadel";
-              issuer = "https://auth.amarth.cloud";
-              client_id = "337858153251143939";
-              client_secret = "ePkf5n8BxGD5DF7t1eNThTL0g6PVBO5A1RC0EqPp61S7VsiyXvDs8aJeczrpCpsH";
-              scopes = [ "openid" "profile" ];
-              # user_mapping_provider.config = {
-              #   localpart_template = "{{ user.prefered_username }}";
-              #   display_name_template = "{{ user.name }}";
-              # };
-            }
-          ];
-
           database = {
             # this is postgresql (also the default, but I prefer to be explicit)
             name = "psycopg2";
@@ -98,7 +95,7 @@ in
         settings = {
           appservice = {
             provisioning.enabled = false;
-            # port = 40011;
+            port = 40011;
           };
 
           homeserver = {
@@ -121,7 +118,7 @@ in
         settings = {
           appservice = {
             provisioning.enabled = false;
-            # port = 40012;
+            port = 40012;
           };
 
           homeserver = {
diff --git a/systems/x86_64-linux/ulmo/default.nix b/systems/x86_64-linux/ulmo/default.nix
index 4d1c4ab..3b35750 100644
--- a/systems/x86_64-linux/ulmo/default.nix
+++ b/systems/x86_64-linux/ulmo/default.nix
@@ -10,7 +10,7 @@
       authentication.authelia.enable = true;
       authentication.zitadel.enable = true;
 
-      communication.matrix.enable = true;
+      communication.conduit.enable = true;
 
       development.forgejo.enable = true;