diff --git a/dot_config/hypr/hypridle.conf b/dot_config/hypr/hypridle.conf
new file mode 100644
index 0000000..9857209
--- /dev/null
+++ b/dot_config/hypr/hypridle.conf
@@ -0,0 +1,15 @@
+general {
+    lock_cmd = systemctl --user start hyprlock
+    before_sleep_cmd = loginctl lock-session    # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
+}
+
+listener {
+    timeout = 300
+    on-timeout = loginctl lock-session
+}
+
+listener {
+    timeout = 600
+    on-timeout = systemctl suspend
+}
diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf
index 51c5d1f..793ef45 100644
--- a/dot_config/hypr/hyprland.conf
+++ b/dot_config/hypr/hyprland.conf
@@ -43,6 +43,23 @@ $faded_purple = 0xff8f3f71
 $faded_aqua = 0xff427b58
 $faded_orange = 0xffaf3a03
 
+# load plugins
+exec-once = hyprpm reload -n
+
+debug {
+    # enable_stdout_logs = true
+}
+
+device {
+    name = tpps/2-elan-trackpoint
+    sensitivity = -0.4
+}
+
+device {
+    name = syna88022:00-06cb:ce67-touchpad
+    enabled = false
+}
+
 input {
     kb_file=
     kb_layout=us
@@ -62,45 +79,51 @@ input {
 }
 
 general {
-    main_mod=SUPER
-    layout = master
+    layout = dwindle
 
     gaps_in=5
     gaps_out=5
     border_size=3
     col.active_border=$bright_blue
     col.inactive_border=$dark4
-
-    apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
-
-    damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
-
-    monitor=DVI-D-1,1680x1050,0x0,1
-    monitor=HDMI-A-1,preferred,1680x0,1
 }
 
 decoration {
-    rounding=0
-    blur=1
-    blur_size=3 # minimum 1
-    blur_passes=1 # minimum 1
-    blur_new_optimizations=1
+    rounding=5
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+
+        vibrancy = 0.1696
+    }
 }
 
 animations {
-    enabled=1
-    animation=windows,1,7,default
-    animation=border,1,10,default
-    animation=fade,1,10,default
-    animation=workspaces,1,6,default
+    enabled = true
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+misc {
+    middle_click_paste = true
 }
 
 dwindle {
-    pseudotile = 0
+    pseudotile = false
     # col.group_border = 0x66777700
     # col.group_border_active = 0x66ffff00
     # force_split = 0
-    # preserve_split = 0
+    preserve_split = true
     # special_scale_factor = 0.8f
     # split_width_multiplier = 1.0f
     # no_gaps_when_only = 0
@@ -108,14 +131,35 @@ dwindle {
 }
 
 master {
-   special_scale_factor = 0.8
-   new_is_master = 1
-   new_on_top = 0
-   no_gaps_when_only = 0
+    new_status = master
 }
 
 gestures {
-    workspace_swipe=no
+    workspace_swipe=true
+}
+
+plugin {
+    touch_gestures {
+        # The default sensitivity is probably too low on tablet screens,
+        # I recommend turning it up to 4.0
+        sensitivity = 1.0
+
+        # must be >= 3
+        workspace_swipe_fingers = 3
+
+        # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
+        # and can be used at the same time
+        # possible values: l, r, u, or d
+        # to disable it set it to anything else
+        workspace_swipe_edge = none
+
+        # in milliseconds
+        long_press_delay = 400
+
+        # in pixels, the distance from the edge that is considered an edge
+        edge_margin = 10
+
+    }
 }
 
 # example window rules
@@ -139,6 +183,9 @@ bind=SUPER_SHIFT,Q,exit,
 bind=SUPER_SHIFT,F,togglefloating,
 bind=SUPER,F,fullscreen,
 bind=SUPER,X,exec,wofi --show drun
+# hyprgrass-bind=,edge:d:u,exec, wofi --show drun
+# hyprgrass-bind=,edge:l:r,exec, busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true
+# hyprgrass-bind=,edge:r:l,exec, busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false
 bind=SUPER,P,pseudo,
 bind=SUPER,S,workspaceopt,allfloat
 bind=SUPER,M,focusmonitor,0
@@ -153,7 +200,7 @@ bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
 bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
 
 # XF86ScreenSaver
-bind=,160,exec,swaylock
+bind=,160,exec,loginctl lock-session
 
 bind=SUPER,left,movefocus,l
 bind=SUPER,right,movefocus,r
@@ -203,9 +250,13 @@ bind=SUPER,mouse_up,workspace,e-1
 bind=SUPER,space,layoutmsg,togglesplit
 bind=SUPER_CONTROL,space,layoutmsg,movetoroot
 
-bind=,Print,exec,slurp | grim - - | wl-copy
+bind=,Print,exec,slurp | grim -g - - | wl-copy
+
+bind=SUPER,a,exec,~/bin/gopassmenu
+
+bind=SUPER,m,fullscreenstate,1
 
 exec-once=systemctl --user import-environment WAYLAND_DISPLAY HYPRLAND_CMD HYPRLAND_INSTANCE_SIGNATURE
 
-exec-once=waybar
+exec-once=systemctl --user start hyprland.target
 # exec=systemctl --user restart waybar-hyprland
diff --git a/dot_config/hypr/hyprland.conf.bak b/dot_config/hypr/hyprland.conf.bak
new file mode 100644
index 0000000..c4b68f5
--- /dev/null
+++ b/dot_config/hypr/hyprland.conf.bak
@@ -0,0 +1,217 @@
+$dark0_hard = 0xff1d2021
+$dark0 = 0xff282828
+$dark0_soft = 0xff32302f
+$dark1 = 0xff3c3836
+$dark2 = 0xff504945
+$dark3 = 0xff665c54
+$dark4 = 0xff7c6f64
+$dark4_256 = 0xff7c6f64
+
+$gray_245 = 0xff928374
+$gray_244 = 0xff928374
+
+$light0_hard = 0xfff9f5d7
+$light0 = 0xfffbf1c7
+$light0_soft = 0xfff2e5bc
+$light1 = 0xffebdbb2
+$light2 = 0xffd5c4a1
+$light3 = 0xffbdae93
+$light4 = 0xffa89984
+$light4_256 = 0xffa89984
+
+$bright_red = 0xfffb4934
+$bright_green = 0xffb8bb26
+$bright_yellow = 0xfffabd2f
+$bright_blue = 0xff83a598
+$bright_purple = 0xffd3869b
+$bright_aqua = 0xff8ec07c
+$bright_orange = 0xfffe8019
+
+$neutral_red = 0xffcc241d
+$neutral_green = 0xff98971a
+$neutral_yellow = 0xffd79921
+$neutral_blue = 0xff458588
+$neutral_purple = 0xffb16286
+$neutral_aqua = 0xff689d6a
+$neutral_orange = 0xffd65d0e
+
+$faded_red = 0xff9d0006
+$faded_green = 0xff79740e
+$faded_yellow = 0xffb57614
+$faded_blue = 0xff076678
+$faded_purple = 0xff8f3f71
+$faded_aqua = 0xff427b58
+$faded_orange = 0xffaf3a03
+
+input {
+    kb_file=
+    kb_layout=us
+    kb_variant=cz_sk_de
+    kb_model=
+    kb_options=
+    kb_rules=
+
+    # use mouse without focus
+    follow_mouse=2
+
+    touchpad {
+        natural_scroll=no
+    }
+
+    sensitivity=0 # -1.0 - 1.0, 0 means no modification.
+}
+
+general {
+    layout = master
+
+    gaps_in=5
+    gaps_out=5
+    border_size=3
+    col.active_border=$bright_blue
+    col.inactive_border=$dark4
+
+    apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
+
+    damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
+}
+
+decoration {
+    rounding=0
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+
+        vibrancy = 0.1696
+    }
+}
+
+animations {
+    enabled = true
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+dwindle {
+    pseudotile = false
+    # col.group_border = 0x66777700
+    # col.group_border_active = 0x66ffff00
+    # force_split = 0
+    # preserve_split = 0
+    # special_scale_factor = 0.8f
+    # split_width_multiplier = 1.0f
+    # no_gaps_when_only = 0
+    # use_active_for_splits = 1
+}
+
+master {
+    new_status = master
+}
+
+gestures {
+    workspace_swipe=true
+}
+
+# example window rules
+# for windows named/classed as abc and xyz
+#windowrule=move 69 420,abc
+#windowrule=size 420 69,abc
+#windowrule=tile,xyz
+#windowrule=float,abc
+#windowrule=pseudo,abc
+#windowrule=monitor 0,xyz
+
+# some nice mouse binds
+bindm=SUPER,mouse:272,movewindow
+bindm=SUPER,mouse:273,resizewindow
+
+# example binds
+bind=SUPER,RETURN,exec,kitty
+bind=SUPER,Q,killactive,
+bind=SUPER_SHIFT,Q,exit,
+# bind=SUPER,E,exec,dolphin
+bind=SUPER_SHIFT,F,togglefloating,
+bind=SUPER,F,fullscreen,
+bind=SUPER,X,exec,wofi --show drun
+bind=SUPER,P,pseudo,
+bind=SUPER,S,workspaceopt,allfloat
+bind=SUPER,M,focusmonitor,0
+bind=SUPER,N,focusmonitor,1
+
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+
+# XF86ScreenSaver
+bind=,160,exec,swaylock
+
+bind=SUPER,left,movefocus,l
+bind=SUPER,right,movefocus,r
+bind=SUPER,up,movefocus,u
+bind=SUPER,down,movefocus,d
+bind=SUPER,h,movefocus,l
+bind=SUPER,l,movefocus,r
+bind=SUPER,k,movefocus,u
+bind=SUPER,j,movefocus,d
+
+bind=SUPER_SHIFT,left,movewindow,l
+bind=SUPER_SHIFT,right,movewindow,r
+bind=SUPER_SHIFT,up,movewindow,u
+bind=SUPER_SHIFT,down,movewindow,d
+bind=SUPER_SHIFT,h,movewindow,l
+bind=SUPER_SHIFT,l,movewindow,r
+bind=SUPER_SHIFT,k,movewindow,u
+bind=SUPER_SHIFT,j,movewindow,d
+
+bind=SUPER,1,moveworkspacetomonitor,1 current
+bind=SUPER,1,workspace,1
+bind=SUPER,2,moveworkspacetomonitor,2 current
+bind=SUPER,2,workspace,2
+bind=SUPER,3,moveworkspacetomonitor,3 current
+bind=SUPER,3,workspace,3
+bind=SUPER,4,moveworkspacetomonitor,4 current
+bind=SUPER,4,workspace,4
+bind=SUPER,5,moveworkspacetomonitor,5 current
+bind=SUPER,5,workspace,5
+bind=SUPER,6,moveworkspacetomonitor,6 current
+bind=SUPER,6,workspace,6
+bind=SUPER,7,moveworkspacetomonitor,7 current
+bind=SUPER,7,workspace,7
+bind=SUPER,8,moveworkspacetomonitor,8 current
+bind=SUPER,8,workspace,8
+bind=SUPER,9,moveworkspacetomonitor,9 current
+bind=SUPER,9,workspace,9
+bind=SUPER,0,workspace,movetomonitor10 current
+bind=SUPER,0,workspace,10
+bind=SUPER,60,workspace,+1
+bind=SUPER,59,workspace,-1
+
+bind=SUPER_SHIFT,1,movetoworkspacesilent,1
+bind=SUPER_SHIFT,2,movetoworkspacesilent,2
+bind=SUPER_SHIFT,3,movetoworkspacesilent,3
+bind=SUPER_SHIFT,4,movetoworkspacesilent,4
+bind=SUPER_SHIFT,5,movetoworkspacesilent,5
+bind=SUPER_SHIFT,6,movetoworkspacesilent,6
+bind=SUPER_SHIFT,7,movetoworkspacesilent,7
+bind=SUPER_SHIFT,8,movetoworkspacesilent,8
+bind=SUPER_SHIFT,9,movetoworkspacesilent,9
+bind=SUPER_SHIFT,0,movetoworkspacesilent,10
+
+bind=SUPER,mouse_down,workspace,e+1
+bind=SUPER,mouse_up,workspace,e-1
+
+exec-once=systemctl --user import-environment WAYLAND_DISPLAY HYPRLAND_CMD HYPRLAND_INSTANCE_SIGNATURE
+exec=systemctl --user restart waybar-hyprland
diff --git a/dot_config/hypr/hyprlock.conf b/dot_config/hypr/hyprlock.conf
new file mode 100644
index 0000000..5f94bf6
--- /dev/null
+++ b/dot_config/hypr/hyprlock.conf
@@ -0,0 +1,11 @@
+# sample hyprlock.conf
+# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
+
+input-field {
+  monitor =
+  fade_on_empty = false
+}
+
+background {
+  color = rgb(23, 39, 41)
+}
diff --git a/dot_config/hypr/hyprpaper.conf b/dot_config/hypr/hyprpaper.conf
new file mode 100644
index 0000000..87b4e74
--- /dev/null
+++ b/dot_config/hypr/hyprpaper.conf
@@ -0,0 +1,2 @@
+preload = ~/.config/hypr/wallpaper.jpg
+wallpaper = , ~/.config/hypr/wallpaper.jpg
diff --git a/dot_config/hypr/wallpaper.jpg b/dot_config/hypr/wallpaper.jpg
new file mode 100644
index 0000000..ef830c0
Binary files /dev/null and b/dot_config/hypr/wallpaper.jpg differ
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 4515f61..791d413 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -1,3 +1,4 @@
+// vim: ft=json5
 {
     // "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)
@@ -9,9 +10,10 @@
 //    "modules-center": [],
     "modules-right": [
     "idle_inhibitor",
-    "pulseaudio",
+    "wireplumber",
     "cpu",
     "memory",
+    "temperature",
     "network",
     "clock",
     "upower",
@@ -36,31 +38,10 @@
         "sort-by-name": true,
         "sort-by-coordinates": false
     },
-    "mpd": {
-        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
-        "format-disconnected": "Disconnected ",
-        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
-        "unknown-tag": "N/A",
-        "interval": 2,
-        "consume-icons": {
-            "on": " "
-        },
-        "random-icons": {
-            "off": "<span color=\"#f53c3c\"></span> ",
-            "on": " "
-        },
-        "repeat-icons": {
-            "on": " "
-        },
-        "single-icons": {
-            "on": "1 "
-        },
-        "state-icons": {
-            "paused": "",
-            "playing": ""
-        },
-        "tooltip-format": "MPD (connected)",
-        "tooltip-format-disconnected": "MPD (disconnected)"
+    "wireplumber": {
+        "format": "󰕾 {volume}%",
+        "format-muted": "󰖁",
+        "on-click": "systemd-run --scope --user rofi -show pulse -modi pulse:/home/vladimir/bin/pulsemenu"
     },
     "idle_inhibitor": {
         "format": "{icon}",
@@ -75,86 +56,39 @@
     },
     "clock": {
         // "timezone": "America/New_York",
-        "format": "{:%H:%M} ",
+        "format": " {:%H:%M}",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
+        "format-alt": " {:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
+        "format": " {usage}%",
+        "tooltip": false,
+        "on-click": "kitty -e htop"
     },
     "memory": {
-        "format": "{}% "
+        "format": "󰘚 {}%"
     },
     "temperature": {
         // "thermal-zone": 2,
         // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
         // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
+        "format": "{icon} {temperatureC}°C",
+        "format-icons": ["", "", ""]
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
+        "format": "{icon} {percent}%",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
-    "battery": {
-        "states": {
-            // "good": 95,
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": ["", "", "", "", ""]
-    },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "interface": "wlan0", // (Optional) To force the use of this interface
+        "format-wifi": "{icon} {essid} ",
+        "format-icons": ["󰤟","󰤢","󰤥", "󰤨"],
+        "format-ethernet": "󰈀 {ipaddr}/{cidr}",
+        "tooltip-format": "{signalStrength}% | {ipaddr}/{cidr} via {gwaddr}",
+        "format-linked": "{ifname} (No IP)",
+        "format-disconnected": "󰖪",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "kitty -e pulsemixer"
-    },
-    "custom/media": {
-        "format": "{icon} {}",
-        "return-type": "json",
-        "max-length": 40,
-        "format-icons": {
-            "spotify": "",
-            "default": "🎜"
-        },
-        "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     }
 }
-
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index 67dc55a..495b6ea 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -1,13 +1,57 @@
+@define-color dark0_hard #1d2021;
+@define-color dark0 #282828;
+@define-color dark0_soft #32302f;
+@define-color dark1 #3c3836;
+@define-color dark2 #504945;
+@define-color dark3 #665c54;
+@define-color dark4 #7c6f64;
+@define-color dark4_256 #7c6f64;
+
+@define-color gray_245 #928374;
+@define-color gray_244 #928374;
+
+@define-color light0_hard #f9f5d7;
+@define-color light0 #fbf1c7;
+@define-color light0_soft #f2e5bc;
+@define-color light1 #ebdbb2;
+@define-color light2 #d5c4a1;
+@define-color light3 #bdae93;
+@define-color light4 #a89984;
+@define-color light4_256 #a89984;
+
+@define-color bright_red #fb4934;
+@define-color bright_green #b8bb26;
+@define-color bright_yellow #fabd2f;
+@define-color bright_blue #83a598;
+@define-color bright_purple #d3869b;
+@define-color bright_aqua #8ec07c;
+@define-color bright_orange #fe8019;
+
+@define-color neutral_red #cc241d;
+@define-color neutral_green #98971a;
+@define-color neutral_yellow #d79921;
+@define-color neutral_blue #458588;
+@define-color neutral_purple #b16286;
+@define-color neutral_aqua #689d6a;
+@define-color neutral_orange #d65d0e;
+
+@define-color faded_red #9d0006;
+@define-color faded_green #79740e;
+@define-color faded_yellow #b57614;
+@define-color faded_blue #076678;
+@define-color faded_purple #8f3f71;
+@define-color faded_aqua #427b58;
+@define-color faded_orange #af3a03;
+
 * {
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Noto Sans, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-size: 13px;
+    font-family: Hack, sans-serif;
+    font-size: 12px;
 }
 
+
 window#waybar {
-    background-color: rgba(43, 48, 59, 0.5);
-    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-    color: #ffffff;
+    background-color: alpha(@dark0_hard, 0.2);
+    color: @light0_hard;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -21,23 +65,23 @@ window#waybar.empty {
     background-color: transparent;
 }
 window#waybar.solo {
-    background-color: #FFFFFF;
+    background-color: @light0_hard;
 }
 */
 
-window#waybar.termite {
-    background-color: #3F3F3F;
+window#waybar.kitty {
+    background-color: alpha(@dark2, 0.2);
 }
 
 window#waybar.chromium {
-    background-color: #000000;
+    background-color: @dark0_hard;
     border: none;
 }
 
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
-    color: #ffffff;
+    color: @light0;
     /* Use box-shadow instead of border so the text isn't offset */
     box-shadow: inset 0 -3px transparent;
     /* Avoid rounded borders under each workspace name */
@@ -47,26 +91,21 @@ window#waybar.chromium {
 
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
-    box-shadow: inset 0 -3px #ffffff;
+    background: @dark1;
+    box-shadow: inset 0 -3px @light0_hard;
 }
 
 #workspaces button.focused {
