diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index a848099..bb84116 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -1,327 +1,320 @@
-# vim: ft=dosini
 [colors]
-	accent = #EDD080
-	bckgrd = #121212
-	select = #161A1B
+background = #00222
+background-alt = #444
+foreground = #dfdfdf
+foreground-alt = #555
+primary = #ffb52a
+secondary = #e60053
+alert = #bd2c40
 
-	background =            ${xrdb:color0:self.bckgrd}
-	background-alt = 		${self.select}
-	foreground =            ${xrdb:color6:#A5ffffff}
-	foreground-alt =        ${xrdb:color7:#222}
-    primary =               ${xrdb:color1:self.accent}
-	secondary =             ${xrdb:color2:#222}
-	alert =                 ${xrdb:color3:#bd2c40}
-	white = 			    #FFFFFF
-    grey =                  #AAAAAA
-	transparent = 			#00000000
+[bar/primary]
+width = 100%
+height = 20
+radius = 0
+fixed-center = false
+background = ${colors.background}
+foreground = ${colors.foreground}
+line-size = 3
+line-color = #f00
+border-size = 0
+border-color = #00000000
+padding-left = 0
+padding-right = 0
+module-margin-left = 1
+module-margin-right = 2
+font-0 = Go Mono:fontformat=truetype:size=8:antialias=true
+font-1 = unifont:fontformat=truetype:size=8:antialias=true
+font-2 = Siji:pixelsize=10
+font-3 = FontAwesome:pixelsize=8;0
+modules-left = i3 pulseaudio
+#modules-right = pulseaudio xbacklight filesystem xkeyboard memory cpu wlan battery temperature date powermenu
+modules-right = wlan eth cpu temperature battery date powermenu
+tray-position = none
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+cursor-click = pointer
+cursor-scroll = ns-resize
+
+[bar/secondary]
+monitor = "eDP-1"
+width = 100%
+height = 27
+radius = 10.0
+fixed-center = false
+background = ${colors.background}
+foreground = ${colors.foreground}
+line-size = 3
+line-color = #f00
+border-size = 4
+border-color = #00000000
+padding-left = 2
+padding-right = 2
+module-margin-left = 1
+module-margin-right = 2
+font-0 = Roboto Mono Nerd Font Complete Mono:fontformat=truetype:size=8:antialias=false
+font-1 = unifont:fontformat=truetype:size=8:antialias=false
+font-2 = siji:pixelsize=10
+modules-left = i3 mpd pulseaudio
+#modules-right = pulseaudio xbacklight filesystem xkeyboard memory cpu wlan battery temperature date powermenu
+modules-right = wlan eth cpu temperature battery date powermenu
+tray-position = right
+tray-padding = 2
+tray-background = #0063ff
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+cursor-click = pointer
+cursor-scroll = ns-resize
 
 
-[global/wm]
-	margin-top = 0
-	margin-bottom = 0
+[module/xwindow]
+type = internal/xwindow
+label = %title:0:30:...%
 
 
-[settings]
-	throttle-output = 5
-	throttle-output-for = 10
-	throttle-input-for = 30
-	screenchange-reload = true
-	bargapp= 10
-	barwidth = 100%
-	barheigh = 48
-
-
-[bar/main]
-	monitor-strict = true
-	fixed-center = true
-	dpi = 96
-	bottom = false
-	width = ${settings.barwidth}
-	height = ${settings.barheigh}
-	offset-x = 0
-	offset-y = 0
-	background = ${colors.background}
-	foreground = ${colors.foreground}
-	overline-size = 0
-	overline-color = #f00
-	underline-size = 2
-	underline-color = #00f
-	border-top-size = ${settings.bargapp}
-	border-left-size = ${settings.bargapp}
-	border-right-size = ${settings.bargapp}
-	border-bottom-size = 0
-	border-color = ${colors.transparent}
-	radius-top = 10
-	radius-bottom = 10
-	spacing = 2
-	padding-left = 2
-	padding-right = 2
-	module-margin-left = 2
-	module-margin-right = 2
-	font-0 = Monoid:size=12;4
-    font-1 = unifont:size=12;1
-    font-2 = FontAwesome:size=12;3
-    font-3 = NotoSans-Regular:size=12;-1
-    font-4 = MaterialIcons:size=16;5
-	tray-position = right
-	tray-padding = 4
-	modules-left = cast wlan
-    modules-center = mpd
-	modules-right = filesystem battery volume light date
-
-
-[bar/workspaces]
-	monitor-strict = true
-	dpi = 96
-	bottom = true
-    width = ${settings.barwidth}
-    height = 3
-	background = ${colors.transparent}
-	foreground = ${colors.foreground}
-	border-top-size = 0
-	border-bottom-size = 0
-	border-color = ${colors.transparent}
-	font-0 = Monoisome:size=10;4
-	font-1 = FontAwesome:pixelsize=10;3
-	font-5 = unifont:size=14;1
-	modules-center = i3 BSP
-
-
-[module/i3]
-	type = internal/i3
-	format = <label-state> <label-mode>
-	pin-workspaces = true
-	label-focused = %name%
-	label-focused-foreground= ${colors.background}
-	label-focused-background = ${colors.foreground}
-	label-focused-underline = ${colors.foreground}
-	label-focused-padding = 3
-	label-unfocused = %name%
-	label-unfocused-padding = 2
-	label-unfocused-background = ${colors.background}
-	label-urgent = %name%
-	label-urgent-foreground= ${colors.alert}
-	label-urgent-background = ${colors.background-alt}
-	label-urgent-padding = 2
-	label-empty = %name%
-	label-empty-background = ${colors.background-alt}
-	label-empty-padding = ${self.label-focused-padding}
-
-
-[module/mouseloc]
-	type = custom/script
-	exec = echo "X:" $(xdotool getmouselocation | awk '{print substr($2,3,4)}') "  Y:" $(xdotool getmouselocation | awk '{print substr($1,3,4)}')
-	interval = 0.1
-	label = %output%
-	format = <label>
-	format-foreground = ${colors.foreground}
-
-[module/mpd]
-    type = internal/mpd
-    host = 127.0.0.1
-    port = 6600
-    interval = 1
-    format-online = <icon-prev> <icon-stop> <toggle> <icon-next>  <icon-repeat> <icon-random>  <bar-progress> <label-time>  <label-song>
-    icon-play = 
-    icon-pause = 
-    icon-stop = 
-    icon-prev = 
-    icon-next = 
-    icon-random = 
-    icon-repeat = 
-    toggle-on-foreground =
-    toggle-off-foreground = #55
-    bar-progress-width = 30
-    bar-progress-format = %{A4:mpdseek+2: A5:mpdseek-2:}%fill%%indicator%%empty%%{A A}
-    bar-progress-indicator = |
-    bar-progress-indicator-foreground = #ff
-    bar-progress-indicator-font = 3
-    bar-progress-fill = —
-    bar-progress-fill-foreground = #bb
-    bar-progress-fill-font = 3
-    bar-progress-empty = —
-    bar-progress-empty-font = 3
-    bar-progress-empty-foreground = #44
-
-[module/title]
-	type = internal/xwindow
-	format = <label>
-	;format-foreground = ${colors.foreground}
-
-
-[module/search]
-	type = custom/script
-	exec = echo "   search:    "
-	interval = 60
-	label = %output%
-	format = <label>
-	format-foreground = ${colors.background}
-	format-background = ${colors.foreground}
-
-
-[module/cpu]
-	format-label = internal/cpu
-	format = <label>
-	type = internal/cpu
-	interval = 2
-	label = " %percentage%%"
-	format-foreground = ${colors.foreground}
-
-
-[module/memory]
-	type = internal/memory
-	interval = 2
-	label = " %percentage_used%%"
-	format-foreground = ${colors.foreground}
-
-
-[module/temperature]
-	type = internal/temperature
-	warn-temperature = 65
-
-	format = <label> 
-	format-warn = <label-warn>
-
-	label = %temperature%
-	label-warn = %temperature%!!!
-
-
-[module/cputemp]
-	type = custom/script
-	exec = sensors | grep --max-count=1 "CPU Temperature:" | awk '{print substr($0,22,2)}'
-	interval = 10
-	label = " %output%°C"
-	format-foreground = ${colors.foreground}
-
-
-[module/gputemp]
-	type = custom/script
-	exec = nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader,nounits
-	interval = 10
-	label = "GPU %output%°C"
-	format-foreground = ${colors.foreground}
-
-
-[module/wlan]
-	type = internal/network
-	interface = wlp2s0
-	interval = 3.0
-	format-connected = <label-connected>
-	label-connected =  %essid%     %signal%     %upspeed%     %downspeed%
-	label-disconnected = "%{A1:connman-gtk &:}%{A}"
-	label-disconnected-foreground = #5b
-	ramp-signal-0 = 
-	ramp-signal-1 = 
-	ramp-signal-2 = 
-	ramp-signal-3 = 
-	ramp-signal-4 = 
-	ramp-signal-foreground = ${colors.foreground}
-	format-connected-foreground = ${colors.foreground}
-
-
-[module/date]
-	type = internal/date
-	interval = 1.0
-	date = %a %b %d, 
-	time = %H:%M
-	date-alt = %A, %d %B %Y
-	time-alt = %H:%M:%S
-	label = %date% %time%
-	format = <label>
-	format-foreground = ${colors.foreground}
-
-
-[module/volume]
-	type = internal/volume
-	format-volume = <ramp-volume><label-volume>
-	format-muted = <label-muted>
-	format-volume-foreground = ${colors.foreground}
-	label-volume = %percentage%
-	label-muted =   M
-	label-muted-foreground = #aaa
-	ramp-volume-0 = 
-	ramp-volume-1 = 
-	ramp-volume-2 = 
-	ramp-headphones-0 = 
-
-
-[module/pomo]
-	type = custom/script
-	interval = 1
-	exec = pomo status | awk '{print substr($3,1,6)}' | grep -o '[0-9]\+' | sed 'N;s/\n/ : /'
-	label = "  %output%"
-	format-foreground = ${colors.foreground}
-
-
-[module/bresilla]
-	type = custom/script
-	interval = 1
-	exec = echo "BRESILLA"
-	label = "%output%"
-	click-left = firefox --new-tab "www.bresilla.com"
-	format-foreground = ${colors.foreground}
-
-
-[module/light]
-	type = internal/backlight
-	card = intel_backlight
-	enable-scroll = true
-	format = <label>
-	label =  %percentage%%
-	label-foreground = ${colors.foreground}
-
-
-[module/battery]
-	type = internal/battery
-	battery = BAT0
-	adapter = AC
-	full-at = 98
-	time-format = %H:%M
-	label-charging = %percentage%%
-	label-discharging = %percentage%%
-	format-charging = <animation-charging> <label-charging>
-	format-discharging = <animation-discharging> <label-discharging>
-	format-charging-foreground = ${colors.foreground}
-	label-charging-foreground = ${colors.foreground}
-	format-discharging-foreground = ${colors.foreground}
-	label-discharging-foreground = ${colors.foreground}
-	format-full-prefix = " "
-	format-full-prefix-foreground = ${colors.foreground}
-	label-full-foreground = ${colors.foreground}
-	animation-charging-0 = 
-	animation-charging-1 = 
-	animation-charging-2 = 
-	animation-charging-3 = 
-	animation-charging-4 = 
-	animation-charging-foreground = ${colors.foreground}
-	animation-charging-framerate = 500
-    animation-discharging-0 = 
-    animation-discharging-1 = 
-    animation-discharging-2 = 
-    animation-discharging-3 = 
-    animation-discharging-4 = 
-    animation-discharging-framerate = 1000
-	animation-discharging-foreground = ${colors.foreground}
-	click-left = bash ~/.startup -r
-
-
-[module/jgmenu]
-    type = custom/text
-    content-padding = 2
-    content = menu
-    click-left = "jgmenu_run >/dev/null 2>&1 &"
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-underline = ${colors.secondary}
+label-layout = %layout%
+label-layout-underline = ${colors.secondary}
+label-indicator-padding = 2
+label-indicator-margin = 1
+label-indicator-background = ${colors.secondary}
+label-indicator-underline = ${colors.secondary}
 
 [module/filesystem]
-    type = internal/fs
-    mount-0 = /
-    interval = 10
-    fixed-values = true
-    spacing = 4
-    format-mounted = <label-mounted>
-    format-unmounted = <label-unmounted>
-    label-mounted =   %percentage_used%%
-    label-mounted-foreground = ${colors.foreground}
-    label-unmounted = %mountpoint%: not mounted
-    label-unmounted-foreground = ${colors.foreground}
+type = internal/fs
+interval = 25
+mount-0 = /
+label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
+label-unmounted = %mountpoint% not mounted
+label-unmounted-foreground = ${colors.foreground-alt}
 
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+label-mode-padding = 2
+label-mode-foreground = #000
+label-mode-background = ${colors.primary}
+label-focused = %name%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 2
+label-unfocused = %name%
+label-unfocused-padding = 2
+label-visible = %name%
+label-visible-background = ${self.label-focused-background}
+label-visible-underline = ${self.label-focused-underline}
+label-visible-padding = ${self.label-focused-padding}
+label-urgent = %name%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
+strip-wsnumbers = false
 
+[module/xbacklight]
+type = internal/xbacklight
+format = <label> <bar>
+label = BL
+bar-width = 10
+bar-indicator = |
+bar-indicator-foreground = #fff
+bar-indicator-font = 2
+bar-fill = ─
+bar-fill-font = 2
+bar-fill-foreground = #9f78e1
+bar-empty = ─
+bar-empty-font = 2
+bar-empty-foreground = ${colors.foreground-alt}
+
+[module/backlight-acpi]
+inherit = module/xbacklight
+type = internal/backlight
+card = intel_backlight
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #f90000
+label = CPU %percentage:2%%
+
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = " "
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #4bffdc
+label = MEM %percentage_used%%
+
+[module/wlan]
+type = internal/network
+interface = wlp3s0
+interval = 3.0
+format-connected = <ramp-signal> <label-connected>
+format-connected-underline = #9f78e1
+label-connected = %essid%
+format-disconnected = <label-disconnected>
+format-disconnected-underline = ${self.format-connected-underline}
+;label-disconnected = %ifname% disconnected
+label-disconnected-foreground = ${colors.foreground-alt}
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+ramp-signal-foreground = ${colors.foreground-alt}
+
+[module/eth]
+type = internal/network
+interface = enp0s25
+interval = 3.0
+format-connected-underline = #55aa55
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+format-disconnected =
+
+[module/date]
+type = internal/date
+interval = 5
+date =
+date-alt = " %Y-%m-%d"
+time = %H:%M
+time-alt = %H:%M:%S
+format-prefix = 
+format-prefix-foreground = ${colors.foreground-alt}
+format-underline = #0a6cf5
+label = %date% %time%
+
+[module/pulseaudio]
+type = internal/pulseaudio
+format-volume = <label-volume> <bar-volume>
+label-volume = Volume %percentage%%
+label-volume-foreground = ${root.foreground}
+label-muted = muted
+label-muted-foreground = #666
+bar-volume-width = 10
+bar-volume-foreground-0 = #55aa55
+bar-volume-foreground-1 = #55aa55
+bar-volume-foreground-2 = #55aa55
+bar-volume-foreground-3 = #55aa55
+bar-volume-foreground-4 = #55aa55
+bar-volume-foreground-5 = #f5a70a
+bar-volume-foreground-6 = #ff5555
+bar-volume-gradient = true
+bar-volume-indicator = |
+bar-volume-indicator-font = 2
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
+sink = @DEFAULT_SINK@
+
+[module/alsa]
+type = internal/alsa
+format-volume = <label-volume> <bar-volume>
+label-volume = VOL
+label-volume-foreground = ${root.foreground}
+format-muted-prefix = " "
+format-muted-foreground = ${colors.foreground-alt}
+label-muted = sound muted
+bar-volume-width = 10
+bar-volume-foreground-0 = #55aa55
+bar-volume-foreground-1 = #55aa55
+bar-volume-foreground-2 = #55aa55
+bar-volume-foreground-3 = #55aa55
+bar-volume-foreground-4 = #55aa55
+bar-volume-foreground-5 = #f5a70a
+bar-volume-foreground-6 = #ff5555
+bar-volume-gradient = false
+bar-volume-indicator = |
+bar-volume-indicator-font = 2
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = AC
+full-at = 86
+format-charging = <animation-charging> <label-charging>
+format-charging-underline = #ffb52a
+format-discharging = <animation-discharging> <label-discharging>
+format-discharging-underline = ${self.format-charging-underline}
+format-full-prefix = " "
+format-full-prefix-foreground = ${colors.foreground-alt}
+format-full-underline = ${self.format-charging-underline}
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-foreground = ${colors.foreground-alt}
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-foreground = ${colors.foreground-alt}
+animation-charging-framerate = 750
+animation-discharging-0 = 
+animation-discharging-1 = 
+animation-discharging-2 = 
+animation-discharging-foreground = ${colors.foreground-alt}
+animation-discharging-framerate = 750
+
+[module/temperature]
+type = internal/temperature
+thermal-zone = 0
+warn-temperature = 60
+format = <ramp> <label>
+format-underline = #f50a4d
+format-warn = <ramp> <label-warn>
+format-warn-underline = ${self.format-underline}
+label = %temperature-f%
+label-warn = %temperature-f%
+label-warn-foreground = ${colors.secondary}
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-foreground = ${colors.foreground-alt}
+
+[module/powermenu]
+type = custom/menu
+expand-right = true
+format-spacing = 1
+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 poweroff
+menu-2-1 = cancel
+menu-2-1-exec = menu-open-0
+
+[settings]
+screenchange-reload = true
+;compositing-background = xor
+;compositing-background = screen
+compositing-foreground = source
+compositing-border = over
+pseudo-transparency = false
+
+[global/wm]
+margin-top = 0
+margin-bottom = 0