diff --git a/configurations/host/materusPC/kde.nix b/configurations/host/materusPC/kde.nix
index fada151..ae67ef8 100644
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/kde.nix
@@ -40,8 +40,8 @@ in
 
     };
   };
-  services.xserver.desktopManager.plasma6.enable = true;
-  services.xserver.desktopManager.plasma6.enableQt5Integration = true;
+  services.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enableQt5Integration = true;
   programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
   environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
 
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index 3dc9a6d..268cd2a 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -179,8 +179,6 @@
     };*/
 
   environment.systemPackages = with pkgs; [
-
-    firefox
     gamescope
     #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
     materusArg.pkgs.amdgpu-pro-libs.prefixes
diff --git a/configurations/profile/common/nixpkgs.nix b/configurations/profile/common/nixpkgs.nix
index 59a4436..bb400b6 100644
--- a/configurations/profile/common/nixpkgs.nix
+++ b/configurations/profile/common/nixpkgs.nix
@@ -17,7 +17,6 @@ in
   config.nixpkgs.config = lib.mkIf cfg.enable {
     allowUnfree = lib.mkDefault true;
     joypixels.acceptLicense = lib.mkDefault true;
-    firefox.enablePlasmaBrowserIntegration = true;
   };
   config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ];
 
diff --git a/configurations/profile/common/packages/default.nix b/configurations/profile/common/packages/default.nix
index ec23c2b..0601885 100644
--- a/configurations/profile/common/packages/default.nix
+++ b/configurations/profile/common/packages/default.nix
@@ -7,7 +7,11 @@ with materusArg.pkgs.lib;
 
   #Single Packages
   options.materus.profile.packages.home-manager = mkPrivateVar materusArg.cfg.configInputs.home-manager.packages.${pkgs.system}.home-manager;
-  options.materus.profile.packages.firefox = mkPrivateVar pkgs.firefox;
+  options.materus.profile.packages.firefox = mkPrivateVar (pkgs.firefox.override {
+    nativeMessagingHosts = [
+      pkgs.plasma-browser-integration
+    ];
+  });
 
   #Package Lists
   options.materus.profile.packages.list.nixRelated = mkPrivateVar (with pkgs; [
diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix
index 9368d85..762c069 100644
--- a/configurations/profile/home/shell/zsh.nix
+++ b/configurations/profile/home/shell/zsh.nix
@@ -60,8 +60,8 @@ in
 
     programs.zsh = {
       enable = true;
-      enableAutosuggestions = true;
-      enableSyntaxHighlighting = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
       enableVteIntegration = true;
       historySubstringSearch.enable = true;
       historySubstringSearch.searchUpKey = ";5A";
diff --git a/configurations/profile/os/fonts.nix b/configurations/profile/os/fonts.nix
index 4aab698..7364362 100644
--- a/configurations/profile/os/fonts.nix
+++ b/configurations/profile/os/fonts.nix
@@ -8,8 +8,8 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    fonts.fonts = packages.list.fonts ++ packages.list.moreFonts;
-    fonts.enableDefaultFonts = lib.mkDefault true;
+    fonts.packages = packages.list.fonts ++ packages.list.moreFonts;
+    fonts.enableDefaultPackages = lib.mkDefault true;
 
     fonts.fontconfig.enable = lib.mkDefault true;
     fonts.fontconfig.cache32Bit = lib.mkDefault true;