diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index f812c0f..ad020dc 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -16,6 +16,7 @@
     "modules-right": [
         "pulseaudio",
         "network",
+        "cpu",
         "memory",
         "battery",
         "tray",
@@ -59,7 +60,7 @@
             "7": "七",
             "8": "八",
             "9": "九",
-            "10": "零",
+            "10": "ロ",
             "11": "一",
             "12": "十",
             "default": "",
@@ -140,12 +141,12 @@
         }
     },
     "cpu": {
-        "format": "{usage}% ",
+        "format": "{usage} 󰒔",
         "tooltip": false,
         "interval": 3
     },
     "memory": {
-        "format": "{}% 󱤓",
+        "format": "{} 󰐤",
         "interval": 3
     },
     "temperature": {
@@ -158,7 +159,7 @@
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
+        "format": "{percent} {icon}",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
     "battery": {
@@ -167,14 +168,14 @@
             "warning": 30,
             "critical": 18
         },
-        "format": "{capacity}% {icon}",
-        "format-full": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
+        "format": "{capacity} {icon}",
+        "format-full": "{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": ["", "", "", "", ""]
+        "format-full": "",
+        "format-icons": ["", "", "", "", ""]
     },
     "battery#bat2": {
         "bat": "BAT2"
@@ -192,21 +193,21 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{signalStrength}% ",
+        "format-wifi": "{signalStrength} 直",
         "format-ethernet": "{ipaddr}/{cidr} ",
         "tooltip-format": "{essid} {ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
+        "format-disconnected": "睊",
         "on-click": "hyprctl dispatch exec, [float; move center] kitty -e nmtui"
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
-        "format": "{format_source} {volume}% {icon}",
-        "format-bluetooth": "{format_source} {volume}% {icon}",
-        "format-bluetooth-muted": "{format_source}  {icon}",
+        "format": "{format_source}{volume} {icon}",
+        "format-bluetooth": "{format_source}{volume} 󰂰",
+        "format-bluetooth-muted": "{format_source} 󰂲",
         "format-muted": "{format_source} 󰖁",
         "format-source": "",
-        "format-source-muted": "  ",
+        "format-source-muted": "   ",
         "format-icons": {
             "headphone": "",
             //"hands-free": "",
diff --git a/waybar/style.css b/waybar/style.css
index a17f332..43d1e19 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -38,16 +38,15 @@ window#waybar {
 #mpd.stopped {
   border: none;
   border-radius: 0 0 10px 10px;
-  transition-property: background-color;
-  transition-duration: 2s;
 }
 
 #mpd.playing, #mpd.paused {
   border-radius: 0 0 10px 10px;
-  transition-property: background-color;
-  transition-duration: 2s;
 }
 
+#mpd.playing {
+  color: #f97385;
+}
 
 window#waybar.hidden {
     opacity: 0.2;
@@ -101,7 +100,7 @@ button:hover {
 
 #workspaces button.active.hosting-monitor {
     background-color: rgba(0,0,0,0.32);
-    box-shadow: inset 0 -3px #E96375;
+    box-shadow: inset 0 -3px #e96375;
     color: #E96375;
 
     color: #E96375;
@@ -156,6 +155,7 @@ button:hover {
 #mpd {
     padding: 0 10px;
     color: #ffffff;
+    transition: color 2s ease-out, border-bottom 2s ease-out, background 2s ease-out;
 }
 
 @keyframes hover {
@@ -218,29 +218,34 @@ button:hover {
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
+    color: #AAFFAA;
+    border-bottom: 3 solid #AAFFAA;
 }
 
 /* Using steps() instead of linear as a timing function to limit cpu usage */
 #battery.warning:not(.charging) {
-  animation: blink-warning 2s infinite;
-  
-  animation-name: blink-warning;
-  animation-duration: 5.0s;
-  animation-timing-function: steps(128);
-  animation-iteration-count: infinite;
-  animation-direction: alternate; 
+    color: #FFAA00;
+    border-bottom: 3 solid #FFAA00;
+    /* animation: blink-warning 2s infinite; */
+    /*                                       */
+    /* animation-name: blink-warning;        */
+    /* animation-duration: 5.0s;             */
+    /* animation-timing-function: steps(128);*/
+    /* animation-iteration-count: infinite;  */
+    /* animation-direction: alternate;       */
 }
 
 #battery.critical:not(.charging) {
-    background-color: transparent;
-    animation: blink-danger 1s infinite;
-    
-    animation-name: blink-danger;
-    animation-duration: 0.5s;
-    animation-timing-function: steps(64);
-    animation-iteration-count: infinite;
-    animation-direction: alternate; 
+    color: #FF0000;
+    border-bottom: 3 solid #FF0000;
+    /*background-color: transparent;*/
+    /*animation: blink-danger 1s infinite;*/
+    /**/
+    /*animation-name: blink-danger;*/
+    /*animation-duration: 0.5s;*/
+    /*animation-timing-function: steps(64);*/
+    /*animation-iteration-count: infinite;*/
+    /*animation-direction: alternate; */
 }
 
 #battery.plugged:not(.charging) {