Separated waybar workspaces modules to "shorten" a bit the main waybar modules file

36 files changed, 373 insertions, 257 deletions

diff --git a/config/hypr/v2.3.5 b/config/hypr/v2.3.5-D
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.5
+++ b/config/hypr/v2.3.5-D
diff --git a/config/waybar/modules b/config/waybar/Modules
index 15cc42cc..0b8b6da2 100644
--- a/config/waybar/modules
+++ b/config/waybar/Modules
@@ -3,6 +3,7 @@
 
 {
 
+/* NOTE: hyprland-workspaces on a separate file */
 // Weather and Temperature Modules as this is most like to change always. 
 // Result is of course easier to edit
 "custom/weather": {
@@ -49,205 +50,7 @@
 	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
 
-// HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
-// CIRCLES Style
-"hyprland/workspaces": {
-	"active-only": false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"show-special": false,
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent-workspaces": {
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": [],
-	},
-	"format-icons": {
-		"active": "",
-		"default": "",
-	},
-},
-// ROMAN Numerals style
-"hyprland/workspaces#roman": {
-	"active-only": false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"show-special": false,
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent-workspaces": {
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": [],
-	},
-	"format-icons": {
-		"1": "I",
-		"2": "II",
-		"3": "III",
-		"4": "IV",
-		"5": "V",
-		"6": "VI",
-		"7": "VII",
-		"8": "VIII",
-		"9": "IX",
-		"10": "X",
-	},
-},
-// PACMAN Style
-"hyprland/workspaces#pacman": {
-	"active-only": false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"show-special": false,
-	"persistent-workspaces": {
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": [],
-	},
-	"format": "{icon}",
-	"format-icons": {
-            "active": "<span font='12'>󰮯</span>",
-            "empty": "<span font='8'></span>",
-            "default": "󰊠",
-	},
-},
-// Kanji / Japanese style
-"hyprland/workspaces#kanji": {
-	"disable-scroll": true,
-	"show-special": false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"persistent-workspaces": {
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": [],
-	},
-	"format-icons": {
-		"1": "一",
-		"2": "二",
-		"3": "三",
-		"4": "四",
-		"5": "五",
-		"6": "六",
-		"7": "七",
-		"8": "八",
-		"9": "九",
-		"10": "十",
-	}
-},
-//  NUMBERS and ICONS style
-"hyprland/workspaces#4": {
-	"format": "{name}",
-	"format": " {name} {icon} ",
-	//"format": " {icon} ",
-	"show-special": false,
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"all-outputs": true,
-	"sort-by-number": true,
-	"format-icons": {
-		"1": " ",
-		"2": " ",
-		"3": " ",
-		"4": " ",
-		"5": " ",
-		"6": " ",
-		"7": "",
-		"8": " ",
-		"9": "",
-		"10": "10",
-		"focused": "",
-		"default": "",
-	},
-},
-// NUMBERS and ICONS style with window rewrite
-"hyprland/workspaces#rw": {
-	"disable-scroll": true,
-	"all-outputs": true,
-	"warp-on-scroll": false,
-	"sort-by-number": true,
-	"show-special": false,
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"format": "{icon} {windows}",
-	"format-window-separator": " ",
-	"window-rewrite-default": " ",
-	"window-rewrite": {
-		"title<.*youtube.*>": " ",
-		"title<.*amazon.*>": " ",
-		"title<.*reddit.*>": " ",
-		"title<.*Picture-in-Picture.*>": " ",
-		"class<firefox>": " ",
-		"class<org.mozilla.firefox>": " ",
-		"class<kitty>": " ",
-		"class<kitty-dropterm>": " ",
-		"class<konsole>": " ",
-		"class<Chromium>": "<span font='12'> </span>",
-		"class<org.telegram.desktop|io.github.tdesktop_x64.TDeskto>": "<span font='12'> </span>",
-		"class<[Ss]potify>": "<span font='12'> </span>",
-		"class<VSCode|code-url-handler>": "<span font='12'>󰨞</span>",
-		"class<thunar>": "󰝰 ",
-		"class<[Tt]hunderbird>": " ",
-		"class<discord>": " ",
-		"class<WebCord>": " ",
-		"class<subl>": "󰅳 ",
-		"class<celluloid>": " ",
-		"class<Cider>": "󰎆 ",
-		"class<virt-manager>": " ",
-		"class<code-oss>": "󰨞 ",
-		"class<codium|codium-url-handler|VSCodium>": "󰨞 ",
-		"class<codeblocks>": "󰅩 ",
-		"class<mousepad>": " ",
-		"class<libreoffice-writer>": " ",
-		"class<libreoffice-startcenter>": "󰏆 ",
-		"class<com.obsproject.Studio>": " "
-		}   
-},
-// for Camilla or Spanish
-"hyprland/workspaces#cam": {
-	"active-only":false,
-	"all-outputs": true,
-	"format": "{icon}",
-	"show-special": false,
-	"on-click": "activate",
-	"on-scroll-up": "hyprctl dispatch workspace e+1",
-	"on-scroll-down": "hyprctl dispatch workspace e-1",
-	"persistent-workspaces":{
-		"1": [],
-		"2": [],
-		"3": [],
-		"4": [],
-		"5": []
-	},
-		"format-icons": {
-		"1": "Uno",
-		"2": "Due",
-		"3": "Tre",
-		"4": "Quattro",
-		"5": "Cinque",
-		"6":"Sei",
-		"7":"Sette",
-		"8":"Otto",
-		"9":"Nove",
-		"10":"Dieci"
-	}	
-},
+
 // GROUP
 "group/motherboard": {
 	"orientation": "horizontal",
@@ -624,7 +427,7 @@
 	"scroll-step": 5,
 },
 "tray": {
-	"icon-size": 18,
+	"icon-size": 20,
 	"spacing": 4,
 },
 "wireplumber": {
diff --git a/config/waybar/ModulesWorkspaces b/config/waybar/ModulesWorkspaces
new file mode 100644
index 00000000..e7fc51c9
--- /dev/null
+++ b/config/waybar/ModulesWorkspaces
@@ -0,0 +1,209 @@
+//* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
+/* Waybar Workspaces modules */
+
+/* Generally, this is a potential expanding of choices for hyprland/workspace */
+
+{
+
+// HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
+// CIRCLES Style
+"hyprland/workspaces": {
+	"active-only": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"active": "",
+		"default": "",
+	},
+},
+// ROMAN Numerals style
+"hyprland/workspaces#roman": {
+	"active-only": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"1": "I",
+		"2": "II",
+		"3": "III",
+		"4": "IV",
+		"5": "V",
+		"6": "VI",
+		"7": "VII",
+		"8": "VIII",
+		"9": "IX",
+		"10": "X",
+	},
+},
+// PACMAN Style
+"hyprland/workspaces#pacman": {
+	"active-only": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"show-special": false,
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format": "{icon}",
+	"format-icons": {
+            "active": "<span font='12'>󰮯</span>",
+            "empty": "<span font='8'></span>",
+            "default": "󰊠",
+	},
+},
+// Kanji / Japanese style
+"hyprland/workspaces#kanji": {
+	"disable-scroll": true,
+	"show-special": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"1": "一",
+		"2": "二",
+		"3": "三",
+		"4": "四",
+		"5": "五",
+		"6": "六",
+		"7": "七",
+		"8": "八",
+		"9": "九",
+		"10": "十",
+	}
+},
+// for Camilla or Spanish
+"hyprland/workspaces#cam": {
+	"active-only":false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces":{
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": []
+	},
+		"format-icons": {
+		"1": "Uno",
+		"2": "Due",
+		"3": "Tre",
+		"4": "Quattro",
+		"5": "Cinque",
+		"6":"Sei",
+		"7":"Sette",
+		"8":"Otto",
+		"9":"Nove",
+		"10":"Dieci"
+	}	
+  },
+  
+//  NUMBERS and ICONS style
+"hyprland/workspaces#4": {
+	"format": "{name}",
+	"format": " {name} {icon} ",
+	//"format": " {icon} ",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"all-outputs": true,
+	"sort-by-number": true,
+	"format-icons": {
+		"1": " ",
+		"2": " ",
+		"3": " ",
+		"4": " ",
+		"5": " ",
+		"6": " ",
+		"7": "",
+		"8": " ",
+		"9": "",
+		"10": "10",
+		"focused": "",
+		"default": "",
+	},
+},
+// NUMBERS and ICONS style with window rewrite
+"hyprland/workspaces#rw": {
+	"disable-scroll": true,
+	"all-outputs": true,
+	"warp-on-scroll": false,
+	"sort-by-number": true,
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"format": "{icon} {windows}",
+	"format-window-separator": " ",
+	"window-rewrite-default": " ",
+	"window-rewrite": {
+		"title<.*youtube.*>": " ",
+		"title<.*amazon.*>": " ",
+		"title<.*reddit.*>": " ",
+		"title<.*Picture-in-Picture.*>": " ",
+		"class<firefox>": " ",
+		"class<org.mozilla.firefox>": " ",
+		"class<kitty>": " ",
+		"class<kitty-dropterm>": " ",
+		"class<konsole>": " ",
+		"class<Chromium>": "<span font='12'> </span>",
+		"class<org.telegram.desktop|io.github.tdesktop_x64.TDeskto>": "<span font='12'> </span>",
+		"class<[Ss]potify>": "<span font='12'> </span>",
+		"class<VSCode|code-url-handler>": "<span font='12'>󰨞</span>",
+		"class<thunar>": "󰝰 ",
+		"class<[Tt]hunderbird>": " ",
+		"class<discord>": " ",
+		"class<WebCord>": " ",
+		"class<subl>": "󰅳 ",
+		"class<celluloid>": " ",
+		"class<Cider>": "󰎆 ",
+		"class<virt-manager>": " ",
+		"class<code-oss>": "󰨞 ",
+		"class<codium|codium-url-handler|VSCodium>": "󰨞 ",
+		"class<codeblocks>": "󰅩 ",
+		"class<mousepad>": " ",
+		"class<libreoffice-writer>": " ",
+		"class<libreoffice-startcenter>": "󰏆 ",
+		"class<com.obsproject.Studio>": " "
+		}   
+	},
+
+}
\ No newline at end of file
diff --git a/config/waybar/config b/config/waybar/config
index 079ec33f..c25249db 120000
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1 +1 @@
-/home/ja/.config/waybar/configs/[TOP] Default Laptop_v2
\ No newline at end of file
+/home/ja/.config/waybar/configs/[TOP] Simple
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest
index 14377d57..87be19f0 100644
--- a/config/waybar/configs/[BOT & Left] SouthWest
+++ b/config/waybar/configs/[BOT & Left] SouthWest
@@ -3,7 +3,10 @@
 // ### BOTTOM and LEFT PANEL
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -44,7 +47,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "height": 650,
diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast
index 7d684c85..db367b9c 100644
--- a/config/waybar/configs/[BOT & Right] SouthEast
+++ b/config/waybar/configs/[BOT & Right] SouthEast
@@ -3,7 +3,10 @@
 // ### BOTTOM and RIGHT PANEL
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -44,7 +47,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "height": 650,
diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia
index 91595848..4fabb931 100644
--- a/config/waybar/configs/[BOT] Camellia
+++ b/config/waybar/configs/[BOT] Camellia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum
index 7aaad0d5..f3368015 100644
--- a/config/waybar/configs/[BOT] Chrysanthemum
+++ b/config/waybar/configs/[BOT] Chrysanthemum
@@ -5,7 +5,10 @@
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default
index c396277e..d2638258 100644
--- a/config/waybar/configs/[BOT] Default
+++ b/config/waybar/configs/[BOT] Default
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Bottom ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop
index 501e0c85..11e12da8 100644
--- a/config/waybar/configs/[BOT] Default Laptop
+++ b/config/waybar/configs/[BOT] Default Laptop
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Bottom - Laptop### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia
index 9ba6d3b5..9025edfc 100644
--- a/config/waybar/configs/[BOT] Gardenia
+++ b/config/waybar/configs/[BOT] Gardenia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony
index 4b548b89..306ff4f9 100644
--- a/config/waybar/configs/[BOT] Peony
+++ b/config/waybar/configs/[BOT] Peony
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[BOT] Simple b/config/waybar/configs/[BOT] Simple
index f2c0b883..ef5c30eb 100644
--- a/config/waybar/configs/[BOT] Simple
+++ b/config/waybar/configs/[BOT] Simple
@@ -2,7 +2,10 @@
 // ### TOP Simple ## //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top", 
 "position": "bottom", 
 //"mode": "dock",
diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index 6bb595bc..c79fd71f 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -3,7 +3,10 @@
 // Sleek 
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "bottom",
 "height": 14,
diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing
index a3381e8c..f44b97b2 100644
--- a/config/waybar/configs/[Left] WestWing
+++ b/config/waybar/configs/[Left] WestWing
@@ -3,7 +3,10 @@
 // ### LEFT PANEL ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "margin-top": 8,
diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing
index 5ce7be2e..c9860298 100644
--- a/config/waybar/configs/[Right] EastWing
+++ b/config/waybar/configs/[Right] EastWing
@@ -3,7 +3,10 @@
 // ### RIGHT PANEL ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "margin-top": 8,
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index 6e9cac28..3d419c22 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -3,7 +3,10 @@
 // ### DUAL TOP and BOTTOM ### //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -42,7 +45,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest
index 81f23066..dd03fd92 100644
--- a/config/waybar/configs/[TOP & Left] NorthWest
+++ b/config/waybar/configs/[TOP & Left] NorthWest
@@ -3,7 +3,10 @@
 // ### TOP and LEFT PANEL ## //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "width": 1200,
@@ -41,7 +44,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "left",
 "height": 650,
diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast
index 21bcb2c8..442c7886 100644
--- a/config/waybar/configs/[TOP & Right] NorthEast
+++ b/config/waybar/configs/[TOP & Right] NorthEast
@@ -3,7 +3,10 @@
 // ### TOP and Right PANEL ## //
 
 [{
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "width": 1200,
@@ -41,7 +44,10 @@
 },
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "right",
 "height": 650,
diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia
index ccb078fb..6cd1ee96 100644
--- a/config/waybar/configs/[TOP] Camellia
+++ b/config/waybar/configs/[TOP] Camellia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum
index 9d1c1050..a37ce210 100644
--- a/config/waybar/configs/[TOP] Chrysanthemum
+++ b/config/waybar/configs/[TOP] Chrysanthemum
@@ -5,7 +5,10 @@
 //* --- 👍 designed by https://github.com/Krautt  👍 --- */
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default
index 79ac0995..747fd9fe 100644
--- a/config/waybar/configs/[TOP] Default
+++ b/config/waybar/configs/[TOP] Default
@@ -2,7 +2,10 @@
 
 // ### DEFAULT - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 1521b824..02dd6169 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -2,7 +2,10 @@
 
 // ### DEFAULT Top -Laptop ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2
index 6ddab7d8..24d1a58b 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop_v2
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 (Laptop)  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3
index 84280402..80f4539b 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v3
+++ b/config/waybar/configs/[TOP] Default Laptop_v3
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 (Laptop)  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2
index 703cdee2..8a0b7a29 100644
--- a/config/waybar/configs/[TOP] Default_v2
+++ b/config/waybar/configs/[TOP] Default_v2
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v2 - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3
index cf0fc80d..0575aba1 100644
--- a/config/waybar/configs/[TOP] Default_v3
+++ b/config/waybar/configs/[TOP] Default_v3
@@ -2,7 +2,10 @@
 
 // ### DEFAULT v3  - Top ### //
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest
index 326764cb..67cf09c4 100644
--- a/config/waybar/configs/[TOP] Everforest
+++ b/config/waybar/configs/[TOP] Everforest
@@ -3,7 +3,10 @@
 // ### Everforest ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
@@ -24,7 +27,6 @@
 //	"mpris",
 	"custom/swaync",
 	"tray",
-	"mpris",
 	],
 "modules-center": [
 	"clock#forest",
diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia
index fff39648..b8aa3b70 100644
--- a/config/waybar/configs/[TOP] Gardenia
+++ b/config/waybar/configs/[TOP] Gardenia
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long
index 5e2e5425..e5ff1e28 100644
--- a/config/waybar/configs/[TOP] Minimal - Long
+++ b/config/waybar/configs/[TOP] Minimal - Long
@@ -3,7 +3,10 @@
 // ### Minimal - Long ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Minimal - Short b/config/waybar/configs/[TOP] Minimal - Short
index 99616d84..e080fbd5 100644
--- a/config/waybar/configs/[TOP] Minimal - Short
+++ b/config/waybar/configs/[TOP] Minimal - Short
@@ -3,7 +3,10 @@
 // ### Minimal -SHORT ### //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "top",
 "width": 1050,
diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony
index f35979d3..2ceb6473 100644
--- a/config/waybar/configs/[TOP] Peony
+++ b/config/waybar/configs/[TOP] Peony
@@ -6,7 +6,10 @@
 
 {
  
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 //"mode": "dock",
 "exclusive": true,
diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple
index 16b78ea3..fd51a06f 100644
--- a/config/waybar/configs/[TOP] Simple
+++ b/config/waybar/configs/[TOP] Simple
@@ -2,7 +2,10 @@
 // ### TOP Simple ## //
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top", 
 "position": "top", 
 //"mode": "dock",
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index c5d66fa8..12227bf5 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -2,7 +2,10 @@
 // Sleek
 
 {
-"include": "~/.config/waybar/modules",
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  ],
 "layer": "top",
 "position": "top",
 "height": 14,
diff --git a/config/waybar/style.css b/config/waybar/style.css
index a62ad095..a30c886b 120000
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1 +1 @@
-/home/ja/.config/waybar/style/[Dark] Latte-Wallust combined.css
\ No newline at end of file
+/home/ja/.config/waybar/style/[Colored] Translucent.css
\ No newline at end of file
diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css
index 91122fe2..674e585c 100644
--- a/config/waybar/wallust/colors-waybar.css
+++ b/config/waybar/wallust/colors-waybar.css
@@ -1,20 +1,20 @@
-@define-color foreground #EAF2FA;
-@define-color background rgba(5,5,7,0.25);
-@define-color cursor #EAF2FA;
+@define-color foreground #FDF1E6;
+@define-color background rgba(22,0,0,0.25);
+@define-color cursor #FDF1E6;
 
-@define-color color0 #050507;
-@define-color color1 #824616;
-@define-color color2 #7F481E;
-@define-color color3 #6A5C56;
-@define-color color4 #5D6879;
-@define-color color5 #586D87;
-@define-color color6 #92A4B4;
-@define-color color7 #D8E4EF;
-@define-color color8 #97A0A7;
-@define-color color9 #AD5D1E;
-@define-color color10 #A96027;
-@define-color color11 #8D7A72;
-@define-color color12 #7C8BA1;
-@define-color color13 #7591B4;
-@define-color color14 #C2DAF0;
-@define-color color15 #D8E4EF;
+@define-color color0 #1F0B09;
+@define-color color1 #A63D3A;
+@define-color color2 #1B6C77;
+@define-color color3 #236C77;
+@define-color color4 #8B6F77;
+@define-color color5 #9B6F77;
+@define-color color6 #BBA189;
+@define-color color7 #F4E2D3;
+@define-color color8 #AA9E93;
+@define-color color9 #DE514D;
+@define-color color10 #24909F;
+@define-color color11 #2F909F;
+@define-color color12 #BA949F;
+@define-color color13 #CF949F;
+@define-color color14 #F9D6B7;
+@define-color color15 #F4E2D3;