From aca8e5dfe8d930ab1be3575408158e8147b42f11 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com~>
Date: Wed, 15 Nov 2023 17:54:51 +0900
Subject: [PATCH] Waybar rename for easy addition

---
 config/hypr/scripts/WaybarLayout.sh           |  11 +-
 config/hypr/scripts/WaybarStyles.sh           |   6 +-
 .../{config-Bottom(plasma) => Bottom(plasma)} |   0
 .../{config-Bottom-Left => Bottom-Left}       |   0
 .../{config-Bottom-Right => Bottom-Right}     |   0
 .../configs/{config-Camellia => Camellia}     |   8 +-
 .../{config-Chrysanthemum => Chrysanthemum}   |   7 +-
 .../configs/{config-Gardenia => Gardenia}     |   7 +-
 config/waybar/configs/{config-Left => Left}   |   0
 config/waybar/configs/{config-Peony => Peony} |   7 +-
 config/waybar/configs/{config-Right => Right} |   0
 .../configs/{config-Top(gnome) => Top(gnome)} |   0
 .../{config-Top-&-Bottom => Top-&-Bottom}     |   3 +-
 .../configs/{config-Top-Left => Top-Left}     |   0
 .../configs/{config-Top-Right => Top-Right}   |   0
 .../configs/{config-all-sides => all-sides}   |   0
 .../configs/{config-default => default}       |  22 +-
 .../{config-default-Bottom => default-Bottom} |  24 +-
 .../{config-simple-long => simple-long}       |   0
 .../{config-simple-short => simple-short}     |   0
 ...le-Black-&-White.css => Black-&-White.css} |   0
 ...ppuccin-latte.css => Catppuccin-Latte.css} |   0
 ...ppuccin-mocha.css => Catppuccin-Mocha.css} |   0
 .../style/{style-Crimson.css => Crimson.css}  |  17 +-
 ...{style-Golden-Noir.css => Golden-Noir.css} |  15 +-
 .../waybar/style/{Style-None.css => None.css} |   8 +-
 config/waybar/style/Purple.css                | 215 +++++++++++++++++
 ...{style-Simple-Pink.css => Simple-Pink.css} |  19 +-
 .../{style-colorful.css => colorful.css}      |   0
 ...le-colors-border.css => colors-border.css} |   0
 ...{style-colors-line.css => colors-line.css} |   0
 .../style/{style-colors.css => colors.css}    |   0
 .../waybar/style/{style-dark.css => dark.css} |   0
 .../style/{style-light.css => light.css}      |   0
 .../style/{style-pywal.css => pywal.css}      |   0
 config/waybar/style/style-Purple.css          | 216 ------------------
 36 files changed, 295 insertions(+), 290 deletions(-)
 rename config/waybar/configs/{config-Bottom(plasma) => Bottom(plasma)} (100%)
 rename config/waybar/configs/{config-Bottom-Left => Bottom-Left} (100%)
 rename config/waybar/configs/{config-Bottom-Right => Bottom-Right} (100%)
 rename config/waybar/configs/{config-Camellia => Camellia} (93%)
 rename config/waybar/configs/{config-Chrysanthemum => Chrysanthemum} (91%)
 rename config/waybar/configs/{config-Gardenia => Gardenia} (91%)
 rename config/waybar/configs/{config-Left => Left} (100%)
 rename config/waybar/configs/{config-Peony => Peony} (93%)
 rename config/waybar/configs/{config-Right => Right} (100%)
 rename config/waybar/configs/{config-Top(gnome) => Top(gnome)} (100%)
 rename config/waybar/configs/{config-Top-&-Bottom => Top-&-Bottom} (99%)
 rename config/waybar/configs/{config-Top-Left => Top-Left} (100%)
 rename config/waybar/configs/{config-Top-Right => Top-Right} (100%)
 rename config/waybar/configs/{config-all-sides => all-sides} (100%)
 rename config/waybar/configs/{config-default => default} (83%)
 rename config/waybar/configs/{config-default-Bottom => default-Bottom} (80%)
 rename config/waybar/configs/{config-simple-long => simple-long} (100%)
 rename config/waybar/configs/{config-simple-short => simple-short} (100%)
 rename config/waybar/style/{style-Black-&-White.css => Black-&-White.css} (100%)
 rename config/waybar/style/{style-catppuccin-latte.css => Catppuccin-Latte.css} (100%)
 rename config/waybar/style/{style-catppuccin-mocha.css => Catppuccin-Mocha.css} (100%)
 rename config/waybar/style/{style-Crimson.css => Crimson.css} (90%)
 rename config/waybar/style/{style-Golden-Noir.css => Golden-Noir.css} (92%)
 rename config/waybar/style/{Style-None.css => None.css} (93%)
 create mode 100644 config/waybar/style/Purple.css
 rename config/waybar/style/{style-Simple-Pink.css => Simple-Pink.css} (90%)
 rename config/waybar/style/{style-colorful.css => colorful.css} (100%)
 rename config/waybar/style/{style-colors-border.css => colors-border.css} (100%)
 rename config/waybar/style/{style-colors-line.css => colors-line.css} (100%)
 rename config/waybar/style/{style-colors.css => colors.css} (100%)
 rename config/waybar/style/{style-dark.css => dark.css} (100%)
 rename config/waybar/style/{style-light.css => light.css} (100%)
 rename config/waybar/style/{style-pywal.css => pywal.css} (100%)
 delete mode 100644 config/waybar/style/style-Purple.css

diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh
index 73fb28b..be02e5e 100755
--- a/config/hypr/scripts/WaybarLayout.sh
+++ b/config/hypr/scripts/WaybarLayout.sh
@@ -7,10 +7,6 @@ menu() {
     cat <<EOF
 default
 default-Bottom
-Peony
-Chrysanthemum
-Gardenia
-Camellia
 Top(gnome)
 Bottom(plasma)
 simple-long
@@ -24,12 +20,15 @@ Bottom-Left
 Bottom-Right
 all-sides
 no panel
-
+Peony
+Chrysanthemum
+Gardenia
+Camellia
 EOF
 }
 
 apply_config() {
-    ln -sf "$CONFIG/config-$1" "$WCONFIG"
+    ln -sf "$CONFIG/$1" "$WCONFIG"
 }
 
 main() {
diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh
index e1a9734..96e8c84 100755
--- a/config/hypr/scripts/WaybarStyles.sh
+++ b/config/hypr/scripts/WaybarStyles.sh
@@ -17,8 +17,8 @@ STYLES=(
 "colors-border" 
 "colors-line" 
 "colorful" 
-"catppuccin-mocha" 
-"catppuccin-latte"
+"Catppuccin-Mocha" 
+"Catppuccin-Latte"
 "None"
 )
 
@@ -40,7 +40,7 @@ else
 fi
 
 # APPLY THEME
-THEMEFILE="$HOME/.config/waybar/style/style-${SWITCHTO}.css"
+THEMEFILE="$HOME/.config/waybar/style/${SWITCHTO}.css"
 if [ -f "$THEMEFILE" ]; then
     ln -sf "$THEMEFILE" "$HOME/.config/waybar/style.css"
 else
diff --git a/config/waybar/configs/config-Bottom(plasma) b/config/waybar/configs/Bottom(plasma)
similarity index 100%
rename from config/waybar/configs/config-Bottom(plasma)
rename to config/waybar/configs/Bottom(plasma)
diff --git a/config/waybar/configs/config-Bottom-Left b/config/waybar/configs/Bottom-Left
similarity index 100%
rename from config/waybar/configs/config-Bottom-Left
rename to config/waybar/configs/Bottom-Left
diff --git a/config/waybar/configs/config-Bottom-Right b/config/waybar/configs/Bottom-Right
similarity index 100%
rename from config/waybar/configs/config-Bottom-Right
rename to config/waybar/configs/Bottom-Right
diff --git a/config/waybar/configs/config-Camellia b/config/waybar/configs/Camellia
similarity index 93%
rename from config/waybar/configs/config-Camellia
rename to config/waybar/configs/Camellia
index 6ff25d9..7080945 100644
--- a/config/waybar/configs/config-Camellia
+++ b/config/waybar/configs/Camellia
@@ -1,11 +1,11 @@
 //* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-//* .............................................................................*/
-//* ......................            CAMELLIA     .................... */
-//* ............................................................................ */
+//* ............................................*/
+//* .............CAMELLIA.......................*/
+//* ............................................*/
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
-
+ 
     "include": "~/.config/waybar/modules",
 	"layer": "top",
 	//"mode": "dock",
diff --git a/config/waybar/configs/config-Chrysanthemum b/config/waybar/configs/Chrysanthemum
similarity index 91%
rename from config/waybar/configs/config-Chrysanthemum
rename to config/waybar/configs/Chrysanthemum
index fccc8e8..95c6686 100644
--- a/config/waybar/configs/config-Chrysanthemum
+++ b/config/waybar/configs/Chrysanthemum
@@ -1,10 +1,11 @@
 //* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-//* .............................................................................*/
-//* ......................  CHRYSANTEMUM    .................... */
-//* ............................................................................ */
+//* ............................................*/
+//* .............CHRYSANTHEMUM.......................*/
+//* ............................................*/
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
+ 
 
     "include": "~/.config/waybar/modules",
 	"layer": "top",
diff --git a/config/waybar/configs/config-Gardenia b/config/waybar/configs/Gardenia
similarity index 91%
rename from config/waybar/configs/config-Gardenia
rename to config/waybar/configs/Gardenia
index ffbd7da..6dc88ed 100644
--- a/config/waybar/configs/config-Gardenia
+++ b/config/waybar/configs/Gardenia
@@ -1,11 +1,12 @@
 //* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-//* .............................................................................*/
-//* ......................     GARDENIA           .................... */
-//* ............................................................................ */
+//* ............................................*/
+//* .............GARDENIA.......................*/
+//* ............................................*/
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
  
+
     "include": "~/.config/waybar/modules",
 	"layer": "top",
 	//"mode": "dock",
diff --git a/config/waybar/configs/config-Left b/config/waybar/configs/Left
similarity index 100%
rename from config/waybar/configs/config-Left
rename to config/waybar/configs/Left
diff --git a/config/waybar/configs/config-Peony b/config/waybar/configs/Peony
similarity index 93%
rename from config/waybar/configs/config-Peony
rename to config/waybar/configs/Peony
index 07dc665..c539697 100644
--- a/config/waybar/configs/config-Peony
+++ b/config/waybar/configs/Peony
@@ -1,10 +1,11 @@
 //* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-//* .............................................................................*/
-//* ............      ..........     PEONY     ...........      ......... */
-//* ............................................................................ */
+//* ............................................*/
+//* ................PEONY.......................*/
+//* ............................................*/
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
+ 
 	"include": "~/.config/waybar/modules",
 	"layer": "top",
 	//"mode": "dock",
diff --git a/config/waybar/configs/config-Right b/config/waybar/configs/Right
similarity index 100%
rename from config/waybar/configs/config-Right
rename to config/waybar/configs/Right
diff --git a/config/waybar/configs/config-Top(gnome) b/config/waybar/configs/Top(gnome)
similarity index 100%
rename from config/waybar/configs/config-Top(gnome)
rename to config/waybar/configs/Top(gnome)
diff --git a/config/waybar/configs/config-Top-&-Bottom b/config/waybar/configs/Top-&-Bottom
similarity index 99%
rename from config/waybar/configs/config-Top-&-Bottom
rename to config/waybar/configs/Top-&-Bottom
index 9187793..ae9c546 100644
--- a/config/waybar/configs/config-Top-&-Bottom
+++ b/config/waybar/configs/Top-&-Bottom
@@ -17,7 +17,6 @@
 "margin-right": 8,
 
 "modules-left": [
-	"hyprland/workspaces#2", 
 	"cpu", 
 	"temperature", 
 	"memory",
@@ -62,7 +61,7 @@
 	 ],
 
 "modules-center": [
-	"cava",
+	"hyprland/workspaces#2", 
 	],
 
 "modules-right": [
diff --git a/config/waybar/configs/config-Top-Left b/config/waybar/configs/Top-Left
similarity index 100%
rename from config/waybar/configs/config-Top-Left
rename to config/waybar/configs/Top-Left
diff --git a/config/waybar/configs/config-Top-Right b/config/waybar/configs/Top-Right
similarity index 100%
rename from config/waybar/configs/config-Top-Right
rename to config/waybar/configs/Top-Right
diff --git a/config/waybar/configs/config-all-sides b/config/waybar/configs/all-sides
similarity index 100%
rename from config/waybar/configs/config-all-sides
rename to config/waybar/configs/all-sides
diff --git a/config/waybar/configs/config-default b/config/waybar/configs/default
similarity index 83%
rename from config/waybar/configs/config-default
rename to config/waybar/configs/default
index 8bdc096..379e3ba 100644
--- a/config/waybar/configs/config-default
+++ b/config/waybar/configs/default
@@ -26,7 +26,7 @@
 	"custom/separator#dot-line",
 	"custom/weather",
 	],
-  
+
 "modules-center": [
 	"custom/menu",
 	"custom/separator#dot-line",
@@ -37,24 +37,24 @@
 	"custom/light_dark",
 	"custom/separator#dot-line",	
 	"custom/lock",
-	//],
-	"custom/separator#dot-line",
-	"custom/keybinds",	
-	], 
+	],
+	//"custom/separator#dot-line",
+	//"custom/keybinds",	
+	//], 
 
 "modules-right": [
 	//"hyprland/window", 
 	"tray",
 	"custom/separator#dot-line",
-	"bluetooth",
-	"custom/separator#dot-line",
+	//"bluetooth",
+	//"custom/separator#dot-line",
 	//"network",
 	//"custom/separator#dot-line",
 	//"cava", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
+	//"battery",
+	//"custom/separator#dot-line", 
+	//"backlight",
+	//"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
 	//"wireplumber", 
diff --git a/config/waybar/configs/config-default-Bottom b/config/waybar/configs/default-Bottom
similarity index 80%
rename from config/waybar/configs/config-default-Bottom
rename to config/waybar/configs/default-Bottom
index ebb256b..68f54ad 100644
--- a/config/waybar/configs/config-default-Bottom
+++ b/config/waybar/configs/default-Bottom
@@ -37,24 +37,24 @@
 	"custom/light_dark",
 	"custom/separator#dot-line",	
 	"custom/lock",
-	//],
-	"custom/separator#dot-line",
-	"custom/keybinds",	
-	], 
+	],
+	//"custom/separator#dot-line",
+	//"custom/keybinds",	
+	//], 
 
 "modules-right": [
 	//"hyprland/window", 
 	"tray",
 	"custom/separator#dot-line",
-	"bluetooth",
-	"custom/separator#dot-line",
-	"network",
-	"custom/separator#dot-line",
+	//"bluetooth",
+	//"custom/separator#dot-line",
+	//"network",
+	//"custom/separator#dot-line",
 	//"cava", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
+	//"battery",
+	//"custom/separator#dot-line", 
+	//"backlight",
+	//"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
 	//"wireplumber", 
diff --git a/config/waybar/configs/config-simple-long b/config/waybar/configs/simple-long
similarity index 100%
rename from config/waybar/configs/config-simple-long
rename to config/waybar/configs/simple-long
diff --git a/config/waybar/configs/config-simple-short b/config/waybar/configs/simple-short
similarity index 100%
rename from config/waybar/configs/config-simple-short
rename to config/waybar/configs/simple-short
diff --git a/config/waybar/style/style-Black-&-White.css b/config/waybar/style/Black-&-White.css
similarity index 100%
rename from config/waybar/style/style-Black-&-White.css
rename to config/waybar/style/Black-&-White.css
diff --git a/config/waybar/style/style-catppuccin-latte.css b/config/waybar/style/Catppuccin-Latte.css
similarity index 100%
rename from config/waybar/style/style-catppuccin-latte.css
rename to config/waybar/style/Catppuccin-Latte.css
diff --git a/config/waybar/style/style-catppuccin-mocha.css b/config/waybar/style/Catppuccin-Mocha.css
similarity index 100%
rename from config/waybar/style/style-catppuccin-mocha.css
rename to config/waybar/style/Catppuccin-Mocha.css
diff --git a/config/waybar/style/style-Crimson.css b/config/waybar/style/Crimson.css
similarity index 90%
rename from config/waybar/style/style-Crimson.css
rename to config/waybar/style/Crimson.css
index 2b26b9a..2829047 100644
--- a/config/waybar/style/style-Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -1,7 +1,7 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* .............................................................................*/
-/* .................    .....     Crimson        ........................ */
-/* ............................................................................ */
+/* ....................................*/
+/* ..........Crimson.................. */
+/* ................................... */
 /* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 *{
@@ -9,14 +9,14 @@
 	font-weight: bold;
 	min-height: 0;
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-	font-size: 98%;
+	font-size: 100%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 	}
 	
 	window#waybar {
 		background: #240303;
 		color: wheat;
-		border-radius: 0px 0px 100px 100px;
+		border-radius: 00px 0px 100px 100px;
 		border: 1px solid grey;
 	}
 	
@@ -46,7 +46,8 @@
 	}
 	/*-----module groups----*/
 	.modules-right {
-		padding-right: 2px;
+		padding-right: 5px;
+		padding-left: 5px;
 
 	}
 	
@@ -57,7 +58,9 @@
 	}
 	
 	.modules-left {
-		padding-left: 2px;
+		padding-right: 5px;
+		padding-left: 5px;
+		
 		
 	}
 	