-    background-color: #64727D;
-    box-shadow: inset 0 -3px #ffffff;
+    background-color: @dark2;
+    box-shadow: inset 0 -3px @light0_hard;
 }
 
 #workspaces button.urgent {
-    background-color: #eb4d4b;
+    background-color: @neutral_red;
 }
 
 #workspaces button.active {
-    background-color: green;
-}
-
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
+    background-color: @neutral_blue;
 }
 
 #clock,
@@ -82,9 +121,11 @@ window#waybar.chromium {
 #tray,
 #mode,
 #idle_inhibitor,
+#upower,
+#wireplumber,
 #mpd {
     padding: 0 10px;
-    color: #ffffff;
+    color: @light0_hard;
 }
 
 #window,
@@ -103,99 +144,64 @@ window#waybar.chromium {
 }
 
 #clock {
-    background-color: #64727D;
+    background-color: @dark2;
 }
 
-#battery {
-    background-color: #ffffff;
-    color: #000000;
+#upower {
+    background-color: @light2;
+    color: @dark0_hard;
 }
 
-#battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+#upower.charging {
+    color: @light0_hard;
+    background-color: @bright_green;
+}
+
+#wireplumber {
+    background-color: @neutral_aqua;
+}
+
+#wireplumber.muted {
+    background-color: @faded_aqua;
 }
 
 @keyframes blink {
     to {
-        background-color: #ffffff;
-        color: #000000;
+        background-color: @light0_hard;
+        color: @dark0_hard;
     }
 }
 
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: #ffffff;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
 label:focus {
-    background-color: #000000;
+    background-color: @dark0_hard;
 }
 
 #cpu {
