diff --git a/polybar/.config/polybar/config.ini b/polybar/.config/polybar/config.ini
index ee724c2..8f8ecff 100644
--- a/polybar/.config/polybar/config.ini
+++ b/polybar/.config/polybar/config.ini
@@ -17,18 +17,15 @@
 ;==========================================================
 
 [colors]
-#background = #1E1E2E
-background = #11111b
+background = #1e1e2e
 background-alt = #313244
 foreground = #cdd6f4
-#primary = #89b4fc
-#primary-underline = #1e66f5
-primary = #fab387
-primary-underline = #fe640b
+primary =   #f5e0dc
+primary-underline = #dc8a78
 secondary = #a6e3a1
 secondary-underline = #40a02b
 alert = #f38ba8
-disabled = #707880
+disabled = #939ab7
 
 [bar/base]
 width = 100%
@@ -50,7 +47,7 @@ module-margin = 1
 #separator = |
 separator-foreground = ${colors.disabled}
 
-font-0 = JetBrains Mono Nerd Font Mono:size=14;2
+font-0 = JetBrains Mono Nerd Font Mono:size=13:weight=bold;3
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 font-3 = "Arimo:pixelsize=12;0"
@@ -59,15 +56,16 @@ cursor-scroll = ns-resize
 enable-ipc = true
 
 [bar/workspaces]
-width = 350
+width = 370
 inherit = bar/base
-modules-left = xworkspaces-roleless
+modules-center = xworkspaces-roleless
 
 [bar/top]
 width = 500
 offset-x = 100%:-500
 inherit = bar/base
-modules-left = date eth wlan
+modules-left = date
+modules-right = eth wlan
 
 [bar/bottom]
 inherit = bar/base
@@ -78,64 +76,63 @@ modules-center = xwindow
 modules-right = filesystem memory cpu
 
 padding-left = 0
-padding-right = 0
+padding-right = 1
 
 [section/prefixed-module]
-format-prefix-background = ${colors.primary}
-format-prefix-underline = ${colors.primary-underline}
+format-prefix-background = ${colors.primary-underline}
 format-prefix-foreground = ${colors.background}
 format-prefix-padding = 1
+format-prefix-margin = 1
 format-prefix-alignment = center
 
 [section/decorated-module]
-format-prefix-background = ${colors.primary}
-format-prefix-underline = ${colors.primary-underline}
-format-prefix-foreground = ${colors.background}
+
+format-prefix-background = ${colors.primary-underline}
 format-prefix-padding = 1
-format-prefix-alignment = center
+format-background = ${colors.primary}
+format-foreground = ${colors.background}
+format-padding = 0
+format-margin = 1
+format-alignment = center
+label-padding = 1
 
-[module/xworkspaces-roleless]
+[module/workspaces]
 type = internal/xworkspaces
-inherit = section/prefixed-module
-
+inherit = section/decorated-module
 format-prefix = 󰍹
 
-label-active = 
-label-active-background = ${colors.background-alt}
+label-active-background = ${colors.primary}
 label-active-padding = 1
 
-label-occupied = 
+label-occupied-background = ${colors.primary}
 label-occupied-padding = 1
 
-label-urgent = 󰗖
 label-urgent-background = ${colors.alert}
 label-urgent-padding = 1
 
-label-empty = 
-label-empty-foreground = ${colors.disabled}
+label-empty-background = ${colors.primary}
 label-empty-padding = 1
 
-[module/xworkspaces-role]
+[module/xworkspaces-roleless]
+
 type = internal/xworkspaces
+inherit = module/workspaces
 
-inherit = section/prefixed-module
-format-prefix = 󰍹
+label-active = 
+label-occupied = 
+label-urgent = 󰗖
+label-empty = 
 
-label-active = %icon%
-label-active-background = ${colors.background-alt}
-label-active-underline= ${colors.primary}
-label-active-padding = 1
+[module/xworkspaces-role]
+type = internal/xworkspaces
+inherit = module/workspaces
 
+label-active = %icon%
+label-active-underline = ${colors.primary-underline}
 label-occupied = %icon%
