diff --git a/modules/home/programs/terminal/zellij/default.nix b/modules/home/programs/terminal/zellij/default.nix
index e37bff8e..0708749a 100644
--- a/modules/home/programs/terminal/zellij/default.nix
+++ b/modules/home/programs/terminal/zellij/default.nix
@@ -3,6 +3,7 @@
   programs.zellij = {
     enable = true;
     attachExistingSession = true;
+    enableZshIntegration = true;
   };
 
   home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = 
diff --git a/modules/system/users/main/default.nix b/modules/system/users/main/default.nix
index 9ae2a7b7..dee9152e 100644
--- a/modules/system/users/main/default.nix
+++ b/modules/system/users/main/default.nix
@@ -15,22 +15,23 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
     ];
     extraGroups = [
+      # Privilige
       "wheel"
 
+      # Devices
       "audio"
       "input"
       "render"
+      "rtkit"
       "video"
 
-      "dialout"
-      "disk"
-      "rtkit"
-
+      # Virtualization
+      "incus-admin"
       "kvm"
       "libvirtd"
       "qemu-libvirtd"
 
-      "incus-admin"
+      # Services
       "minecraft"
       "nfsShare"
       "nginx"