diff --git a/config/polybar/config.ini b/config/polybar/config.ini
index 6778431..83e1577 100644
--- a/config/polybar/config.ini
+++ b/config/polybar/config.ini
@@ -38,8 +38,8 @@ height = 40
 monitor = ${env:MONITOR:}
 
 font-0 = Roboto:pixelsize=13;1
-font-1 = Material Icons:pixelsize=15;4
-font-2 = Roboto Mono:pixelsize=13;1
+font-1 = Material Icons:pixelsize=15;3
+font-2 = MesloLGS NF:pixelsize=10;1
 
 separator = "|"
 separator-padding = 1
@@ -60,7 +60,7 @@ module-margin-left = 2
 
 modules-left = bspwm
 modules-center = title
-modules-right = phone-battery temperature memory cpu battery wlan eth date
+modules-right = phone-battery temperature memory cpu audio battery wireguard wlan eth date
 
 wm-restack = bspwm
 
diff --git a/config/polybar/modules/status b/config/polybar/modules/status
index d7db7ef..0602626 100644
--- a/config/polybar/modules/status
+++ b/config/polybar/modules/status
@@ -6,17 +6,23 @@ full-at = 100
 
 format-charging = <label-charging>
 
-format-discharging = <ramp-capacity> <label-discharging>
+format-discharging = <ramp-capacity>  <label-discharging>
 
-label-charging = %percentage%%
+label-charging =   %percentage%%
 
 label-discharging = %percentage%%
 
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-3 = 
-ramp-capacity-4 = 
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+ramp-capacity-5 = 
+ramp-capacity-6 = 
+ramp-capacity-7 = 
+ramp-capacity-8 = 
+ramp-capacity-9 = 
+ramp-capacity-10 = 
 
 [module/title]
 type = internal/xwindow
@@ -47,22 +53,31 @@ format-disconnected = <label-disconnected>
 
 label-disconnected = 
 
+[module/wireguard]
+type = custom/script
+
+exec = ~/.config/polybar/wireguard-is-connected.sh
+
+click-left = ~/.config/polybar/toggle-wireguard.sh
+
+interval = 5
+
 [module/eth]
 type = internal/network
 interface = enp34s0
 
 interval = 3.0
 
-label-connected =  %downspeed%
+label-connected =  %downspeed%
 
 format-connected = <label-connected>
 
-label-disconnected = 
+label-disconnected =  
 
 [module/phone-battery]
 type = custom/script
 
-exec = echo "$(mconnectctl show-battery /org/mconnect/device/0 | head -1 | awk '{print $2}')%"
+exec = echo " $(mconnectctl show-battery /org/mconnect/device/0 | head -1 | awk '{print $2}')%"
 
 exec-if = ~/.config/polybar/phone-is-connected.sh
 
@@ -78,4 +93,4 @@ date = %a %e %b
 
 label = %date% %time%
 
-format = <label>
+format =  <label>
diff --git a/config/polybar/modules/system b/config/polybar/modules/system
index 277221d..2b1050c 100644
--- a/config/polybar/modules/system
+++ b/config/polybar/modules/system
@@ -2,7 +2,8 @@
 type = internal/xbacklight
 
 format = <label> <bar>
-label = BL
+
+label = %percentage%
 
 bar-width = 10
 bar-indicator = |
@@ -15,13 +16,8 @@ bar-empty = ─
 bar-empty-font = 2
 bar-empty-foreground = ${colors.foreground-alt}
 
-[module/backlight-acpi]
-inherit = module/backlight
-type = internal/backlight
-card = intel_backlight
-
-[module/alsa]
-type = internal/alsa
+[module/audio]
+type = internal/pulseaudio
 
 format-muted = 
 
@@ -44,6 +40,8 @@ bar-volume-fill-font = 1
 bar-volume-empty = ─
 bar-volume-empty-font = 1
 
+click-right = pavucontrol
+
 [module/cpu]
 type = internal/cpu
 interval = 2
diff --git a/config/polybar/toggle-wireguard.sh b/config/polybar/toggle-wireguard.sh
new file mode 100755
index 0000000..4ec5cd9
--- /dev/null
+++ b/config/polybar/toggle-wireguard.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+connection="wg0"
+connected="$(nmcli -f GENERAL.STATE con show $connection | awk '{print $2}')"
+
+if [[ $connected == "activated" ]]; then
+		nmcli connection down $connection
+else
+		nmcli connection up $connection
+fi
diff --git a/config/polybar/wireguard-is-connected.sh b/config/polybar/wireguard-is-connected.sh
new file mode 100755
index 0000000..19fa707
--- /dev/null
+++ b/config/polybar/wireguard-is-connected.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+connection="wg0"
+connected="$(nmcli -f GENERAL.STATE con show $connection | awk '{print $2}')"
+
+if [[ $connected == "activated" ]]; then
+		echo ""
+else
+		echo ""
+fi