diff --git a/i3wm/config.fc28 b/i3wm/config.fc28
index b292e94..e71f398 100644
--- a/i3wm/config.fc28
+++ b/i3wm/config.fc28
@@ -211,9 +211,13 @@ bindsym XF86AudioRaiseVolume exec amixer -q set Master 4%+ unmute
 bindsym XF86AudioLowerVolume exec amixer -q set Master 4%- unmute
 bindsym XF86AudioMute exec amixer -q set Master toggle
 
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
+# Screen brightness controls
+# `brightnessctl set [+]x%[-]`
+# xbacklight [ inc | dec ] x%
+# increase screen brightness
+bindsym XF86MonBrightnessUp exec brightnessctl set +10%
+# decrease screen brightness
+bindsym XF86MonBrightnessDown exec brightnessctl set 10%- 
 
 # Touchpad controls
 # bindsym XF85TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
diff --git a/polybar/config b/polybar/config
index f2d28b5..6709903 100644
--- a/polybar/config
+++ b/polybar/config
@@ -10,6 +10,7 @@
 [colors]
 ;background = ${xrdb:color0:#222}
 background = #222
+;background = #0222
 background-alt = #444
 ;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
@@ -28,7 +29,7 @@ width = 100%
 height = 27
 ;offset-x = 1%
 ;offset-y = 1%
-radius = 6.0
+;radius = 6.0
 fixed-center = false
 bottom=true
 
@@ -38,8 +39,9 @@ foreground = ${colors.foreground}
 line-size = 3
 line-color = #f00
 
-border-size = 4
-border-color = #00000000
+;border-size = 4
+border-size = 0
+border-color = #0888
 
 padding-left = 0
 padding-right = 2
@@ -61,12 +63,14 @@ font-6 = siji:pixelsize=9;1
 modules-left = bspwm i3 xwindow
 ;modules-left = i3
 modules-center = mpd
-modules-right = filesystem backlight volume xkeyboard memory cpu eth wg wlan battery temperature date powermenu
+modules-right = filesystem backlight volume xkeyboard memory cpu eth wlan wg temperature battery date powermenu
 
 tray-position = right
 tray-padding = 2
-tray-transparent = true
-tray-background = #0063ff
+;tray-transparent = true
+tray-transparent = false
+;tray-background = #0063ff
+tray-background = ${colors.background}
 
 ;wm-restack = bspwm
 wm-restack = i3
@@ -82,6 +86,10 @@ scroll-down = i3wm-wsprev
 cursor-click = pointer
 cursor-scroll = ns-resize
 
+;;;;;;;;;;;;;;;;
+; ;          ; ;
+; ; xwindow  ; ;
+; ;          ; ;
 [module/xwindow]
 type = internal/xwindow
 
@@ -204,8 +212,13 @@ label-song-ellipsis = true
 type = internal/backlight
 card = intel_backlight
 
-format = <label> <ramp> <bar>
-label = BL
+#format = <label> <ramp> <bar>
+format = <label> 
+label = %{A1:brightnessctl set 10%-:}%{A3:brightnessctl set +10%:}%{A5:brightnessctl set 10%-:}%{A4:brightnessctl set +10%:}%percentage%% %{A}%{A}%{A}%{A}
+
+format-prefix = "%{A1:brightnessctl set 10%-:}%{A5:brightnessctl set 10%-:}%{A3:brightnessctl set +10%:}%{A4:brightnessctl set +10%:}BL %{A}%{A}%{A}%{A}"
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #f90000
 
 bar-width = 5
 bar-indicator = |
@@ -227,6 +240,7 @@ bar-empty = ─
 ;bar-empty-font = 2
 bar-empty-foreground = ${colors.foreground-alt}
 
+
 [module/backlight-acpi]
 inherit = module/backlight
 type = internal/backlight
@@ -327,7 +341,7 @@ interval = 3.0
 
 format-connected = <ramp-signal> <label-connected>
 format-connected-underline = #9f78e1
-label-connected = %essid%
+label-connected = %signal%%: %essid% (%local_ip%) 
 
 ;format-disconnected = W:
 format-disconnected = <label-disconnected>
@@ -350,7 +364,7 @@ interval = 3.0
 format-connected-underline = #55aa55
 format-connected-prefix = " "
 format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
+label-connected = %local_ip% (%linkspeed%)
 
 ;format-disconnected = 
 format-disconnected = <label-disconnected>
@@ -361,6 +375,9 @@ label-disconnected-foreground = ${colors.foreground-alt}
 [module/wg]
 inherit = module/eth
 interface = wg0apk
+unknown-as-up = true
+label-connected = %local_ip% (U: %upspeed% D: %downspeed%)
+format-connected-underline = #aa5555
 
 [module/date]
 type = internal/date
@@ -417,10 +434,21 @@ label = %date% %time%
 [module/volume]
 type = internal/volume
 
-format-volume = <label-volume> <bar-volume>
-label-volume = VOL
+#format-volume = <ramp-volume> <label-volume> <bar-volume>
+format-volume =  <label-volume>
+
+format-volume-prefix-foreground = ${colors.foreground-alt}
+format-volume-underline = #f90000
+format-volume-prefix = "Vol "
+
+label-volume = %percentage%%
 label-volume-foreground = ${root.foreground}
 
+; Only applies if <ramp-volume> is used
+ramp-volume-0 = 🔈
+ramp-volume-1 = 🔉
+ramp-volume-2 = 🔊
+
 format-muted-prefix = " "
 format-muted-foreground = ${colors.foreground-alt}
 label-muted = sound muted