diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix
index 2b2dc67..4f53efa 100644
--- a/modules/home-manager/desktop/sway/default.nix
+++ b/modules/home-manager/desktop/sway/default.nix
@@ -186,7 +186,7 @@ in
           xdg-desktop-portal-wlr
           xdg-desktop-portal-gtk
         ];
-        xdgOpenUsePortal = false;
+        xdgOpenUsePortal = true;
         config = {
           sway = {
             default = [
diff --git a/modules/home-manager/desktop/sway/includes/files/waybar-style.css b/modules/home-manager/desktop/sway/includes/files/waybar-style.css
deleted file mode 100644
index ffc4be3..0000000
--- a/modules/home-manager/desktop/sway/includes/files/waybar-style.css
+++ /dev/null
@@ -1,119 +0,0 @@
-@define-color color-base-bg #323232;
-@define-color color-base-fg #ddd;
-
-@define-color color-hover #f268b3;
-@define-color color-selected #1cd180;
-
-@define-color color-ok #1cd180;
-@define-color color-warning #f2b768;
-@define-color color-critical #f268b3;
-
-* {
-    border: none;
-    border-radius: 0;
-    min-height:0;
-}
-
-window#waybar {
-    background: @color-base-bg ;
-    color: @color-base-fg;
-    font-family: "Fira Code Nerd Font";
-    font-size: 12px;
-}
-
-button,
-button:disabled,label:disabled{
-    color:inherit;
-}
-
-button:hover{
-    background:none;
-    box-shadow:inherit;
-    box-shadow:inherit;
-    text-shadow:inherit;
-    text-shadow:inherit;
-    border-top:none;
-}
-#workspaces {
-    color:#fff;
-}
-#workspaces button {
-    margin:0 3px;
-    padding:4px 4px;
-    color:#9c9c9c;
-    border-bottom: 1px solid transparent;
-}
-
-#workspaces button:hover {
-    box-shadow:inherit;
-    text-shadow:inherit;
-    color: @color-hover;
-    border-bottom: 1px solid @color-hover;
-}
-
-#workspaces button.focused {
-  background: @color-selected;
-  color: @color-base-bg;
-}
-#workspaces button.visible:not(.focused) {
-    color: @color-selected;
-    border-color: @color-selected;
-}
-
-#clock,
-#cpu,
-#memory,
-#backlight,
-#network,
-#tray,
-#mode,
-#battery,
-#idle_inhibitor {
-    padding: 2px 4px;
-    margin: 0;
-    background-color: transparent;
-}
-
-#mode{
-    background:@color-warning;
-    color: @color-base-bg;
-    font-weight:200;
-    font-variant: small-caps;
-    font-size: 16px;
-}
-#pulseaudio {}
-#pulseaudio.output.muted {
-    color:@color-critical;
-}
-#pulseaudio.input.source-muted {
-    color:@color-critical;
-}
-
-#battery.discharging {
-    color: @color-base-fg;
-    border-bottom: none;
-}
-
-#battery.charging, #battery.plugged {
-    border-bottom: 1px solid @color-ok;
-    color: @color-selected;
-}
-
-#battery.critical:not(.charging),
-#cpu.critical,
-#memory.critical{
-    border-color: @color-critical;
-    color: @color-critical;
-}
-
-#battery.warning:not(.charging),
-#cpu.warning,
-#memory.warning{
-    border-color: @color-warning;
-    color: @color-warning;
-}
-
-#tray {
-    font-family: "DejaVu sans";
-    font-size: 12px;
-}
diff --git a/modules/home-manager/desktop/sway/includes/waybar.nix b/modules/home-manager/desktop/sway/includes/waybar.nix
index f9c2e6a..d46baf1 100644
--- a/modules/home-manager/desktop/sway/includes/waybar.nix
+++ b/modules/home-manager/desktop/sway/includes/waybar.nix
@@ -48,8 +48,7 @@ in
               ]
             ) ++
           [
-            "pulseaudio#input"
-            "pulseaudio#output"
+            "pulseaudio"
             "custom/sep"
             "clock"
             "custom/sep"
@@ -89,31 +88,27 @@ in
             };
           };
           "network" = {
-            "format-alt" = "{ifname}: {ipaddr}/{cidr} 󰈀";
+            "format-alt" = "{ifname}: {ipaddr}/{cidr}";
             "format-disconnected" = "Disconnected ⚠ ";
-            "format-ethernet" = "{ifname} 󰈀";
-            "format-linked" = "{ifname} (No IP) 󰈀";
-            "format-wifi" = "{essid} ({signalStrength}%) ";
+            "format-ethernet" = "{ifname}: {ipaddr}/{cidr} 󰈀 ";
+            "format-linked" = "{ifname} (No IP) 󰈀 ";
+            "format-wifi" = "{essid} ({signalStrength}%)  ";
             "tooltip" = false;
           };
