diff --git a/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix
index 37c23c8..5a9940b 100644
--- a/home-manager/programs/zsh.nix
+++ b/home-manager/programs/zsh.nix
@@ -2,8 +2,8 @@
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    enableAutosuggestions = true;
-    enableSyntaxHighlighting = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
     oh-my-zsh.enable = true;
     oh-my-zsh.theme = "gentoo";
   };
diff --git a/nixos/programs/thunar.nix b/nixos/programs/thunar.nix
index a013527..4e7cc2c 100644
--- a/nixos/programs/thunar.nix
+++ b/nixos/programs/thunar.nix
@@ -2,7 +2,7 @@
 {
   programs.thunar = {
     enable = true;
-    plugins = with pkgs.xfce; [
+    plugins = with pkgs; [
       thunar-archive-plugin
       thunar-volman
       thunar-vcs-plugin