-label-occupied-padding = 1
-
 label-urgent = %icon%
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 1
-
-label-empty = %icon%
 label-empty-foreground = ${colors.disabled}
-label-empty-padding = 1
+label-empty = %icon%
 
 icon-0 = 0;
 icon-1 = 1;爵
@@ -158,42 +155,67 @@ interval = 25
 
 
 format-mounted-prefix = 󰋊
-format-mounted-prefix-background = ${colors.primary}
-format-mounted-prefix-underline = ${colors.primary-underline}
+format-mounted-prefix-background = ${colors.primary-underline}
 format-mounted-prefix-foreground = ${colors.background}
 format-mounted-prefix-padding = 1
 format-mounted-prefix-alignment = center
+format-mounted-background = ${colors.primary}
+format-mounted-foreground = ${colors.background}
 
 mount-0 = /
-label-mounted = %{F#40a02b}%mountpoint%%{F-} %percentage_used%%
+label-mounted = %mountpoint% %percentage_used%%
 label-unmounted = %mountpoint% not mounted
 label-unmounted-foreground = ${colors.disabled}
 label-mounted-padding = 1
 
 [module/pulseaudio]
 type = internal/pulseaudio
-format-volume-prefix = 
-format-volume-prefix-background = ${colors.primary}
-format-volume-prefix-underline = ${colors.primary-underline}
-format-volume-prefix-foreground = ${colors.background}
-format-volume-prefix-padding = 1
-format-volume-prefix-alignment = center
 
-#format-volume-prefix = "VOL "
-#format-volume-prefix-foreground = ${colors.primary}
+use-ui-max = false
 
-format-volume = <label-volume>
+interval = 5
 
-label-volume = %percentage%%
-label-volume-padding = 1
+format-volume-prefix = 
+format-muted-prefix = 
+format-volume-prefix-background = ${colors.primary-underline}
+format-muted-prefix-background = ${colors.primary-underline}
+format-volume-prefix-padding = 1
+format-muted-prefix-padding = 1
+format-volume-background = ${colors.primary}
+format-muted-background = ${colors.primary}
+format-volume-foreground = ${colors.background}
+format-muted-foreground = ${colors.background}
+format-volume-alignment = center
+
+format-volume = <bar-volume>
+
+bar-volume-width = 12
+bar-volume-padding = 1
+bar-volume-foreground-0 = #40a02b
+bar-volume-foreground-1 = #40a02b
+bar-volume-foreground-2 = #40a02b
+bar-volume-foreground-3 = #40a02b
+bar-volume-foreground-4 = #40a02b
+bar-volume-foreground-5 = #df8e1d
+bar-volume-foreground-6 = #d20f39
+bar-volume-gradient = true
+bar-volume-indicator = │
+bar-volume-indicator-font = 2
+bar-volume-indicator-foreground = #000000
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.background}
+
+label-muted-padding = 1
 label-muted = muted
-label-muted-foreground = ${colors.disabled}
 
 [module/backlight]
 type = internal/xbacklight
 
-inherit = section/prefixed-module
-format-prefix = 
+inherit = section/decorated-module
+format-prefix = " "
 format = <ramp>
 
 ; Available tokens:
@@ -222,54 +244,80 @@ label-indicator-background = ${colors.secondary}
 
 [module/memory]
 type = internal/memory
+inherit = section/decorated-module
 interval = 2
-format-prefix = 
-inherit = section/prefixed-module
-label-padding = 1
-label = %percentage_used:2%%
+format-prefix = ""
+format = <ramp-used>
+
+ramp-used-padding = 1
+ramp-used-0 = ▁
+ramp-used-1 = ▂
+ramp-used-2 = ▃
+ramp-used-3 = ▄
+ramp-used-4 = ▅
+ramp-used-5 = ▆
+ramp-used-6 = ▇
+ramp-used-7 = █
 
 [module/cpu]
 type = internal/cpu
 interval = 2
