diff --git a/home/adam/home.nix b/home/adam/home.nix
index 2f5ce907..b6aa37c8 100644
--- a/home/adam/home.nix
+++ b/home/adam/home.nix
@@ -6,17 +6,16 @@
   config,
   pkgs,
   ...
-}:
-{
+}: {
   # You can import other home-manager modules here
   imports = [
     ../core/adam.nix
-    ../extra/adam.nix
+    ../extra
   ];
 
   nixpkgs = {
     # You can add overlays here
-    overlays = [ ];
+    overlays = [];
     # Configure your nixpkgs instance
     config = {
       # Disable if you don't want unfree packages
diff --git a/home/cnst/home.nix b/home/cnst/home.nix
index fcff5499..5ad4a009 100644
--- a/home/cnst/home.nix
+++ b/home/cnst/home.nix
@@ -6,17 +6,16 @@
   config,
   pkgs,
   ...
-}:
-{
+}: {
   # You can import other home-manager modules here
   imports = [
     ../core/cnst.nix
-    ../extra/cnst.nix
+    ../extra
   ];
 
   nixpkgs = {
     # You can add overlays here
-    overlays = [ ];
+    overlays = [];
     # Configure your nixpkgs instance
     config = {
       # Disable if you don't want unfree packages
diff --git a/home/extra/cnst.nix b/home/extra/adam-pkgs/default.nix
similarity index 83%
rename from home/extra/cnst.nix
rename to home/extra/adam-pkgs/default.nix
index a7888881..b8c0e4f2 100644
--- a/home/extra/cnst.nix
+++ b/home/extra/adam-pkgs/default.nix
@@ -1,36 +1,37 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./firefox
-    ./neovim
-    ./zellij
-  ];
+{pkgs, ...}: {
   home.packages = with pkgs; [
-    # Desktop
+    # APPLICATIONS
     alacritty
-    wl-clipboard
     keepassxc
+    qbittorrent
     ranger
     webcord
+    calcurse
     xfce.thunar
+
+    # UTILITY
+    wl-clipboard
     xfce.thunar-volman
     xfce.thunar-archive-plugin
     gnome.file-roller
-    wireguard-tools
-    wpa_supplicant
-    ntfs3g
-    kdePackages.polkit-kde-agent-1
-    networkmanagerapplet
-    htop
-    btop
     pamixer
+    pavucontrol
     virt-manager
-    qbittorrent
     fastfetch
     waybar
     nwg-look
     thefuck
-    calcurse
     gnome.adwaita-icon-theme
+
+    # NETWORK
+    wireguard-tools
+    networkmanagerapplet
+    wpa_supplicant
+
+    # SYSTEM
+    kdePackages.polkit-kde-agent-1
+    ntfs3g
+    btop
+    htop
   ];
 }
diff --git a/home/extra/adam.nix b/home/extra/adam.nix
index 5933766f..148bc144 100644
--- a/home/extra/adam.nix
+++ b/home/extra/adam.nix
@@ -1,35 +1,42 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   imports = [
     ./zellij
     ./firefox
     ./neovim
   ];
   home.packages = with pkgs; [
-    # Desktop
+    # APPLICATIONS
     alacritty
-    wl-clipboard
     keepassxc
+    qbittorrent
     ranger
     webcord
+    calcurse
     xfce.thunar
+
+    # UTILITY
+    wl-clipboard
     xfce.thunar-volman
     xfce.thunar-archive-plugin
     gnome.file-roller
-    wireguard-tools
-    wpa_supplicant
-    ntfs3g
-    kdePackages.polkit-kde-agent-1
-    networkmanagerapplet
-    htop
-    btop
     pamixer
-    qbittorrent
+    pwvucontrol
+    virt-manager
     fastfetch
     waybar
     nwg-look
     thefuck
-    calcurse
     gnome.adwaita-icon-theme
+
+    # NETWORK
+    wireguard-tools
+    networkmanagerapplet
+    wpa_supplicant
+
+    # SYSTEM
+    kdePackages.polkit-kde-agent-1
+    ntfs3g
+    btop
+    htop
   ];
 }
diff --git a/home/extra/cnst-pkgs/default.nix b/home/extra/cnst-pkgs/default.nix
new file mode 100644
index 00000000..b8c0e4f2
--- /dev/null
+++ b/home/extra/cnst-pkgs/default.nix
@@ -0,0 +1,37 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    # APPLICATIONS
+    alacritty
+    keepassxc
+    qbittorrent
+    ranger
+    webcord
+    calcurse
+    xfce.thunar
+
+    # UTILITY
+    wl-clipboard
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    gnome.file-roller
+    pamixer
+    pavucontrol
+    virt-manager
+    fastfetch
+    waybar
+    nwg-look
+    thefuck
+    gnome.adwaita-icon-theme
+
+    # NETWORK
+    wireguard-tools
+    networkmanagerapplet
+    wpa_supplicant
+
+    # SYSTEM
+    kdePackages.polkit-kde-agent-1
+    ntfs3g
+    btop
+    htop
+  ];
+}
diff --git a/home/extra/default.nix b/home/extra/default.nix
new file mode 100644
index 00000000..8e1662f5
--- /dev/null
+++ b/home/extra/default.nix
@@ -0,0 +1,16 @@
+{
+  home-manager = {
+    cnst.imports = [
+      ./firefox
+      ./neovim
+      ./zellij
+      ./cnst-pkgs
+    ];
+    adam.imports = [
+      ./firefox
+      ./neovim
+      ./zellij
+      ./adam-pkgs
+    ];
+  };
+}
diff --git a/hosts/hardware/adampad.nix b/hosts/hardware/adampad.nix
index 90d677db..b4a10175 100644
--- a/hosts/hardware/adampad.nix
+++ b/hosts/hardware/adampad.nix
@@ -4,13 +4,11 @@
   config,
   inputs,
   ...
-}:
-{
+}: {
   zramSwap.enable = true;
 
   security.rtkit.enable = true;
   hardware = {
-    pulseaudio.enable = false;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
diff --git a/hosts/hardware/cnix.nix b/hosts/hardware/cnix.nix
index 9ac15744..3fc02a75 100644
--- a/hosts/hardware/cnix.nix
+++ b/hosts/hardware/cnix.nix
@@ -4,16 +4,13 @@
   config,
   inputs,
   ...
-}:
-let
+}: let
   _nvtop = pkgs.nvtopPackages.amd;
