diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index 99094cf..f7bb637 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -30,7 +30,7 @@
     };
     stylix = {
       enable = true;
-      theme = "rose-pine-moon";
+      theme = "sandcastle";
     };
     locale = "uk_UA.UTF-8";
     misc = {
diff --git a/modules/home/desktop/niri/niri.nix b/modules/home/desktop/niri/niri.nix
index 09dbbcb..65079ce 100644
--- a/modules/home/desktop/niri/niri.nix
+++ b/modules/home/desktop/niri/niri.nix
@@ -159,28 +159,29 @@ in {
       }
 
       struts {
-        left 33
-        right 33
+        left 43
+        right 43
       }
 
       tab-indicator {
         active-color "#${colors.base04}"
         inactive-color "#${colors.base03}"
-        corner-radius 4
-        gap 6
+        corner-radius 3
+        gap 3
         gaps-between-tabs 3
-        length total-proportion=0.3
+        // length total-proportion=0.3
         place-within-column
         position "left"
-        width 6
+        width 3
       }
       focus-ring {
-        off
-        width 3
-        active-gradient from="#${colors.base0D}" to="#${colors.base0F}" angle=40 relative-to="workspace-view"
+        width 1
+        active-color "#${colors.base0D}"
         inactive-color "#${colors.base03}"
+        urgent-color "#${colors.base08}"
       }
       border {
+        off
         width 1
         active-color "#${colors.base0D}"
         inactive-color "#${colors.base03}"
@@ -189,7 +190,7 @@ in {
     }
 
     window-rule {
-      geometry-corner-radius 18
+      geometry-corner-radius 9
       clip-to-geometry true
     }
     window-rule {
diff --git a/modules/home/desktop/niri/programs/walker/default.nix b/modules/home/desktop/niri/programs/walker/default.nix
index 8fc0860..f461750 100644
--- a/modules/home/desktop/niri/programs/walker/default.nix
+++ b/modules/home/desktop/niri/programs/walker/default.nix
@@ -230,8 +230,8 @@
       #window {
         background: @base00;
         color: @base05;
-        border-radius: 20px;
-        /* border: 1px solid @base0D; */
+        border-radius: 9px;
+        border: 1px solid @base0D;
       }
 
       #box {
@@ -240,7 +240,7 @@
 
       #search {
         background: @base01;
-        border-radius: 17px;
+        border-radius: 6px;
         padding: 8px;
       }
 
@@ -249,12 +249,12 @@
       #typeahead {
         background: none;
         box-shadow: none;
-        border-radius: 12px;
+        border-radius: 3px;
       }
 
       #input > *:first-child,
       #typeahead > *:first-child {
-        margin-right: 12px;
+        margin-right: 3px;
         border-radius: 0px;
       }
 
@@ -268,7 +268,7 @@
 
       #list {
         padding: 3px;
-        border-radius: 17px;
+        border-radius: 6px;
         background: @base01;
       }
 
@@ -279,7 +279,7 @@
       child:selected,
       child:hover {
         box-shadow: none;
-        border-radius: 14px;
+        border-radius: 3px;
         background: @base02;
       }
 
diff --git a/modules/home/desktop/niri/programs/waybar/default.nix b/modules/home/desktop/niri/programs/waybar/default.nix
index 2dee77e..fd2ec97 100644
--- a/modules/home/desktop/niri/programs/waybar/default.nix
+++ b/modules/home/desktop/niri/programs/waybar/default.nix
@@ -17,59 +17,38 @@
     position = "bottom";
     height = 40;
     spacing = 0;
-    margin-left = 33 + 3;
-    margin-right = 33 + 3;
+    # margin-left = 3;
+    # margin-right = 3;
+    margin-left = 43 + 3;
+    margin-right = 43 + 3;
     margin-bottom = 3;
     reload_style_on_change = true;
     modules-left = [
       "custom/launcher"
-      "niri/language"
-      "niri/workspaces"
+      "clock"
       "wlr/taskbar"
       "privacy"
     ];
-    modules-center = ["clock"];
+    modules-center = [
+      # "clock"
+      "niri/language"
+      "niri/workspaces"
+      "idle_inhibitor"
+    ];
     modules-right = [
       "wireplumber"
       (ifLaptop "group/laptop")
       "tray"
-      "idle_inhibitor"
       "custom/notification"
     ];
     "niri/workspaces" = {
       format = "{index}";
-      format-icons = {
-        "1" = "൧";
-        "2" = "൨";
-        "3" = "൩";
-        "4" = "൪";
-        "5" = "൫";
-        "6" = "൬";
-        "7" = "൭";
-        "8" = "൮";
-        "9" = "൯";
-        "10" = "൰";
-        general = "󰘧";
-        web = "󰖟";
-        chat = "󰻞";
-        code = "󰅩";
-        uni = "󱆀";
-        games = "󰺶";
-        system = "󰢻";
-        media = "󱜐";
-        tray = "󱊖";
-      };
     };
     "niri/language" = {
       format = "{}";
       format-en = "🇺🇸";
       format-uk = "🇺🇦";
     };