-          "pulseaudio#output" = {
-            "format" = "{volume}% {icon} ";
+          "pulseaudio" = {
+            "format" = "{format_source} {volume}% {icon} ";
             "format-bluetooth" = "{volume}% {icon}";
             "format-icons" = {
               "car" = "";
-              "default" = "󰕾";
+              "default" = "";
               "hands-free" = "󰋎";
               "headphone" = "󰋋";
               "headset" = "󰋎";
               "phone" = "";
               "portable" = "";
             };
-            "format-muted" = "󰖁 ";
-            "tooltip" = false;
-          };
-          "pulseaudio#input" = {
-            "format" = "{format_source} ";
-            "format-source" = "{volume}% ";
+            "format-muted" = "{format_source} 󰝟 ";
+            "format-source" = "{volume}%  ";
             "format-source-muted" = " ";
             "tooltip" = false;
           };
@@ -175,7 +170,121 @@ in
           };
         };
       };
-      style = builtins.readFile ./files/waybar-style.css;
+      style = ''
+        @define-color color-base-bg #323232;
+        @define-color color-base-fg #ddd;
+
+        @define-color color-hover #f268b3;
+        @define-color color-selected #1cd180;
+
+        @define-color color-ok #1cd180;
+        @define-color color-warning #f2b768;
+        @define-color color-critical #f268b3;
+
+        * {
+            border: none;
+            border-radius: 0;
+            min-height:0;
+        }
+
+        window#waybar {
+            background: @color-base-bg ;
+            color: @color-base-fg;
+            font-family: "Fira Code Nerd Font";
+            font-size: 12px;
+        }
+
+        button,
+        button:disabled,label:disabled{
+            color:inherit;
+        }
+
+        button:hover{
+            background:none;
+            box-shadow:inherit;
+            box-shadow:inherit;
+            text-shadow:inherit;
+            text-shadow:inherit;
+            border-top:none;
+        }
+        #workspaces {
+            color:#fff;
+        }
+        #workspaces button {
+            margin:0 3px;
+            padding:4px 4px;
+            color:#9c9c9c;
+            border-bottom: 1px solid transparent;
+        }
+
+        #workspaces button:hover {
+            box-shadow:inherit;
+            text-shadow:inherit;
+            color: @color-hover;
+            border-bottom: 1px solid @color-hover;
+        }
+
+        #workspaces button.focused {
+          background: @color-selected;
+          color: @color-base-bg;
+        }
+        #workspaces button.visible:not(.focused) {
+            color: @color-selected;
+            border-color: @color-selected;
+        }
+
+        #clock,
+        #cpu,
+        #memory,
+        #backlight,
+        #network,
+        #tray,
+        #mode,
+        #battery,
+        #idle_inhibitor {
+            padding: 2px 4px;
+            margin: 0;
+            background-color: transparent;
+        }
+
+        #mode{
+            background:@color-warning;
+            font-weight:bold;
+        }
+        #pulseaudio {}
+        #pulseaudio.muted {
+            color:@color-critical;
+        }
+
+        #battery.discharging {
+            color: @color-base-fg;
+            border-bottom: none;
+        }
+
+        #battery.charging, #battery.plugged {
+            border-bottom: 1px solid @color-ok;
+            color: @color-selected;
+        }
+
+        #battery.critical:not(.charging),
+        #cpu.critical,
+        #memory.critical{
+            border-color: @color-critical;
+            color: @color-critical;
+        }
+
+        #battery.warning:not(.charging),
+        #cpu.warning,
+        #memory.warning{
+            border-color: @color-warning;
+            color: @color-warning;
+        }
+
+        #tray {
+            font-family: "DejaVu sans";
+            font-size: 12px;
+        }
+      '';
     };
   };
 }