Moving stuff back to xprofile. Some more polybar prettying

polybar

@@ -14,8 +14,9 @@ background-alt = #444444
 ;foreground = ${xrdb:color7:#222}
 foreground = #ffffff
 foreground-alt = #aaaaaa
-primary = #ffb52a
+primary = #0a6cf5
 secondary = #e60053
+tertiary = #ffb52a
 alert = #bd2c40
 
 [bar/top]
@@ -86,22 +87,23 @@ label-unmounted-foreground = ${colors.foreground-alt}
 [module/workspace]
 type = internal/xworkspaces
 
-label-active = %icon% %name%
-label-active-background = ${colors.background-alt}
+label-active = %name%
+; label-active-background = ${colors.background-alt}
 label-active-foreground = ${colors.foreground}
 label-active-underline = ${colors.primary}
 label-active-padding = 2
 
-label-occupied = %index%
-label-occupied-padding = 2
+label-occupied = %name%
 label-occupied-foreground = ${colors.foreground}
+label-occupied-underline = ${colors.secondary}
+label-occupied-padding = 2
 
-label-urgent = %index%!
-label-urgent-background = ${colors.alert}
+label-urgent = %name%!
 label-urgent-foreground = ${colors.foreground}
+label-urgent-background = ${colors.alert}
 label-urgent-padding = 2
 
-label-empty = %index%
+label-empty = %name%
 label-empty-foreground = ${colors.foreground-alt}
 label-empty-padding = 2
 
@@ -176,15 +178,15 @@ format-disconnected =
 type = internal/date
 interval = 5
 
-date =
-date-alt = " %Y-%m-%d"
+date = " %Y-%m-%d"
+; date-alt = " %Y-%m-%d"
 
 time = %H:%M
-time-alt = %H:%M:%S
+; time-alt = %H:%M:%S
 
 format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #0a6cf5
+format-underline = #ffb52a
 
 label = %date% %time%