-in
-{
+in {
   zramSwap.enable = true;
 
   security.rtkit.enable = true;
   hardware = {
-    pulseaudio.enable = false;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
diff --git a/hosts/services/adampad.nix b/hosts/services/adampad.nix
index 216a6037..f32b4890 100644
--- a/hosts/services/adampad.nix
+++ b/hosts/services/adampad.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   services = {
     dbus.packages = with pkgs; [
       gcr
@@ -38,7 +37,7 @@
       xkb = {
         extraLayouts.hhkbse = {
           description = "HHKBse by cnst";
-          languages = [ "se" ];
+          languages = ["se"];
           symbolsFile = /home/cnst/.nix-config/hosts/cnix/xkb/symbols/hhkbse;
         };
         layout = "hhkbse";
@@ -54,6 +53,7 @@
         support32Bit = true;
       };
       pulse.enable = true;
+      wireplumber.enable = true;
       #jack.enable = true;
       #media-session.enable = true;
     };
diff --git a/hosts/services/cnix.nix b/hosts/services/cnix.nix
index cc62ca48..a6a57b62 100644
--- a/hosts/services/cnix.nix
+++ b/hosts/services/cnix.nix
@@ -1,5 +1,4 @@
-{ pkgs, ... }:
-{
+{pkgs, ...}: {
   services = {
     dbus.packages = with pkgs; [
       gcr
@@ -38,7 +37,7 @@
       xkb = {
         extraLayouts.hhkbse = {
           description = "HHKBse by cnst";
-          languages = [ "se" ];
+          languages = ["se"];
           symbolsFile = /home/cnst/.nix-config/hosts/cnix/xkb/symbols/hhkbse;
         };
         layout = "hhkbse";
@@ -54,6 +53,7 @@
         support32Bit = true;
       };
       pulse.enable = true;
+      wireplumber.enable = true;
       #jack.enable = true;
       #media-session.enable = true;
     };