diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 78487f0..f790270 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -98,7 +98,7 @@ in {
     };
 
     nixpkgs.config.permittedInsecurePackages = [
-      "electron-12.2.3"
+      "electron-19.1.9"
     ];
 
     my.allowUnfreePackages = [
@@ -111,8 +111,9 @@ in {
     ];
 
     fonts = {
+      enableDefaultPackages = true;
       fontconfig.defaultFonts.monospace = ["FiraCode Nerd Font"];
-      fonts = with pkgs; [
+      packages = with pkgs; [
         (nerdfonts.override {fonts = ["FiraCode"];})
       ];
     };
diff --git a/modules/globalinstalls.nix b/modules/globalinstalls.nix
index aa2f826..cade379 100644
--- a/modules/globalinstalls.nix
+++ b/modules/globalinstalls.nix
@@ -14,7 +14,10 @@
       zsh.enable = true;
       htop.enable = true;
       iotop.enable = true;
-      nano.syntaxHighlight = true;
+      nano = {
+        enable = true;
+        syntaxHighlight = true;
+      };
       git = {
         enable = true;
         package = pkgs.gitFull;
diff --git a/modules/hardware/common-desktop.nix b/modules/hardware/common-desktop.nix
index a63aef9..a427d18 100644
--- a/modules/hardware/common-desktop.nix
+++ b/modules/hardware/common-desktop.nix
@@ -37,9 +37,6 @@ in {
 
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
-    hardware.bluetooth = {
-      enable = true;
-      package = pkgs.bluezFull;
-    };
+    hardware.bluetooth.enable = true;
   };
 }
diff --git a/modules/users/home-shared-modules.nix b/modules/users/home-shared-modules.nix
index b2bd91a..0ca565d 100644
--- a/modules/users/home-shared-modules.nix
+++ b/modules/users/home-shared-modules.nix
@@ -21,7 +21,7 @@
 
       zsh = {
         enable = true;
-        enableSyntaxHighlighting = true;
+        syntaxHighlighting.enable = true;
         enableAutosuggestions = true;
         enableVteIntegration = true;
       };
@@ -37,7 +37,7 @@
 
       gh = {
         enable = true;
-        enableGitCredentialHelper = true;
+        gitCredentialHelper.enable = true;
       };
     };
   }
diff --git a/modules/users/vinzenz-home.nix b/modules/users/vinzenz-home.nix
index 3c9e8a4..801fe53 100644
--- a/modules/users/vinzenz-home.nix
+++ b/modules/users/vinzenz-home.nix
@@ -153,7 +153,7 @@ in
           ];
         };
 
-        exa = {
+      eza = {
           enable = true;
           git = true;
           icons = true;