diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index e9b73cf..dfe8a19 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -10,11 +10,22 @@ eggplant = #3E2441
 red = #E01D4D
 white = #ebdbb2
 aqua = #689d6a
-orange = #fe8019
-leather = #C48E4E
-green = #99B465
 alert = #A54242
 disabled = #76573A
+color-1 = #C5A55C
+color-2 = #B43F1C
+color-3 = #D0C0AD
+color-4 = #88748F
+crystal-1 = #BA3320
+crystal-2 = #CDB648
+crystal-3 = #568125
+crystal-4 = #4048A4
+
+[fonts]
+
+font-0 = Font Awesome 5 Free:style=solid:size=13;3
+font-1 = FiraCode Nerd Font Mono:style=bold:size=13;3
+font-2 = JetBrainsMono Nerd Font Mono:style=bold:size=13;3
 
 [bar/primary]
 monitor = DP-0
@@ -31,8 +42,9 @@ foreground = ${colors.foreground}
 
 line-size = 3
 
-font-0 = FiraCode Nerd Font Mono:style=bold:size=13;3
-font-1 = JetBrainsMono Nerd Font Mono:style=bold:size=13;2
+font-0 = ${fonts.font-0}
+font-1 = ${fonts.font-1}
+font-2 = ${fonts.font-2}
 
 modules-left = bspwm xwindow
 modules-center = date
@@ -51,8 +63,9 @@ override-redirect = false
 background = ${colors.background}
 foreground = ${colors.foreground}
 
-font-0 = FiraCode Nerd Font Mono:style=bold:size=13;3
-font-1 = JetBrainsMono Nerd Font Mono:style=bold:size=13;2
+font-0 = ${fonts.font-0}
+font-1 = ${fonts.font-1}
+font-2 = ${fonts.font-2}
 
 modules-left = bspwm xwindow
 modules-center = date
@@ -63,19 +76,20 @@ type = internal/bspwm
 pin-workspaces = true
 enable-click = true
 
-ws-icon-0 = term;
+ws-icon-0 = term;
 ws-icon-1 = browser;
 ws-icon-2 = game;
-ws-icon-3 = code;
-ws-icon-4 = mail;
+ws-icon-3 = code;
+ws-icon-4 = mail;
 ws-icon-5 = browser2;
-ws-icon-6 = comm;
+ws-icon-6 = comm;
 ws-icon-7 = music;
 ws-icon-8 = server;
-ws-icon-9 = misc;
-ws-icon-10 = tmp;
+ws-icon-9 = misc;
+ws-icon-10 = tmp;
 
 format = <label-state>
+format-font = 1
 
 label-focused = %icon%
 label-focused-background = ${colors.eggplant}
@@ -101,45 +115,58 @@ type = internal/pulseaudio
 use-ui-max = false
 
 format-volume = <ramp-volume> <label-volume>
-label-volume = %percentage%%
-format-volume-foreground = ${colors.green}
+format-volume-foreground = ${colors.crystal-1}
 format-volume-padding = 2
-ramp-volume-0 = "奄"
-ramp-volume-1 = "奔"
-ramp-volume-2 = "墳"
+ramp-volume-0 = " "
+ramp-volume-1 = " "
+ramp-volume-2 = " "
+ramp-volume-font = 1
+label-volume = %percentage%%
+label-volume-font = 3
 
-label-muted = "婢"
-label-muted-foreground = ${colors.disabled}
 format-muted-padding = 2
+label-muted = ""
+label-muted-foreground = ${colors.disabled}
 
 click-middle = pavucontrol
 
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = " "
-label = %percentage:2%%
-format-foreground = ${colors.purple}
+
+format-foreground = ${colors.crystal-2}
 format-padding = 2
+format-prefix = " "
+format-prefix-font = 1
+label = %percentage:2%%
+label-font = 3
 
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
-label = %percentage_used:2%%
-format-foreground = ${colors.red}
+
+format-foreground = ${colors.crystal-3}
 format-padding = 2
+format-prefix = " "
+format-prefix-font = 1
+label = %percentage_used:2%%
+label-font = 3
 
 [network-base]
 type = internal/network
 interval = 5
+
 format-connected = <label-connected>
-format-disconnected = <label-disconnected>
-label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
-format-connected-foreground = ${colors.purple}
-format-disconnected-foreground = ${colors.disabled}
+format-connected-foreground = ${colors.crystal-4}
 format-connected-padding = 2
+format-connected-prefix-font = 1
+label-connected-font = 3
+
+format-disconnected = <label-disconnected>
+format-disconnected-foreground = ${colors.disabled}
 format-disconnected-padding = 2
+label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
+label-disconnected-font = 3
 
 [module/wlan]
 inherit = network-base
@@ -149,17 +176,20 @@ label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
 [module/eth]
 inherit = network-base
 interface-type = wired
-label-connected = " %local_ip%"
+
+format-connected-prefix = " "
+label-connected = "%local_ip%"
 
 [module/date]
 type = internal/date
 interval = 1
 
-date = %H:%M
-date-alt = %Y-%m-%d %H:%M:%S
+date-alt = %H:%M
+date = %Y-%m-%d %H:%M:%S
 
 label = %date%
 label-foreground = ${colors.primary}
+label-font = 3
 
 [settings]
 screenchange-reload = true