diff --git a/hosts/default/default.nix b/hosts/default/default.nix
index 5bcccb7..f659572 100644
--- a/hosts/default/default.nix
+++ b/hosts/default/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./system/default.nix
   ];
+
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/hosts/default/home/sway.nix b/hosts/default/home/sway.nix
index 2ed151a..8f07628 100644
--- a/hosts/default/home/sway.nix
+++ b/hosts/default/home/sway.nix
@@ -1,5 +1,11 @@
 {config, pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    grim
+    swaybg
+    slurp
+    dunst
+  ];
   wayland.windowManager.sway = {
     enable = true;
     xwayland = true;
@@ -18,7 +24,7 @@
       terminal = "alacritty";
       menu = "${pkgs.rofi}/bin/rofi -show drun -c .config/rofi/config.rasi";
       startup = [
-        {command = "${pkgs.swaybg}/bin/swaybg -i $HOME/.wp/gruvbox-dark-blue.png";}
+        {command = "${pkgs.swaybg}/bin/swaybg -i $HOME/.wp/gruvbox-dark-blue.png; ${pkgs.dunst}/bin/dunst";}
       ];
       bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];      
       gaps = {
@@ -75,10 +81,11 @@
         "${modifier}+Shift+8" = "move container to workspace number 8";
   	    "${modifier}+Shift+9" = "move container to workspace number 9";
 	
-	      # Audio
+	      # Media
         "XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
         "XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
-        "XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-volume toggle-mute";
+        "XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume toggle-mute";
+        
         "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
         "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
         "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
diff --git a/hosts/default/home/waybar.nix b/hosts/default/home/waybar.nix
index 441199f..cfdd9b8 100644
--- a/hosts/default/home/waybar.nix
+++ b/hosts/default/home/waybar.nix
@@ -29,7 +29,7 @@
       * {
 
         border: none;
-        font-family: JetBrainsMono Nerd Font, sans-serif;
+        font-family: Terminess Nerd Font, sans-serif;
         font-size: 14px;
       }
 
@@ -251,6 +251,7 @@
         };
 
         "clock" = {
+          interval = 1;
           tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
           format = " {:%H:%M:%S}";
           format-alt = " {:%A, %B %d, %Y}";
@@ -286,8 +287,9 @@
         };
 
         "network" = {
+          interval = 1;
           format-wifi = " {essid} {signalStrength}%";
-          format-ethernet = "{ifname}: {ipaddr}/{cidr} 󰈀 ";
+          format-ethernet = " {bandwidthUpBits} / {bandwidthDownBits}   | {ipaddr} 󰈀 ";
           format-linked = "{ifname} (No IP)  ";
           format-disconnected = "󰤮 Disconnected";
           on-click-release = "sleep 0";
@@ -295,6 +297,7 @@
         };
 
         "pulseaudio" = {
+          interval = 1;
           format = "{icon}{volume}% {format_source}";
           format-bluetooth = "{icon} {volume}%";
           format-bluetooth-muted = "   {volume}%";
@@ -308,8 +311,8 @@
             default = [" " " " "  "];
           };
           tooltip-format = "{desc} {volume}%";
-          on-click = "wpctl set-sink-mute @DEFAULT_SINK@ toggle";
-          on-click-right = "wpctl set-source-mute @DEFAULT_SOURCE@ toggle";
+          on-click = "${pkgs.wireplumber}/bin/wpctl set-sink-mute @DEFAULT_SINK@ toggle";
+          on-click-right = "${pkgs.wireplumber}/bin/pctl set-source-mute @DEFAULT_SOURCE@ toggle";
           on-click-middle = "${pkgs.pavucontrol}/bin/pavucontrol";
           on-click-release = "sleep 0";
           on-click-middle-release = "sleep 0";
diff --git a/hosts/default/system/default.nix b/hosts/default/system/default.nix
index 3452344..0e856e8 100644
--- a/hosts/default/system/default.nix
+++ b/hosts/default/system/default.nix
@@ -11,4 +11,18 @@
     ./firefox.nix
     ./pkgs.nix
   ];
+
+  xdg = {
+    portal = {
+      enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-gnome
+        xdg-desktop-portal-wlr
+        xdg-desktop-portal-gtk
+      ];
+    };
+  };
+  
+
 }
diff --git a/hosts/default/system/services.nix b/hosts/default/system/services.nix
index 50ecdfe..dbfd397 100644
--- a/hosts/default/system/services.nix
+++ b/hosts/default/system/services.nix
@@ -1,14 +1,11 @@
 { config, pkgs, ... }:
 {
+  
+
   services = {
     libinput = {
       enable = true;
     };
-    pipewire = {
-      enable = true;
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
     dbus.enable = true;
     mullvad-vpn = {
       enable = true;
@@ -17,4 +14,11 @@
     gnome.gnome-keyring.enable = true;
   };
   security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    wireplumber.enable = true;
+  };
 }
diff --git a/hosts/iridium/configuration.nix b/hosts/iridium/configuration.nix
index 2339993..34eb93c 100644
--- a/hosts/iridium/configuration.nix
+++ b/hosts/iridium/configuration.nix
@@ -55,13 +55,6 @@
     useXkbConfig = true;
   };
 
-  xdg.portal = {
-    enable = false;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-
   programs = {
     nix-ld.enable = true;
     dconf = {
diff --git a/hosts/meteor/configuration.nix b/hosts/meteor/configuration.nix
index 0a83efc..05ad95f 100644
--- a/hosts/meteor/configuration.nix
+++ b/hosts/meteor/configuration.nix
@@ -54,14 +54,7 @@
     font = "Lat2-Terminus16";
     useXkbConfig = true;
   };
-
-  xdg.portal = {
-    enable = false;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ];
-  };
-
+  
   programs = {
     nix-ld.enable = true;
     dconf = {