3 files changed, 57 insertions, 8 deletions
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 50483aa..0ac556d 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -250,23 +250,23 @@
   "wireplumber#sink" : {
     "tooltip": false,
     "cursor": false,
-    "format": "{icon}{volume}%",
-    "format-muted": "🔇",
-    "format-icons": ["🔈", "🔉", "🔊"],
+    "format": "{icon} {volume}%",
+    "format-muted": " ",
+    "format-icons": ["", "", ""],
     "signal": 10,
     "interval": 30,
     "on-click": "$TERMINAL -e pulsemixer",
     "on-click-middle": "wpctl set-mute @DEFAULT_SINK@ toggle",
     "on-scroll-up": "wpctl set-volume @DEFAULT_SINK@ 1%+",
     "on-scroll-down": "wpctl set-volume @DEFAULT_SINK@ 1%-",
-    "on-click-right": "notify-send \"🔊 Volume module\" \"\\- Shows volume 🔊, 🔇 if muted.\n- Middle click to mute.\n- Scroll to change.\""
+    "on-click-right": "notify-send \" Volume module\" \"\\- Shows volume  ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
 
   "wireplumber#source" : {
     "node-type": "Audio/Source",
     "tooltip": false,
     "cursor": false,
-    "format": "🎙️{volume}%",
+    "format": " {volume}%",
     "format-muted": "",
     "signal": 23,
     "interval": 30,
@@ -274,7 +274,7 @@
     "on-click-middle": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
     "on-scroll-up": "wpctl set-volume @DEFAULT_SOURCE@ 1%+",
     "on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 1%-",
-    "on-click-right": "notify-send \"🎙️ Microphone volume module\" \"\\- Shows volume 🎙️,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
+    "on-click-right": "notify-send \" Microphone volume module\" \"\\- Shows volume ,  if muted.\n- Middle click to mute.\n- Scroll to change.\""
   },
 
   "custom/mouse" : {
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 16a7860..c790161 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,3 +1,5 @@
+@import "theme.css";
+
 * {
     font-family: monospace;
     font-size: 17px;
@@ -38,13 +40,48 @@ window#waybar.hidden {
     color: #e67e80;
 }
 
+/* !!! COLORS !!! */
+
+/* #clock { */
+/* 	color: @red; */
+/* } */
+/**/
+/* #wireplumber { */
+/* 	color: @orange; */
+/* } */
+/**/
+/* #custom-mailbox { */
+/* 	color: @yellow; */
+/* } */
+/**/
+/* #custom-memory { */
+/* 	color: @yellow; */
+/* } */
+/**/
+/* #custom-torrent { */
+/* 	color: @green; */
+/* } */
+/**/
+/* #custom-news { */
+/* 	color: @green; */
+/* } */
+/**/
+/* #custom-packages { */
+/* 	color: @blue; */
+/* } */
+/**/
+/* #custom-music { */
+/* 	color: @blue; */
+/* } */
+
+/* !!! END of COLORS !!! */
+
 #mode {
     background-color: #ff0000;
     box-shadow: inset 0 -3px #0000ff;
 }
 
 #custom-clock,
-#clock,
 #battery,
 #cpu,
 #custom-memory,
@@ -75,7 +112,7 @@ window#waybar.hidden {
 #custom-power,
 #mpd {
     padding: 0 2px;
-    margin-right: 7px;
+    margin-right: 10px;
 }
 
 #window,
@@ -83,6 +120,10 @@ window#waybar.hidden {
     margin: 0 4px;
 }
 
+#clock {
+	margin-right: 4px;
+}
+
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
     margin-left: 0;
diff --git a/.config/waybar/theme.css b/.config/waybar/theme.css
new file mode 100644
index 0000000..db191e5
--- /dev/null
+++ b/.config/waybar/theme.css
@@ -0,0 +1,8 @@
+@define-color text #D3C6AA;
+@define-color red #E67E80;
+@define-color orange #E69875;
+@define-color yellow #DBBC7F;
+@define-color green  #A7C080;
+@define-color blue #7FBBB3;
+@define-color purple #D699B6;
+@define-color aqua #83C092;