diff --git a/catppuccin-macchiato/config.jsonc b/catppuccin-macchiato/config.jsonc
index 07c4b8f..6ad51ea 100644
--- a/catppuccin-macchiato/config.jsonc
+++ b/catppuccin-macchiato/config.jsonc
@@ -5,12 +5,13 @@
   "width": 2550,
   "spacing": 1,
   "reload_style_on_change": true,
+  "fixed-center": true,
   "margin": "10 5 0 5",
   "modules-left": [
     "custom/launcher",
     "hyprland/workspaces",
     "tray",
-    "hyprland/mode",
+    "hyprland/submap",
     "custom/mpd-scroll",
     "custom/firefox",
     "cava",
@@ -60,8 +61,10 @@
     "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
     "on-click": "blueman-manager",
   },
-  "hyprland/mode": {
-    "format": "<span style=\"italic\">{}</span>",
+  "hyprland/submap": {
+    "format": "{}",
+    "max-length": 8,
+    "tooltip": false,
   },
   "hyprland/scratchpad": {
     "format": "{icon} {count}",
diff --git a/catppuccin-macchiato/style.css b/catppuccin-macchiato/style.css
index 3b6634e..04cc1c2 100644
--- a/catppuccin-macchiato/style.css
+++ b/catppuccin-macchiato/style.css
@@ -1,4 +1,5 @@
 @import url("./colors.css");
+@import url("./highlights.css");
 
 * {
   border: none;
@@ -85,7 +86,7 @@ button:hover {
   background-image: linear-gradient(0deg, @surface1, @mantle);
 }
 
-#mode {
+#submap {
   background-color: @base;
   box-shadow: inset 0 -2px @text;
 }
@@ -103,7 +104,7 @@ button:hover {
 #custom-kernel,
 #idle_inhibitor,
 #scratchpad,
-#mode,
+#submap,
 #tray {
   padding: 0 10px;
   margin: 5px 1px;
@@ -167,7 +168,7 @@ label:focus {
 }
 
 #network.disconnected {
-  background-color: red;
+  background-color: @red;
   color: @mantle;
 }
 
@@ -178,7 +179,7 @@ label:focus {
 }
 
 #pulseaudio {
-  background-color: @yellow;
+  background-color: @sapphire;
   color: @mantle;
 }
 
@@ -242,7 +243,7 @@ label:focus {
 
 #custom-mpd-scroll {
   color: @base;
-  background-color: @blue;
+  background-color: @mauve;
   padding: 0 10px;
   margin: 5px 1px;
 }
@@ -261,7 +262,7 @@ label:focus {
 
 #custom-firefox {
   color: @base;
-  background-color: @pink;
+  background-color: @peach;
   padding: 0 10px;
   margin: 5px 1px;
 }