diff --git a/configs/alacritty/alacritty.yml b/configs/alacritty/alacritty.yml
index 16d0002..67f8229 100644
--- a/configs/alacritty/alacritty.yml
+++ b/configs/alacritty/alacritty.yml
@@ -29,82 +29,24 @@ cursor:
   blinking: on
 
 colors:
-    # Default colors
-    primary:
-        background: "#24273A" # base
-        foreground: "#CAD3F5" # text
-        # Bright and dim foreground colors
-        dim_foreground: "#CAD3F5" # text
-        bright_foreground: "#CAD3F5" # text
-
-    # Cursor colors
-    cursor:
-        text: "#24273A" # base
-        cursor: "#F4DBD6" # rosewater
-    vi_mode_cursor:
-        text: "#24273A" # base
-        cursor: "#B7BDF8" # lavender
-
-    # Search colors
-    search:
-        matches:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-        focused_match:
-            foreground: "#24273A" # base
-            background: "#A6DA95" # green
-        footer_bar:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-
-    # Keyboard regex hints
-    hints:
-        start:
-            foreground: "#24273A" # base
-            background: "#EED49F" # yellow
-        end:
-            foreground: "#24273A" # base
-            background: "#A5ADCB" # subtext0
-
-    # Selection colors
-    selection:
-        text: "#24273A" # base
-        background: "#F4DBD6" # rosewater
-
-    # Normal colors
-    normal:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
-
-    # Bright colors
-    bright:
-        black: "#5B6078" # surface2
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#A5ADCB" # subtext0
-
-    # Dim colors
-    dim:
-        black: "#494D64" # surface1
-        red: "#ED8796" # red
-        green: "#A6DA95" # green
-        yellow: "#EED49F" # yellow
-        blue: "#8AADF4" # blue
-        magenta: "#F5BDE6" # pink
-        cyan: "#8BD5CA" # teal
-        white: "#B8C0E0" # subtext1
-
-    indexed_colors:
-        - { index: 16, color: "#F5A97F" }
-        - { index: 17, color: "#F4DBD6" }
-
+  primary:
+    background: '0x1d2021'
+    foreground: '0xd4be98'
+  normal:
+    black:   '0x32302f'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xd8a657'
+    blue:    '0x7daea3'
+    magenta: '0xd3869b'
+    cyan:    '0x89b482'
+    white:   '0xd4be98'
+  bright:
+    black:   '0x32302f'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xd8a657'
+    blue:    '0x7daea3'
+    magenta: '0xd3869b'
+    cyan:    '0x89b482'
+    white:   '0xd4be98'
diff --git a/configs/sway/config b/configs/sway/config
index 6b19244..8e5d769 100644
--- a/configs/sway/config
+++ b/configs/sway/config
@@ -8,7 +8,7 @@ for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 p
 set $menu exec $term --option window.opacity=1 --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop"
 set $filemgr nemo
 
-output * bg ~/Pictures/bg/bg.png fill
+output * bg ~/Pictures/bg/makima.png fill
 
 input type:keyboard {
     xkb_layout us,ru
@@ -31,7 +31,7 @@ font "JetBrains Mono" 9
 
 output * scale 2
 
-include ~/.config/sway/themes/catppuccin-macchiato
+include ~/.config/sway/themes/makima
 
 # Start components
 
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index bbad34c..0e6e86b 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -10,7 +10,7 @@
 
 window#waybar {
     color: transparent;
-    background: @base;
+    background: transparent;
     padding-top: 0;
     padding-bottom: 0;
     margin-top: 8px;
@@ -18,10 +18,15 @@ window#waybar {
 
 #workspaces {
     transition: none;
+    background: #1d2021;
+    margin: 8px 8px 0;
+    padding: 4px;
     color: @text;
+    border-radius: 32px;
 }
 
 #workspaces button {
+    border-radius: 32px;
 }
 
 button:hover {
@@ -43,10 +48,11 @@ button:hover {
 
 .modules-right {
     transition: none;
-    background: @base;
+    background: #1d2021;
+    border-radius: 32px;
+    margin: 8px 8px 0;
     color: @text;
-    padding-left: 4px;
-    padding-right: 4px;
+    padding: 4px;
 }
 
 #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd, #custom-loadavg, #custom-uptime {