diff --git a/config/waybar/style/style-Golden-Noir.css b/config/waybar/style/Golden-Noir.css
similarity index 92%
rename from config/waybar/style/style-Golden-Noir.css
rename to config/waybar/style/Golden-Noir.css
index 30f0582..dd1812e 100644
--- a/config/waybar/style/style-Golden-Noir.css
+++ b/config/waybar/style/Golden-Noir.css
@@ -1,15 +1,16 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* .............................................................................*/
-/* ......................     Golden Noir       ........................ */
-/* ............................................................................ */
+/* ...........................................*/
+/* ...............Golden Noir................ */
+/* .......................................... */
 /* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
+
 *{
 	font-family: "JetBrainsMono Nerd Font";
 	font-weight: bold;
 	min-height: 0;
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-	font-size: 98%;
+	font-size: 100%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 	padding: 1px;
 	}
@@ -47,7 +48,8 @@
 	}
 	/*-----module groups----*/
 	.modules-right {
-		padding-right: 2px;
+		padding-right: 5px;
+		padding-left: 5px;
 		
 	}
 	
@@ -60,7 +62,8 @@
 	}
 	
 	.modules-left {
-		padding-left: 2px;
+		padding-right: 5px;
+		padding-left: 5px;
 	
 	}
 	
diff --git a/config/waybar/style/Style-None.css b/config/waybar/style/None.css
similarity index 93%
rename from config/waybar/style/Style-None.css
rename to config/waybar/style/None.css
index cbad245..f492139 100644
--- a/config/waybar/style/Style-None.css
+++ b/config/waybar/style/None.css
@@ -1,7 +1,7 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* .............................................................................*/
-/* ......................            None      ........................ */
-/* ............................................................................ */
+/* ....................................*/
+/* .....            None      .........*/
+/* ................................... */
 /* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 *{
@@ -9,7 +9,7 @@
 	font-weight: bold;
 	min-height: 0;
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-	font-size: 98%;
+	font-size: 100%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 	padding: 1px;
 	}
diff --git a/config/waybar/style/Purple.css b/config/waybar/style/Purple.css
new file mode 100644
index 0000000..b455f89
--- /dev/null
+++ b/config/waybar/style/Purple.css
@@ -0,0 +1,215 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* .........................................*/
+/* .............Purple..................... */
+/* ...................,.................... */
+/* --- 👍 designed by https://github.com/Krautt  👍 --- */
+
+*{
+font-family: "JetBrains Mono Nerd Font";
+font-weight: bold;
+min-height: 0;
+/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+font-size: 100%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 1px;
+}
+	
+window#waybar {
+	background: #100214;
+	border-radius: 10px;
+	color: #cba6f7;
+}
+	
+window#waybar.hidden {
+	opacity: 0.5;
+}
+window#waybar.empty {
+	background-color: transparent;
+	background: #100214;
+}
+	
+window#waybar.empty #window {
+   padding: 0px;
+   margin: 0px;
+   border: 0px;
+   /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
+   background-color: transparent;
+}
+	  
+	   
+tooltip {
+	background: #1e1e2e;
+	border-radius: 10px;
+	border-width: 2px;
+	border-style: solid;
+	border-color: #11111b;
+	color: #cba6f7;
+}
+
+/*-----module groups----*/
+.modules-right {
+	border: 5px solid #20052a;
+	border-radius: 100px 0px 0px 0px;
+	background-color: #3d174b;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+	
+.modules-center {
+	/*background-color: #1e1e2e;*/
+
+		
+}
+	
+.modules-left {
+	/*background-color: #1e1e2e;*/
+	border: 5px solid #20052a;
+	border-radius: 0px 0px 100px 0px;
+	background-color: #441a53;
+	padding-right: 5px;
+	padding-left: 5px;
+	   
+}
+	
+#workspaces button {
+	padding: 2px;
+	color: #6E6A86;
+	margin-right: 5px;
+}
+	   
+#workspaces button.active {
+	color: #cba6f7;
+	border-radius: 50%;
+	background-color: black;
+}
+	  
+#workspaces button.focused {
+	color: #d8dee9;
+}
+	   
+#workspaces button.urgent {
+	color: #11111b;
+	border-radius: 10px;
+}
+		   
+#workspaces button:hover {
+	color: #9CCFD8;
+	border-radius: 15px;
+}
+
+#backlight,
+#battery,
+#bluetooth,
+#cava,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state label,
+#keyboard-state label.locked,
+#keyboard-state,
+#memory,
+#mode,
+#mpd,
+#network,
+#pulseaudio,
+#taskbar button,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-spotify,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+	color:whitesmoke;
+	padding: 0px 10px;
+	
+}
+	 
+#temperature.critical {
+	background-color: #ff0000;
+}
+   
+@keyframes blink {
+	to {
+	color: #000000;
+	   }
+}
+   
+#taskbar button.active {
+	background-color: purple;
+}
+	   
+#battery.critical:not(.charging) {
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+	
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#pulseaudio-slider trough {
+	min-width: 80px;  
+	min-height: 5px; 
+	border-radius: 5px;
+	background-color: #22252a;
+}
+	
+#pulseaudio-slider highlight {
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: purple;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+	
+#backlight-slider trough {
+	min-width: 80px;  
+	min-height: 10px; 
+	border-radius: 5px;
+	background-color: #22252a;
+}
+	
+#backlight-slider highlight {
+	min-width: 10px; 
+	border-radius: 5px;
+	background-color: purple;
+}
+	
+	
\ No newline at end of file
diff --git a/config/waybar/style/style-Simple-Pink.css b/config/waybar/style/Simple-Pink.css
similarity index 90%
rename from config/waybar/style/style-Simple-Pink.css
rename to config/waybar/style/Simple-Pink.css
index 2b200a8..2b5cd79 100644
--- a/config/waybar/style/style-Simple-Pink.css
+++ b/config/waybar/style/Simple-Pink.css
@@ -1,22 +1,21 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* .............................................................................*/
-/* ......................     Simple Pink        ........................ */
-/* ............................................................................ */
+/* ..........................................*/
+/* .......Simple Pink....................... */
+/* ......................................... */
 /* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
-
 *{
 	font-family: "JetBrains Mono Nerd Font";
 	font-weight: bold;
 	min-height: 0;
 	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-	font-size: 98%;
+	font-size: 100%;
 	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
 	
 	}
 	
 	window#waybar {
-		background: black;
+		background:black;
 		border-radius: 50px;
 		color: whitesmoke;
 	}
@@ -50,9 +49,9 @@
 		border: 5px solid #19141b;
 		border-radius: 50px 50px 50px 50px;
 		background-color: #ba5663;
-		padding-right: 2px;
-		padding-left: 2px;
-		margin: 1px;
+		padding-right: 10px;
+		padding-left: 10px;
+		margin: 3px;
 	}
 	
 	.modules-center {
@@ -143,7 +142,7 @@
 	#custom-weather.snowyIcyNight,
 	#custom-weather.sunnyDay {
 		color:whitesmoke;
-		padding: 0px 6px;
+		padding: 0px 10px;
 		
 	}
 		 
diff --git a/config/waybar/style/style-colorful.css b/config/waybar/style/colorful.css
similarity index 100%
rename from config/waybar/style/style-colorful.css
rename to config/waybar/style/colorful.css
diff --git a/config/waybar/style/style-colors-border.css b/config/waybar/style/colors-border.css
similarity index 100%
rename from config/waybar/style/style-colors-border.css
rename to config/waybar/style/colors-border.css
diff --git a/config/waybar/style/style-colors-line.css b/config/waybar/style/colors-line.css
similarity index 100%
rename from config/waybar/style/style-colors-line.css
rename to config/waybar/style/colors-line.css
diff --git a/config/waybar/style/style-colors.css b/config/waybar/style/colors.css
similarity index 100%
rename from config/waybar/style/style-colors.css
rename to config/waybar/style/colors.css
diff --git a/config/waybar/style/style-dark.css b/config/waybar/style/dark.css
similarity index 100%
rename from config/waybar/style/style-dark.css
rename to config/waybar/style/dark.css
diff --git a/config/waybar/style/style-light.css b/config/waybar/style/light.css
similarity index 100%
rename from config/waybar/style/style-light.css
rename to config/waybar/style/light.css
diff --git a/config/waybar/style/style-pywal.css b/config/waybar/style/pywal.css
similarity index 100%
rename from config/waybar/style/style-pywal.css
rename to config/waybar/style/pywal.css
diff --git a/config/waybar/style/style-Purple.css b/config/waybar/style/style-Purple.css
deleted file mode 100644
index 4af09af..0000000
--- a/config/waybar/style/style-Purple.css
+++ /dev/null
@@ -1,216 +0,0 @@
-/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* .............................................................................*/
-/* .............................    Purple    .............................. */
-/* ............................................................................ */
-/* --- 👍 designed by https://github.com/Krautt  👍 --- */
-
-*{
-	font-family: "JetBrains Mono Nerd Font";
-	font-weight: bold;
-	min-height: 0;
-	/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
-	font-size: 98%;
-	font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-	padding: 1px;
-	}
-	
-	window#waybar {
-		background: #100214;
-		border-radius: 1px;
-		color: #cba6f7;
-	}
-	
-	window#waybar.hidden {
-		opacity: 0.5;
-	}
-	window#waybar.empty {
-		background-color: transparent;
-		background: #100214;
-	}
-	
-	window#waybar.empty #window {
-	   padding: 0px;
-	   margin: 0px;
-	   border: 0px;
-	   /*  background-color: rgba(66,66,66,0.5); */ /* transparent */
-	   background-color: transparent;
-	}
-	  
-	   
-	tooltip {
-		background: #1e1e2e;
-		border-radius: 10px;
-		border-width: 2px;
-		border-style: solid;
-		border-color: #11111b;
-		color: #cba6f7;
-	}
-	/*-----module groups----*/
-	.modules-right {
-		border: 5px solid #20052a;
-		border-radius: 5px 0px 0px 5px;
-		background-color: #3d174b;
-		padding-right: 2px;
-		padding-left: 2px;
-	}
-	
-	.modules-center {
-		/*background-color: #1e1e2e;*/
-	
-		
-	}
-	
-	.modules-left {
-		/*background-color: #1e1e2e;*/
-		border: 5px solid #20052a;
-		border-radius: 0px 0px 100px 0px;
-		background-color: #441a53;
-		padding-right: 2px;
-		padding-left: 2px;
-	   
-	}
-	
-	#workspaces button {
-		padding: 2px;
-		color: #6E6A86;
-		margin-right: 5px;
-	}
-	   
-	#workspaces button.active {
-		color: #cba6f7;
-		border-radius: 50%;
-		background-color: black;
-	}
-	  
-	#workspaces button.focused {
-		color: #d8dee9;
-	}
-	   
-	#workspaces button.urgent {
-		color: #11111b;
-		border-radius: 10px;
-	}
-		   
-	#workspaces button:hover {
-		color: #9CCFD8;
-		border-radius: 15px;
-	}
-
-
-	
-	#backlight,
-	#battery,
-	#bluetooth,
-	#cava,
-	#clock,
-	#cpu,
-	#disk,
-	#idle_inhibitor,
-	#keyboard-state label,
-	#keyboard-state label.locked,
-	#keyboard-state,
-	#memory,
-	#mode,
-	#mpd,
-	#network,
-	#pulseaudio,
-	#taskbar button,
-	#taskbar,
-	#temperature,
-	#tray,
-	#window,
-	#wireplumber,
-	#workspaces,
-	#custom-cycle_wall,
-	#custom-keybinds,
-	#custom-light_dark,
-	#custom-lock,
-	#custom-menu,
-	#custom-power_vertical,
-	#custom-power,
-	#custom-spotify,
-	#custom-updater,
-	#custom-weather,
-	#custom-weather.clearNight,
-	#custom-weather.cloudyFoggyDay,
-	#custom-weather.cloudyFoggyNight,
-	#custom-weather.default 
-	#custom-weather.rainyDay,
-	#custom-weather.rainyNight,
-	#custom-weather.severe,
-	#custom-weather.showyIcyDay,
-	#custom-weather.snowyIcyNight,
-	#custom-weather.sunnyDay {
-		color:whitesmoke;
-		padding: 0px 10px;
-		
-	}
-		 
-	#temperature.critical {
-		background-color: #ff0000;
-	}
-	   
-	@keyframes blink {
-		to {
-		color: #000000;
-		   }
-	}
-	   
-	#taskbar button.active {
-		background-color: purple;
-	}
-		   
-	#battery.critical:not(.charging) {
-		color: #f53c3c;
-		animation-name: blink;
-		animation-duration: 0.5s;
-		animation-timing-function: linear;
-		animation-iteration-count: infinite;
-		animation-direction: alternate;
-	}
-	
-	#pulseaudio-slider slider {
-		min-width: 0px;
-		min-height: 0px;
-		opacity: 0;
-		background-image: none;
-		border: none;
-		box-shadow: none;
-	}
-	
-	#pulseaudio-slider trough {
-		min-width: 80px;  
-		min-height: 5px; 
-		border-radius: 5px;
-		background-color: #22252a;
-	}
-	
-	#pulseaudio-slider highlight {
-		min-height: 10px; 
-		border-radius: 5px;
-		background-color: purple;
-	}
-
-	#backlight-slider slider {
-		min-width: 0px;
-		min-height: 0px;
-		opacity: 0;
-		background-image: none;
-		border: none;
-		box-shadow: none;
-	}
-	
-	#backlight-slider trough {
-		min-width: 80px;  
-		min-height: 10px; 
-		border-radius: 5px;
-		background-color: #22252a;
-	}
-	
-	#backlight-slider highlight {
-		min-width: 10px; 
-		border-radius: 5px;
-		background-color: purple;
-	}
-	
-	
\ No newline at end of file