-    background-color: #2ecc71;
-    color: #000000;
+    background-color: @neutral_green;
 }
 
 #memory {
-    background-color: #9b59b6;
-}
-
-#disk {
-    background-color: #964B00;
-}
-
-#backlight {
-    background-color: #90b1b1;
+    background-color: @neutral_purple;
 }
 
 #network {
-    background-color: #2980b9;
+    background-color: @neutral_blue;
 }
 
 #network.disconnected {
-    background-color: #f53c3c;
-}
-
-#pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
-}
-
-#pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
-}
-
-#custom-media {
-    background-color: #66cc99;
-    color: #2a5c45;
-    min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-    background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
-    background-color: #ffa000;
+    background-color: @faded_blue;
 }
 
 #temperature {
-    background-color: #f0932b;
+    background-color: @neutral_yellow;
 }
 
 #temperature.critical {
-    background-color: #eb4d4b;
+    background-color: @bright_red;
 }
 
 #tray {
-    background-color: #2980b9;
+    background-color: @dark3;
 }
 
 #tray > .passive {
@@ -204,55 +210,14 @@ label:focus {
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+    background-color: @neutral_red;
 }
 
 #idle_inhibitor {
-    background-color: #2d3436;
+    background-color: @dark2;
 }
 
 #idle_inhibitor.activated {
-    background-color: #ecf0f1;
-    color: #2d3436;
-}
-
-#mpd {
-    background-color: #66cc99;
-    color: #2a5c45;
-}
-
-#mpd.disconnected {
-    background-color: #f53c3c;
-}
-
-#mpd.stopped {
-    background-color: #90b1b1;
-}
-
-#mpd.paused {
-    background-color: #51a37a;
-}
-
-#language {
-    background: #00b093;
-    color: #740864;
-    padding: 0 5px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state {
-    background: #97e1ad;
-    color: #000000;
-    padding: 0 0px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    padding: 0 5px;
-}
-
-#keyboard-state > label.locked {
-    background: rgba(0, 0, 0, 0.2);
+    background-color: @light4;
+    color: @dark0_hard;
 }