diff --git a/de/home/.config/sway/config b/de/home/.config/sway/config
index 4d67203..96c7543 100644
--- a/de/home/.config/sway/config
+++ b/de/home/.config/sway/config
@@ -2,16 +2,16 @@
 # Import
 #
 
-xwayland enable
+#  xwayland enable
 
-exec "paplay $HOME/.config/sway/assets/sounds/login.ogg &"
+  exec "paplay $HOME/.config/sway/assets/sounds/login.ogg &"
 
 # Variables
-include $HOME/.config/sway/config-vars.d/*
-include $HOME/.config/de-vars/colors/blazer/sway
+  include $HOME/.config/sway/config-vars.d/*
+  include $HOME/.config/de-vars/colors/blazer/sway
 
 # Configs
-include $HOME/.config/sway/config.d/*
+  include $HOME/.config/sway/config.d/*
 
 #Misc
   exec "dbus-update-activation-environment --systemd --all"
diff --git a/de/home/.config/sway/scripts/autostart b/de/home/.config/sway/scripts/autostart
index 1386b3f..7a6632c 100755
--- a/de/home/.config/sway/scripts/autostart
+++ b/de/home/.config/sway/scripts/autostart
@@ -19,7 +19,7 @@ swayidle & \
 blueman-applet & \
 copyq --start-server & \
 /usr/lib/$(uname -m)-linux-gnu/libexec/polkit-kde-authentication-agent-1 & \
-udiskie -a & \
+udiskie -at & \
 
 for s in ~/.config/sway/scripts/autostart.d/* ;do
   if [ -f "$s" ];then
diff --git a/de/home/.config/waybar/config b/de/home/.config/waybar/config
index d88faf8..ef9def0 100644
--- a/de/home/.config/waybar/config
+++ b/de/home/.config/waybar/config
@@ -30,7 +30,7 @@
         "show-empty": false,
         "format-icons": ["", ""],
         "tooltip": true,
-        "tooltip-format": "{app}: {title}"
+        "tooltip-format": "{app}"
     },
 
 // Idle inhibitor
@@ -44,13 +44,11 @@
 
 // Tray icons
     "tray": {
-        // "icon-size": 21,
         "spacing": 15
     },
 
 // Clock
     "clock": {
-        // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}"
     },
@@ -78,7 +76,6 @@
 
 // Backlight
     "backlight": {
-        // "device": "acpi_video1",
         "format": "{percent}% {icon}",
         "format-icons": [""]
     },
@@ -94,24 +91,21 @@
         "format-charging": "{capacity}% ",
         "format-plugged": "{capacity}% ",
         "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
 
 // Networking
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": "{essid} ",
         "format-ethernet": "{essid} {ipaddr}/{cidr} 🖧",
         "tooltip-format": "{ifname} via {gwaddr}",
         "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-//        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "format-disconnected": "",
         "on-click": "nm-connection-editor"
     },
 
-// 
+// NM-VPN widget
     "custom/nmvpn": {
         "format": "{} {icon}",
         "return-type": "json",
@@ -134,13 +128,13 @@
 
 // Pulseaudio
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
+        "format": "{volume}% {icon}",
         "format-bluetooth": "{volume}% {icon} {format_source}",
         "format-bluetooth-muted": "🔇 {icon} {format_source}",
         "format-muted": "🔇 {format_source}",
         "format-source": "{volume}% ",
         "format-source-muted": "",
+        "tooltip-format": "{format_source}",
         "format-icons": {
             "headphone": "",
             "hands-free": "",
@@ -166,7 +160,7 @@
 
 //sway profile
     "custom/sway-profile": {
-      "format": "{}",
+      "format": " {} ",
       "exec": "/usr/bin/sp-profile-icon"
     }
 }