-    "custom/separator" = {
-      format = "󰝠";
-      interval = "once";
-      tooltip = false;
-    };
     "group/laptop" = {
       orientation = "inherit";
       modules = [
@@ -103,9 +82,9 @@
     };
     "clock" = {
       interval = 1;
-      format = "{:%B %d - %R - %A}";
-      tooltip = false;
-      # tooltip-format = "{%y.%m.%d - %B %d, %A}";
+      format = "{:%R}";
+      tooltip = true;
+      tooltip-format = "{:%B %d, %A}";
     };
     battery = {
       states = {
@@ -219,57 +198,51 @@
     @define-color base0D #${colors.base0D};
     @define-color base0E #${colors.base0E};
     @define-color base0F #${colors.base0F};
+
     * {
       font-family: ${config.stylix.fonts.sansSerif.name}, FontAwesome;
       font-weight: 500;
       font-size: 18px;
     }
-    .modules-center,
-    .mpris.stopped {
-      background-color: transparent;
-    }
+
     window#waybar {
       background: @base00;
-      border-radius: 24px;
+      border-radius: 9px;
     }
+
     .modules-left,
     .modules-center,
     .modules-right {
-      /* border-bottom-left-radius: 12px;
-      border-bottom-right-radius: 12px;
-      border-top-left-radius: 0px;
-      border-top-right-radius: 0px; */
       background-color: @base00;
-      border-radius: 24px;
+      border-radius: 9px;
       color: @base05;
-      /* margin: 1px; for the window#waybar border */
     }
+
     tooltip {
       background: @base01;
       border: 1px solid @base0D;
-      border-radius: 24px;
+      border-radius: 12px;
     }
+
     tooltip label {
       color: @base05;
     }
+
     button {
       box-shadow: inset 0 -3px transparent;
-      border-radius: 16px;
+      border-radius: 3px;
     }
+
     button:hover {
       background: inherit;
       box-shadow: inset 0 -3px transparent;
     }
-    #mode {
-      background-color: rgba(0, 0, 0, 0.2);
-      box-shadow: inset 0 -3px @base05;
-    }
+
     #backlight,
     #battery,
     #clock,
     #custom-launcher,
     #custom-notification,
-    #custom-separator,
     #idle_inhibitor,
     #language,
     #power-profiles-daemon,
@@ -280,33 +253,19 @@
     #wireplumber,
     #workspaces button,
     #workspaces {
-      border-radius: 24px;
+      border-radius: 6px;
       background-color: @base01;
       margin: 3px 3px 3px 0;
       padding: 0 6px;
     }
-    /* left modules */
+
+    /* #clock, */
     #custom-launcher,
-    /* #language, */
-    #clock,
+    #language,
     #wireplumber {
       margin: 3px;
     }
-    #taskbar button {
-      padding: 0 3px;
-      margin: 3px;
-    }
-    #workspaces button {
-      padding: 0 5px;
-      margin: 3px;
-    }
-    #tray button {
-      padding: 0 6px;
-      margin: 3px;
-    }
-    #privacy-item {
-      padding: 0 4px;
-    }
+
     #backlight,
     #battery,
     #custom-notification,
@@ -314,28 +273,38 @@
     #wireplumber {
       padding: 0 14px 0 10px;
     }
+
     #custom-launcher,
     #power-profiles-daemon {
       padding: 0 17px 0 8px;
     }
+
     #privacy,
     #taskbar,
     #workspaces {
       padding: 0;
     }
-    #taskbar.empty,
-    window#empty {
-      padding: 0;
-      margin: 0;
-      background-color: transparent;
+
+    #privacy-item {
+      padding: 0 5px;
     }
-    #taskbar button:hover {
-      background-color: @base0D;
+
+    #taskbar button {
+      padding: 0 3px;
+      margin: 3px;
     }
-    #workspaces button.active {
-      color: @base00;
-      background-color: @base0D;
+
+    #tray button {
+      padding: 0 3px;
+      margin: 3px;
     }
+
+    #workspaces button {
+      border-radius: 3px;
+      padding: 0 5px;
+      margin: 3px;
+    }
+
     #battery.critical:not(.charging) {
       background-color: @base09;
       color: @base00;
@@ -345,36 +314,58 @@
       animation-iteration-count: infinite;
       animation-direction: alternate;
     }
+
+    #mode {
+      background-color: rgba(0, 0, 0, 0.2);
+      box-shadow: inset 0 -3px @base05;
+    }
+
+    #power-profiles-daemon.balanced {
+      color: @base05;
+    }
+
     #power-profiles-daemon.performance {
       background-color: @base0D;
       color: @base00;
     }
-    #power-profiles-daemon.balanced {
-      color: @base05;
-    }
+
     #power-profiles-daemon.power-saver {
       background-color: @base0A;
       color: @base00;
     }
-    label:focus {
-      background-color: #000000;
-    }
-    #tray > .passive {
-      -gtk-icon-effect: dim;
-    }
-    #tray > .needs-attention {
-      -gtk-icon-effect: highlight;
-      background-color: @base08;
-    }
-    #privacy-item.screenshare {
-      background-color: @base0C;
-      color: @base00;
-      margin: 3px 0 3px 3px;
-    }
+
     #privacy-item.audio-in {
       background-color: @base0E;
       color: @base00;
       margin: 3px;
     }
+
+    #privacy-item.screenshare {
+      background-color: @base0C;
+      color: @base00;
+      margin: 3px 0 3px 3px;
+    }
+
+    #taskbar button:hover {
+      background-color: @base0D;
+    }
+
+    #tray > .needs-attention {
+      -gtk-icon-effect: highlight;
+      background-color: @base08;
+    }
+
+    #tray > .passive {
+      -gtk-icon-effect: dim;
+    }
+
+    #workspaces button.active {
+      color: @base00;
+      background-color: @base0D;
+    }
+
+    label:focus {
+      background-color: #000000;
+    }
   '';
 }