Update colors with catppuccin

crylia_bar/bottom_right_bar.lua

@@ -14,7 +14,7 @@ return function(s, widgets)
   local bottom_right = awful.popup {
     widget = wibox.container.background,
     ontop = false,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     visible = true,
     screen = s,
     maximum_height = dpi(80),

crylia_bar/center_bar.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -14,7 +15,7 @@ return function(s, widgets)
     screen = s,
     widget = wibox.container.background,
     ontop = false,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     visible = true,
     maximum_width = dpi(500),
     placement = function(c) awful.placement.top(c, { margins = dpi(5) }) end,

crylia_bar/dock.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -34,7 +35,7 @@ return function(screen, programs)
         shape = function(cr, width, height)
           gears.shape.rounded_rect(cr, width, height, 10)
         end,
-        bg = color["Grey900"],
+        bg = cat["Crust"],
         widget = wibox.container.background,
         id = "background"
       },
@@ -50,7 +51,7 @@ return function(screen, programs)
       end
     end
 
-    Hover_signal(dock_element.background, color["Grey800"], color["White"])
+    Hover_signal(dock_element.background, color["Grey800"], cat["Text"])
 
     dock_element:connect_signal(
       "button::press",
@@ -77,7 +78,7 @@ return function(screen, programs)
   local dock = awful.popup {
     widget = wibox.container.background,
     ontop = true,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     visible = true,
     screen = screen,
     type = "dock",

crylia_bar/left_bar.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -14,7 +15,7 @@ return function(s, widgets)
     screen = s,
     widget = wibox.container.background,
     ontop = false,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     visible = true,
     maximum_width = dpi(650),
     placement = function(c) awful.placement.top_left(c, { margins = dpi(5) }) end,

crylia_bar/right_bar.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -13,7 +14,7 @@ return function(s, widgets)
   local top_right = awful.popup {
     widget = wibox.container.background,
     ontop = false,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     visible = true,
     screen = s,
     placement = function(c) awful.placement.top_right(c, { margins = dpi(5) }) end,

src/core/notifications.lua

@@ -45,13 +45,13 @@ naughty.connect_signal(
   function(n)
     if n.urgency == "critical" then
       n.title = string.format("<span foreground='%s' font='Ubuntu, ExtraBold 12'>%s</span>",
-        cat["Red"], n.title) or ""
+        cat["Maroon"], n.title) or ""
-      n.message = string.format("<span foreground='%s' font='Ubuntu 12'>%s</span>", cat["Red"], n.message) or ""
+      n.message = string.format("<span foreground='%s' font='Ubuntu 12'>%s</span>", cat["Maroon"], n.message) or ""
-      n.app_name = string.format("<span foreground='%s' font='Ubuntu, ExtraBold 12'>%s</span>", cat["Red"], n.app_name) or ""
+      n.app_name = string.format("<span foreground='%s' font='Ubuntu, ExtraBold 12'>%s</span>", cat["Maroon"], n.app_name) or ""
       n.bg = cat["Surface0"]
     else
       n.title = string.format("<span foreground='%s' font='Ubuntu, ExtraBold 12'>%s</span>",
-        color["White"], n.title) or ""
+        cat["Text"], n.title) or ""
       n.message = string.format("<span foreground='%s' font='Ubuntu 12'>%s</span>", cat['Text'], n.message) or ""
       n.bg = cat["Surface0"]
       n.timeout = n.timeout or 5
@@ -63,15 +63,15 @@ naughty.connect_signal(
       n.actions = { naughty.action {
         program = "Spotify",
         id = "skip-prev",
-        icon = gears.color.recolor_image(icondir .. "skip-prev.svg", color["Cyan200"])
+        icon = gears.color.recolor_image(icondir .. "skip-prev.svg", cat["Lavender"])
       }, naughty.action {
         program = "Spotify",
         id = "play-pause",
-        icon = gears.color.recolor_image(icondir .. "play-pause.svg", color["Cyan200"])
+        icon = gears.color.recolor_image(icondir .. "play-pause.svg", cat["Lavender"])
       }, naughty.action {
         program = "Spotify",
         id = "skip-next",
-        icon = gears.color.recolor_image(icondir .. "skip-next.svg", color["Cyan200"])
+        icon = gears.color.recolor_image(icondir .. "skip-next.svg", cat["Lavender"])
       } }
       use_image = true
     end
@@ -97,7 +97,7 @@ naughty.connect_signal(
           },
           forced_height = dpi(35),
           forced_width = dpi(35),
-          fg = color["Cyan200"],
+          fg = cat["Lavender"],
           bg = cat["Surface0"],
           shape = function(cr, width, height)
             gears.shape.rounded_rect(cr, width, height, dpi(6))
@@ -126,7 +126,7 @@ naughty.connect_signal(
             margins = dpi(5),
             widget = wibox.container.margin
           },
-          fg = color["Green200"],
+          fg = cat["Green"],
           bg = cat["Surface0"],
           shape = function(cr, width, height)
             gears.shape.rounded_rect(cr, width, height, dpi(6))

src/modules/brightness_osd.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -79,7 +80,7 @@ return function(s)
               handle_color = "#ffffff",
               handle_shape = gears.shape.circle,
               handle_width = dpi(10),
-              handle_border_color = color["White"],
+              handle_border_color = cat["Text"],
               maximum = 100,
               widget = wibox.widget.slider
             },
@@ -99,7 +100,7 @@ return function(s)
       right = dpi(24),
       widget = wibox.container.margin
     },
-    bg = color["Grey900"] .. "88",
+    bg = cat["Crust"] .. "88",
     widget = wibox.container.background,
     ontop = true,
     visible = true,
@@ -173,7 +174,7 @@ return function(s)
   local brightness_container = awful.popup {
     widget = wibox.container.background,
     ontop = true,
-    bg = color["Grey900"] .. "00",
+    bg = cat["Crust"] .. "00",
     stretch = false,
     visible = false,
     screen = s,

src/modules/powermenu.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -77,7 +78,7 @@ return function(s)
                 -- TODO: using gears.color to recolor a SVG will make it look super low res
                 -- currently I recolor it in the .svg file directly, but later implement
                 -- a better way to recolor a SVG
-                -- image = gears.color.recolor_image(icon, color["Grey900"]),
+                -- image = gears.color.recolor_image(icon, cat["Crust"]),
                 image = icon,
                 resize = true,
                 forced_height = dpi(30),
@@ -100,7 +101,7 @@ return function(s)
           margins = dpi(10),
           widget = wibox.container.margin
         },
-        fg = color["Grey900"],
+        fg = cat["Crust"],
         bg = bg_color,
         shape = function(cr, width, height)
           gears.shape.rounded_rect(cr, width, height, 10)
@@ -150,17 +151,17 @@ return function(s)
 
   -- Create the buttons with their command and name etc
   local shutdown_button = button("Shutdown", icondir .. "shutdown.svg", color["Blue200"], shutdown_command)
-  local reboot_button = button("Reboot", icondir .. "reboot.svg", color["Red200"], reboot_command)
+  local reboot_button = button("Reboot", icondir .. "reboot.svg", cat["Maroon"], reboot_command)
-  local suspend_button = button("Suspend", icondir .. "suspend.svg", color["Yellow200"], suspend_command)
+  local suspend_button = button("Suspend", icondir .. "suspend.svg", cat["Yellow"], suspend_command)
-  local logout_button = button("Logout", icondir .. "logout.svg", color["Green200"], logout_command)
+  local logout_button = button("Logout", icondir .. "logout.svg", cat["Green"], logout_command)
-  local lock_button = button("Lock", icondir .. "lock.svg", color["Orange200"], lock_command)
+  local lock_button = button("Lock", icondir .. "lock.svg", cat["Peach"], lock_command)
 
   -- Signals to change color on hover
-  Hover_signal(shutdown_button.background, color["Blue200"], color["Grey900"])
+  Hover_signal(shutdown_button.background, color["Blue200"], cat["Crust"])
-  Hover_signal(reboot_button.background, color["Red200"], color["Grey900"])
+  Hover_signal(reboot_button.background, cat["Maroon"], cat["Crust"])
-  Hover_signal(suspend_button.background, color["Yellow200"], color["Grey900"])
+  Hover_signal(suspend_button.background, cat["Yellow"], cat["Crust"])
-  Hover_signal(logout_button.background, color["Green200"], color["Grey900"])
+  Hover_signal(logout_button.background, cat["Green"], cat["Crust"])
-  Hover_signal(lock_button.background, color["Orange200"], color["Grey900"])
+  Hover_signal(lock_button.background, cat["Peach"], cat["Crust"])
 
   -- The powermenu widget
   local powermenu = wibox.widget {

src/modules/titlebar.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -73,7 +74,7 @@ local create_titlebar = function(c, bg, size)
         {
           awful.titlebar.widget.closebutton(c),
           widget = wibox.container.background,
-          bg = color["Red200"],
+          bg = cat["Maroon"],
           shape = function(cr, height, width)
             gears.shape.rounded_rect(cr, width, height, 4)
           end,
@@ -82,7 +83,7 @@ local create_titlebar = function(c, bg, size)
         {
           awful.titlebar.widget.maximizedbutton(c),
           widget = wibox.container.background,
-          bg = color["Yellow200"],
+          bg = cat["Yellow"],
           shape = function(cr, height, width)
             gears.shape.rounded_rect(cr, width, height, 4)
           end,
@@ -91,7 +92,7 @@ local create_titlebar = function(c, bg, size)
         {
           awful.titlebar.widget.minimizebutton(c),
           widget = wibox.container.background,
-          bg = color["Green200"],
+          bg = cat["Green"],
           shape = function(cr, height, width)
             gears.shape.rounded_rect(cr, width, height, 4)
           end,
@@ -119,9 +120,9 @@ local create_titlebar = function(c, bg, size)
     layout = wibox.layout.align.vertical,
     id = "main"
   }
-  Hover_signal(titlebar.main.margin.spacing.closebutton, color["Red200"], color["Grey900"])
+  Hover_signal(titlebar.main.margin.spacing.closebutton, cat["Maroon"], cat["Crust"])
-  Hover_signal(titlebar.main.margin.spacing.maximizebutton, color["Yellow200"], color["Grey900"])
+  Hover_signal(titlebar.main.margin.spacing.maximizebutton, cat["Yellow"], cat["Crust"])
-  Hover_signal(titlebar.main.margin.spacing.minimizebutton, color["Green200"], color["Grey900"])
+  Hover_signal(titlebar.main.margin.spacing.minimizebutton, cat["Green"], cat["Crust"])
 end
 
 local create_titlebar_dialog = function(c, bg, size)
@@ -137,7 +138,7 @@ local create_titlebar_dialog = function(c, bg, size)
         {
           awful.titlebar.widget.closebutton(c),
           widget = wibox.container.background,
-          bg = color["Red200"],
+          bg = cat["Maroon"],
           shape = function(cr, height, width)
             gears.shape.rounded_rect(cr, width, height, 4)
           end,
@@ -146,7 +147,7 @@ local create_titlebar_dialog = function(c, bg, size)
         {
           awful.titlebar.widget.minimizebutton(c),
           widget = wibox.container.background,
-          bg = color["Green200"],
+          bg = cat["Green"],
           shape = function(cr, height, width)
             gears.shape.rounded_rect(cr, width, height, 4)
           end,
@@ -174,8 +175,8 @@ local create_titlebar_dialog = function(c, bg, size)
     layout = wibox.layout.align.vertical,
     id = "main"
   }
-  Hover_signal(titlebar.main.margin.spacing.closebutton, color["Red200"], color["Grey900"])
+  Hover_signal(titlebar.main.margin.spacing.closebutton, cat["Maroon"], cat["Crust"])
-  Hover_signal(titlebar.main.margin.spacing.minimizebutton, color["Green200"], color["Grey900"])
+  Hover_signal(titlebar.main.margin.spacing.minimizebutton, cat["Green"], cat["Crust"])
 end
 
 local draw_titlebar = function(c)

src/modules/volume_controller.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
@@ -150,11 +151,11 @@ return function(s)
         function(new_node)
           if node == new_node then
             old_bg = color["Purple200"]
-            old_fg = color["Grey900"]
+            old_fg = cat["Crust"]
             bg = color["Purple200"]
-            fg = color["Grey900"]
+            fg = cat["Crust"]
             device.background:set_bg(color["Purple200"])
-            device.background:set_fg(color["Grey900"])
+            device.background:set_fg(cat["Crust"])
           else
             fg = color["Purple200"]
             bg = color["Grey700"]
@@ -169,9 +170,9 @@ return function(s)
           local node_active = stdout:gsub("\n", "")
           if node == node_active then
             bg = color["Purple200"]
-            fg = color["Grey900"]
+            fg = cat["Crust"]
             device.background:set_bg(color["Purple200"])
-            device.background:set_fg(color["Grey900"])
+            device.background:set_fg(cat["Crust"])
           else
             fg = color["Purple200"]
             bg = color["Grey700"]
@@ -280,11 +281,11 @@ return function(s)
         function(new_node)
           if node == new_node then
             old_bg = color["Blue200"]
-            old_fg = color["Grey900"]
+            old_fg = cat["Crust"]
             bg = color["Blue200"]
-            fg = color["Grey900"]
+            fg = cat["Crust"]
             device.background:set_bg(color["Blue200"])
-            device.background:set_fg(color["Grey900"])
+            device.background:set_fg(cat["Crust"])
           else
             fg = color["Blue200"]
             bg = color["Grey700"]
@@ -299,9 +300,9 @@ return function(s)
           local node_active = stdout:gsub("\n", "")
           if node == node_active then
             bg = color["Blue200"]
-            fg = color["Grey900"]
+            fg = cat["Crust"]
             device.background:set_bg(color["Blue200"])
-            device.background:set_fg(color["Grey900"])
+            device.background:set_fg(cat["Crust"])
           else
             fg = color["Blue200"]
             bg = color["Grey700"]
@@ -534,7 +535,7 @@ return function(s)
       margins = dpi(10),
       widget = wibox.container.margin
     },
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     border_color = color["Grey800"],
     border_width = dpi(4),
     shape = function(cr, width, height)
@@ -621,7 +622,7 @@ return function(s)
   local volume_controller_container = awful.popup {
     widget = wibox.container.background,
     ontop = true,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
     stretch = false,
     visible = false,
     screen = s,

src/modules/volume_osd.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -70,7 +71,7 @@ return function(s)
                 handle_color = "#ffffff",
                 handle_shape = gears.shape.circle,
                 handle_width = dpi(10),
-                handle_border_color = color["White"],
+                handle_border_color = cat["Text"],
                 maximum = 100,
                 widget = wibox.widget.slider
               },
@@ -99,7 +100,7 @@ return function(s)
       top = dpi(2),
       widget = wibox.container.margin
     },
-    bg = color["Grey900"] .. '88',
+    bg = cat["Crust"] .. '88',
     widget = wibox.container.background,
     ontop = true,
     visible = true,
@@ -193,7 +194,7 @@ return function(s)
   local volume_container = awful.popup {
     widget = wibox.container.background,
     ontop = true,
-    bg = color["Grey900"] .. "00",
+    bg = cat["Crust"] .. "00",
     stretch = false,
     visible = false,
     screen = s,

src/theme/theme_variables.lua

@@ -17,7 +17,7 @@ Theme.font = user_vars.font.bold
 
 Theme.bg_normal = cat["Base"]
 Theme.bg_focus = cat["Base"]
-Theme.bg_urgent = cat["Red"]
+Theme.bg_urgent = cat["Maroon"]
 Theme.bg_minimize = cat["Text"]
 Theme.bg_systray = cat["Text"]
 
@@ -30,7 +30,7 @@ Theme.useless_gap = dpi(5) -- Change this to 0 if you dont like window gaps
 Theme.border_width = dpi(0) -- Change this to 0 if you dont like borders
 Theme.border_normal = cat["Base"]
 --Theme.border_focus = color["Red"] -- Doesnt work, no idea why; workaround is in signals.lua
-Theme.border_marked = cat["Red"]
+Theme.border_marked = cat["Maroon"]
 
 Theme.menu_submenu_icon = Theme_path .. "assets.ArchLogo.png"
 Theme.menu_height = dpi(40)
@@ -64,7 +64,7 @@ Theme.titlebar_minimize_button_normal = icondir .. "minimize.svg"
 Theme.titlebar_maximized_button_active = icondir .. "maximize.svg"
 Theme.titlebar_maximized_button_inactive = icondir .. "maximize.svg"
 
-Theme.bg_systray = color["BlueGrey800"]
+Theme.bg_systray = cat["Surface0"]
 Theme.systray_icon_spacing = dpi(10)
 
 Theme.hotkeys_bg = cat["Base"]

src/theme/user_variables.lua

@@ -43,7 +43,7 @@ user_vars = {
     "bash -c \"[[ ! $(pgrep ulauncher) ]] && ulauncher --hide-window &\"",
 --  "bash -c \"[[ ! $(pidof transmission-daemon) ]] && transmission-daemon\"",
     "bash -c \"[[ ! $(pidof polkit-gnome-authentication-agent-1) ]] && /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &\"",
-    "bash -c \"[[ ! $(pgrep mpDris2) ]] && mpDris2 &\"",
+    "bash -c \"[ ! $(pgrep mpDris2) ] && mpDris2 &\"",
 --  "bash -c \"[[ ! $(pgrep redshift) ]] && redshift &\"",
 --  "plank &",
 --  "bash -c \"[ ! `pidof xfce-polkit` ] && /usr/lib/xfce-polkit/xfce-polkit &\"",

src/widgets/audio.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -47,8 +48,8 @@ return function(s)
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Yellow200"],
+    bg = cat["Yellow"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -77,7 +78,7 @@ return function(s)
         end
         audio_widget.container.audio_layout.label:set_text(volume .. "%")
         audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(
-          gears.color.recolor_image(icon .. ".svg", color["Grey900"]))
+          gears.color.recolor_image(icon .. ".svg", cat["Crust"]))
         awesome.emit_signal("get::volume", volume)
       end
     )
@@ -91,7 +92,7 @@ return function(s)
           audio_widget.container.audio_layout.label.visible = false
           audio_widget.container:set_right(0)
           audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(
-            gears.color.recolor_image(icondir .. "volume-mute" .. ".svg", color["Grey900"]))
+            gears.color.recolor_image(icondir .. "volume-mute" .. ".svg", cat["Crust"]))
           awesome.emit_signal("get::volume_mute", true)
         else
           audio_widget.container:set_right(10)
@@ -103,7 +104,7 @@ return function(s)
   end
 
   -- Signals
-  Hover_signal(audio_widget, color["Yellow200"], color["Grey900"])
+  Hover_signal(audio_widget, cat["Yellow"], cat["Crust"])
 
   audio_widget:connect_signal(
     "button::press",

src/widgets/battery.lua

@@ -4,6 +4,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
@@ -51,7 +52,7 @@ return function()
       widget = wibox.container.margin
     },
     bg = color["Purple200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -96,7 +97,7 @@ return function()
 
   local battery_warning = function()
     naughty.notification {
-      icon = gears.color.recolor_image(icondir .. "battery-alert.svg", color["White"]),
+      icon = gears.color.recolor_image(icondir .. "battery-alert.svg", cat["Text"]),
       app_name = "System notification",
       title = "Battery is low",
       message = "Battery is almost empty",
@@ -168,7 +169,7 @@ return function()
     )
   end
 
-  Hover_signal(battery_widget, color["Purple200"], color["Grey900"])
+  Hover_signal(battery_widget, color["Purple200"], cat["Crust"])
 
   battery_widget:connect_signal(
     'button::press',

src/widgets/bluetooth.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
@@ -34,7 +35,7 @@ return function()
       widget = wibox.container.margin
     },
     bg = color["Blue200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -76,13 +77,13 @@ return function()
           end
         )
       end
-      bluetooth_widget.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", color["Grey900"]))
+      bluetooth_widget.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", cat["Crust"]))
     end,
     bluetooth_widget
   )
 
   -- Signals
-  Hover_signal(bluetooth_widget, color["Blue200"], color["Grey900"])
+  Hover_signal(bluetooth_widget, color["Blue200"], cat["Crust"])
 
   bluetooth_widget:connect_signal(
     "button::press",

src/widgets/clock.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -23,7 +24,7 @@ return function()
           {
             {
               id = "icon",
-              image = gears.color.recolor_image(icondir .. "clock.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icondir .. "clock.svg", cat["Crust"]),
               widget = wibox.widget.imagebox,
               resize = false
             },
@@ -50,15 +51,15 @@ return function()
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Orange200"],
+    bg = cat["Peach"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
     widget = wibox.container.background
   }
 
-  Hover_signal(clock_widget, color["Orange200"], color["Grey900"])
+  Hover_signal(clock_widget, cat["Peach"], cat["Crust"])
 
   return clock_widget
 end

src/widgets/cpu_info.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local watch = awful.widget.watch
@@ -24,7 +25,7 @@ return function(widget, clock_mode)
             {
               id = "icon",
               widget = wibox.widget.imagebox,
-              image = gears.color.recolor_image(icon_dir .. "cpu.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icon_dir .. "cpu.svg", cat["Crust"]),
               resize = false
             },
             id = "icon_layout",
@@ -50,7 +51,7 @@ return function(widget, clock_mode)
       widget = wibox.container.margin
     },
     bg = color["Blue200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -89,8 +90,8 @@ return function(widget, clock_mode)
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Green200"],
+    bg = cat["Green"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -131,7 +132,7 @@ return function(widget, clock_mode)
       widget = wibox.container.margin
     },
     bg = color["Purple200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -172,16 +173,16 @@ return function(widget, clock_mode)
 
       local temp_num = tonumber(stdout:match("%d+"))
       if temp_num < 50 then
-        temp_color = color["Green200"]
+        temp_color = cat["Green"]
         temp_icon = icon_dir .. "thermometer-low.svg"
       elseif temp_num >= 50 and temp_num < 80 then
-        temp_color = color["Orange200"]
+        temp_color = cat["Peach"]
         temp_icon = icon_dir .. "thermometer.svg"
       elseif temp_num >= 80 then
-        temp_color = color["Red200"]
+        temp_color = cat["Maroon"]
         temp_icon = icon_dir .. "thermometer-high.svg"
       end
-      Hover_signal(cpu_temp, temp_color, color["Grey900"])
+      Hover_signal(cpu_temp, temp_color, cat["Crust"])
       cpu_temp.container.cpu_layout.icon_margin.icon_layout.icon:set_image(temp_icon)
       cpu_temp:set_bg(temp_color)
       cpu_temp.container.cpu_layout.label.text = math.floor(temp_num) .. "°C"
@@ -212,8 +213,8 @@ return function(widget, clock_mode)
     end
   )
 
-  Hover_signal(cpu_usage_widget, color["Blue200"], color["Grey900"])
+  Hover_signal(cpu_usage_widget, color["Blue200"], cat["Crust"])
-  Hover_signal(cpu_clock, color["Purple200"], color["Grey900"])
+  Hover_signal(cpu_clock, color["Purple200"], cat["Crust"])
 
   if widget == "usage" then
     return cpu_usage_widget

src/widgets/date.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -23,7 +24,7 @@ return function()
           {
             {
               id = "icon",
-              image = gears.color.recolor_image(icondir .. "calendar.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icondir .. "calendar.svg", cat["Crust"]),
               widget = wibox.widget.imagebox,
               resize = false
             },
@@ -50,7 +51,7 @@ return function()
       widget = wibox.container.margin
     },
     bg = color["Teal200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -72,7 +73,7 @@ return function()
   }
 
   -- Signals
-  Hover_signal(date_widget, color["Teal200"], color["Grey900"])
+  Hover_signal(date_widget, color["Teal200"], cat["Crust"])
 
   date_widget:connect_signal(
     "mouse::enter",

src/widgets/gpu_info.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local watch = awful.widget.watch
@@ -22,7 +23,7 @@ return function(widget)
             {
               id = "icon",
               widget = wibox.widget.imagebox,
-              image = gears.color.recolor_image(icon_dir .. "gpu.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icon_dir .. "gpu.svg", cat["Crust"]),
               resize = false
             },
             id = "icon_layout",
@@ -47,14 +48,14 @@ return function(widget)
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Green200"],
+    bg = cat["Green"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
     widget = wibox.container.background
   }
-  Hover_signal(gpu_usage_widget, color["Green200"], color["Grey900"])
+  Hover_signal(gpu_usage_widget, cat["Green"], cat["Crust"])
 
   local gpu_temp_widget = wibox.widget {
     {
@@ -64,7 +65,7 @@ return function(widget)
             {
               id = "icon",
               widget = wibox.widget.imagebox,
-              image = gears.color.recolor_image(icon_dir .. "cpu.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icon_dir .. "cpu.svg", cat["Crust"]),
               resize = false
             },
             id = "icon_layout",
@@ -90,7 +91,7 @@ return function(widget)
       widget = wibox.container.margin
     },
     bg = color["Blue200"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -120,21 +121,21 @@ return function(widget)
       if temp_num then
 
         if temp_num < 50 then
-          temp_color = color["Green200"]
+          temp_color = cat["Green"]
           temp_icon = icon_dir .. "thermometer-low.svg"
         elseif temp_num >= 50 and temp_num < 80 then
-          temp_color = color["Orange200"]
+          temp_color = cat["Peach"]
           temp_icon = icon_dir .. "thermometer.svg"
         elseif temp_num >= 80 then
-          temp_color = color["Red200"]
+          temp_color = cat["Maroon"]
           temp_icon = icon_dir .. "thermometer-high.svg"
         end
       else
         temp_num = "NaN"
-        temp_color = color["Green200"]
+        temp_color = cat["Green"]
         temp_icon = icon_dir .. "thermometer-low.svg"
       end
-      Hover_signal(gpu_temp_widget, temp_color, color["Grey900"])
+      Hover_signal(gpu_temp_widget, temp_color, cat["Crust"])
       gpu_temp_widget.container.gpu_layout.icon_margin.icon_layout.icon:set_image(temp_icon)
       gpu_temp_widget:set_bg(temp_color)
       gpu_temp_widget.container.gpu_layout.label.text = tostring(temp_num) .. "°C"

src/widgets/kblayout.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -23,7 +24,7 @@ return function(s)
               id = "icon",
               widget = wibox.widget.imagebox,
               resize = false,
-              image = gears.color.recolor_image(icondir .. "keyboard.svg", color["Grey900"])
+              image = gears.color.recolor_image(icondir .. "keyboard.svg", cat["Crust"])
             },
             id = "icon_layout",
             widget = wibox.container.place
@@ -47,8 +48,8 @@ return function(s)
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Green200"],
+    bg = cat["Green"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -182,7 +183,7 @@ return function(s)
               font = user_vars.font.extrabold,
               id = "shortname"
             },
-            fg = color["Red200"],
+            fg = cat["Maroon"],
             widget = wibox.container.background,
             id = "background2"
           },
@@ -209,7 +210,7 @@ return function(s)
         gears.shape.rounded_rect(cr, width, height, 8)
       end,
       bg = color["Grey800"],
-      fg = color["White"],
+      fg = cat["Text"],
       widget = wibox.container.background,
       id = "background",
       keymap = keymap
@@ -225,11 +226,11 @@ return function(s)
             local layout = stdout:gsub("\n", "")
             if kb_layout_item.keymap == layout then
               kb_layout_item.bg = color["DeepPurple200"]
-              kb_layout_item:get_children_by_id("background2")[1].fg = color["Grey900"]
+              kb_layout_item:get_children_by_id("background2")[1].fg = cat["Crust"]
-              kb_layout_item:get_children_by_id("background1")[1].fg = color["Grey900"]
+              kb_layout_item:get_children_by_id("background1")[1].fg = cat["Crust"]
             else
               kb_layout_item.bg = color["Grey800"]
-              kb_layout_item:get_children_by_id("background2")[1].fg = color["Red200"]
+              kb_layout_item:get_children_by_id("background2")[1].fg = cat["Maroon"]
               kb_layout_item:get_children_by_id("background1")[1].fg = color["Purple200"]
             end
           end
@@ -280,8 +281,8 @@ return function(s)
       gears.shape.rounded_rect(cr, width, height, 12)
     end,
     widget = wibox.container.background,
-    bg = color["Grey900"],
+    bg = cat["Crust"],
-    fg = color["White"],
+    fg = cat["Text"],
     border_width = dpi(4),
     border_color = color["Grey800"],
     width = dpi(100),
@@ -296,7 +297,7 @@ return function(s)
     function()
       mousegrabber.run(
         function()
-          kblayout_widget.bg = color["Green200"]
+          kblayout_widget.bg = cat["Green"]
           awesome.emit_signal("kblayout::hide:kbmenu")
           mousegrabber.stop()
           return true
@@ -352,7 +353,7 @@ return function(s)
   )
 
   -- Signals
-  Hover_signal(kblayout_widget, color["Green200"], color["Grey900"])
+  Hover_signal(kblayout_widget, cat["Green"], cat["Crust"])
 
   local kblayout_keygrabber = awful.keygrabber {
     autostart = false,

src/widgets/layout_list.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -35,7 +36,7 @@ return function(s)
   }
 
   -- Signals
-  Hover_signal(layout, color["LightBlue200"], color["Grey900"])
+  Hover_signal(layout, color["LightBlue200"], cat["Crust"])
 
   layout:connect_signal(
     "button::press",

src/widgets/mpris.lua

@@ -53,14 +53,14 @@ return function()
       widget = wibox.container.margin
     },
     bg = cat["Lavender"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
     widget = wibox.container.background
   }
 
-  Hover_signal(mpris_widget, cat["Lavender"], color["Grey900"])
+  Hover_signal(mpris_widget, cat["Lavender"], cat["Crust"])
 
   watch(
     [[ bash -c "$HOME/.config/awesome/bin/get_mpris_status.sh" ]],

src/widgets/network.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
@@ -34,7 +35,7 @@ return function()
           {
             {
               id = 'icon',
-              image = gears.color.recolor_image(icondir .. "no-internet" .. ".svg", color["Grey900"]),
+              image = gears.color.recolor_image(icondir .. "no-internet" .. ".svg", cat["Crust"]),
               widget = wibox.widget.imagebox,
               resize = false
             },
@@ -61,8 +62,8 @@ return function()
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Red200"],
+    bg = cat["Maroon"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
@@ -111,7 +112,7 @@ return function()
       text = message,
       title = title,
       app_name = app_name,
-      icon = gears.color.recolor_image(icon, color["White"]),
+      icon = gears.color.recolor_image(icon, cat["Text"]),
       timeout = 3
     }
   end
@@ -165,7 +166,7 @@ return function()
             update_wireless_data(false)
           end
           network_widget.container.network_layout.spacing = dpi(8)
-          network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color["Grey900"]))
+          network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", cat["Crust"]))
         end
       )
     end
@@ -261,7 +262,7 @@ return function()
     network_widget.container.network_layout.label.visible = false
     update_tooltip("Network unreachable")
     network_widget.container.network_layout.spacing = dpi(0)
-    network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color["Grey900"]))
+    network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", cat["Crust"]))
   end
 
   local check_network_mode = function()
@@ -324,7 +325,7 @@ return function()
   }
 
   -- Signals
-  Hover_signal(network_widget, color["Red200"], color["Grey900"])
+  Hover_signal(network_widget, cat["Maroon"], cat["Crust"])
 
   network_widget:connect_signal(
     "button::press",

src/widgets/power.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -22,7 +23,7 @@ return function()
           {
             {
               id = "icon",
-              image = gears.color.recolor_image(icondir .. "power.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icondir .. "power.svg", cat["Crust"]),
               widget = wibox.widget.imagebox,
               resize = false
             },
@@ -41,7 +42,7 @@ return function()
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Red200"],
+    bg = cat["Maroon"],
     fg = color["Grey800"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
@@ -50,7 +51,7 @@ return function()
   }
 
   -- Signals
-  Hover_signal(power_widget, color["Red200"], color["Grey900"])
+  Hover_signal(power_widget, cat["Maroon"], cat["Crust"])
 
   power_widget:connect_signal(
     "button::release",

src/widgets/ram_info.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local watch = awful.widget.watch
@@ -22,7 +23,7 @@ return function()
             {
               id = "icon",
               widget = wibox.widget.imagebox,
-              image = gears.color.recolor_image(icon_dir .. "ram.svg", color["Grey900"]),
+              image = gears.color.recolor_image(icon_dir .. "ram.svg", cat["Crust"]),
               resize = false
             },
             id = "icon_layout",
@@ -47,15 +48,15 @@ return function()
       right = dpi(8),
       widget = wibox.container.margin
     },
-    bg = color["Red200"],
+    bg = cat["Maroon"],
-    fg = color["Grey900"],
+    fg = cat["Crust"],
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
     widget = wibox.container.background
   }
 
-  Hover_signal(ram_widget, color["Red200"], color["Grey900"])
+  Hover_signal(ram_widget, cat["Maroon"], cat["Crust"])
 
   watch(
     [[ bash -c "cat /proc/meminfo| grep Mem | awk '{print $2}'" ]],

src/widgets/systray.lua

@@ -5,6 +5,7 @@
 -- Awesome Libs
 local awful = require("awful")
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
@@ -27,10 +28,10 @@ return function(s)
     shape = function(cr, width, height)
       gears.shape.rounded_rect(cr, width, height, 5)
     end,
-    bg = color["BlueGrey800"]
+    bg = cat["Surface0"]
   }
   -- Signals
-  Hover_signal(systray.container, color["Red200"], color["Grey900"])
+  Hover_signal(systray.container, cat["Maroon"], cat["Crust"])
 
   awesome.connect_signal("systray::update", function()
     local num_entries = awesome.systray()

src/widgets/taglist.lua

@@ -8,6 +8,7 @@ local awful = require("awful")
 local gears = require("gears")
 local dpi = require("beautiful").xresources.apply_dpi
 local color = require("src.theme.colors")
+local cat = require("src.theme.catppuccin")
 require("src.tools.icon_handler")
 
 local list_update = function(widget, buttons, label, data, objects)
@@ -36,7 +37,7 @@ local list_update = function(widget, buttons, label, data, objects)
         id = "container",
         layout = wibox.layout.fixed.horizontal
       },
-      fg = color["White"],
+      fg = cat["Text"],
       shape = function(cr, width, height)
         gears.shape.rounded_rect(cr, width, height, 5)
       end,
@@ -68,10 +69,10 @@ local list_update = function(widget, buttons, label, data, objects)
     tag_widget.container.margin.label:set_text(object.index)
     if object.urgent == true then
       tag_widget:set_bg(color["RedA200"])
-      tag_widget:set_fg(color["Grey900"])
+      tag_widget:set_fg(cat["Crust"])
     elseif object == awful.screen.focused().selected_tag then
-      tag_widget:set_bg(color["White"])
+      tag_widget:set_bg(cat["Text"])
-      tag_widget:set_fg(color["Grey900"])
+      tag_widget:set_fg(cat["Crust"])
     else
       tag_widget:set_bg("#3A475C")
     end

src/widgets/tasklist.lua

@@ -8,6 +8,7 @@ local wibox = require('wibox')
 local dpi = require('beautiful').xresources.apply_dpi
 local gears = require('gears')
 local color = require('src.theme.colors')
+local cat = require("src.theme.catppuccin")
 
 local list_update = function(widget, buttons, label, data, objects)
 	widget:reset()
@@ -48,8 +49,8 @@ local list_update = function(widget, buttons, label, data, objects)
 				widget = wibox.container.margin,
 				id = "container"
 			},
-			bg = color["White"],
+			bg = cat["Text"],
-			fg = color["Grey900"],
+			fg = cat["Crust"],
 			shape = function(cr, width, height)
 				gears.shape.rounded_rect(cr, width, height, 5)
 			end,
@@ -106,8 +107,8 @@ local list_update = function(widget, buttons, label, data, objects)
 					task_tool_tip:remove_from_object(task_widget)
 				end
 			end
-			task_widget:set_bg(color["White"])
+			task_widget:set_bg(cat["Text"])
-			task_widget:set_fg(color["Grey900"])
+			task_widget:set_fg(cat["Crust"])
 			task_widget.container.layout_it.title:set_text(text)
 		else
 			task_widget:set_bg("#3A475C")