-inherit = section/prefixed-module
-format-prefix = 󰍛
-label = %percentage:2%%
-label-padding = 1
+inherit = section/decorated-module
+format-prefix = "󰍛"
+format = <ramp-load>
+label = %percentage:2%
+
+ramp-load-padding = 1
+ramp-load-spacing = 1
+ramp-load-0 = ▁
+ramp-load-1 = ▂
+ramp-load-2 = ▃
+ramp-load-3 = ▄
+ramp-load-4 = ▅
+ramp-load-5 = ▆
+ramp-load-6 = ▇
+ramp-load-7 = █
 
 [network-base]
 type = internal/network
 interval = 5
 
 format-connected-prefix = 󰀂
-format-connected-prefix-background = ${colors.primary}
-format-connected-prefix-underline = ${colors.primary-underline}
+format-connected-prefix-background = ${colors.primary-underline}
 format-connected-prefix-foreground = ${colors.background}
 format-connected-prefix-padding = 1
 format-connected-prefix-alignment = center
 
-format-connected = <label-connected>
+format-connected-background = ${colors.primary}
+format-connected-foreground = ${colors.background}
+format-connected-margin = 1
 label-connected-padding = 1
+label-disconnected-padding = 1
+
+format-connected = <label-connected>
 
 format-disconnected-prefix = 󰯡
 format-disconnected = <label-disconnected>
-label-disconnected = %{F#a6e3a1}%ifname%%{F#707880} disconnected
+label-disconnected = ifname disconnected
 
 [module/wlan]
 inherit = network-base
+format-connected-prefix = 󰖩
 interface-type = wireless
-label-connected = %{F#a6e3a1}%essid%%{F-} %local_ip%
+label-connected = %essid%
 
 [module/eth]
 inherit = network-base
+format-connected-prefix = 󰈀
 interface-type = wired
 interface = enp1s0
-label-connected = %{F#a6e3a1}%local_ip%%{F-}
+label-connected = %local_ip%
 
 [module/date]
 type = internal/date
 interval = 1
-inherit = section/prefixed-module
-format-prefix = 󰥔
+inherit = section/decorated-module
+format-prefix = ""
 
 format = <label>
 
@@ -277,37 +325,6 @@ date = %OI:%M %p
 date-alt = %m-%d-%Y
 
 label = %date%
-label-padding = 1
-
-[module/powermenu]
-type = custom/menu
-
-expand-right = true
-
-format-spacing = 1
-
-#label-open = 
-label-open = ⏻
-label-open-foreground = ${colors.secondary}
-label-close =  cancel
-label-close-foreground = ${colors.secondary}
-#label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 = reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 = power off
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo shutdown now
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
 
 [settings]
 screenchange-reload = true
diff --git a/polybar/.config/polybar/launch.sh b/polybar/.config/polybar/launch.sh
index 1229cc1..fc6aa2c 100755
--- a/polybar/.config/polybar/launch.sh
+++ b/polybar/.config/polybar/launch.sh
@@ -13,7 +13,7 @@ bar() {
   if test -z "$RELOAD"; then
     polybar -c "$HOME/.config/polybar/config.ini" "$@" &
   else
-    polybar -r -c "$HOME/.config/polybar/config.ini" "$@" &
+    polybar -r -c "$HOME/.config/polybar/config.ini" -l warning "$@" &
   fi
 }
 
diff --git a/wm/.config/berry/autostart b/wm/.config/berry/autostart
index bddb652..6f2b4ef 100755
--- a/wm/.config/berry/autostart
+++ b/wm/.config/berry/autostart
@@ -23,7 +23,7 @@ berryc focus_color         292D3E
 berryc unfocus_color       292D3E
 
 #berryc inner_focus_color     89b4fa
-berryc inner_focus_color     fab387
+berryc inner_focus_color     dc8a78
 berryc inner_unfocus_color   585b70
 
 berryc text_focus_color    cdd6f4
diff --git a/wm/.config/picom/picom.conf b/wm/.config/picom/picom.conf
index 378f96f..b9ff3b0 100644
--- a/wm/.config/picom/picom.conf
+++ b/wm/.config/picom/picom.conf
@@ -4,7 +4,7 @@ fade-in-step = 1.0
 fade-out-step = 1.0
 
 corner-radius = 10
-
+vsync = false
 backend = "glx"
 
 opacity-rule = [