diff --git a/waybar/themes/meow-blur-laptop/colored/config.sh b/waybar/themes/meow-blur-laptop/colored/config.sh
new file mode 100644
index 0000000..0da6448
--- /dev/null
+++ b/waybar/themes/meow-blur-laptop/colored/config.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="MEOW Blur Colored Laptop"
diff --git a/waybar/themes/ml4w-blur/colored/style.css b/waybar/themes/meow-blur-laptop/colored/style.css
similarity index 73%
rename from waybar/themes/ml4w-blur/colored/style.css
rename to waybar/themes/meow-blur-laptop/colored/style.css
index f9008da..414f780 100644
--- a/waybar/themes/ml4w-blur/colored/style.css
+++ b/waybar/themes/meow-blur-laptop/colored/style.css
@@ -8,9 +8,9 @@
 @define-color workspacesbackground1 @color5;
 @define-color workspacesbackground2 @color11;
 @define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
+@define-color textcolor1 @foreground;
+@define-color textcolor2 @foreground;
+@define-color textcolor3 @foreground;
+@define-color iconcolor @foreground;
 
 @import '../style.css';
diff --git a/waybar/themes/meow-blur-laptop/config b/waybar/themes/meow-blur-laptop/config
new file mode 100644
index 0000000..4c4f19f
--- /dev/null
+++ b/waybar/themes/meow-blur-laptop/config
@@ -0,0 +1,127 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+[{
+    // General Settings
+    "layer": "top",
+    "output": ["eDP-1", "DP-1"],
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenuicon",
+        "hyprland/workspaces",
+        //"custom/appmenu",
+        //"group/settings",
+        "wlr/taskbar",
+        //"group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    "modules-center": [
+       "group/time"
+    ],
+
+    // Modules Right
+    "modules-right": [
+        "custom/updates",
+        "group/hardware",
+        "group/hardware2",
+        "battery",
+        "battery#charging",
+        "tray",
+        "group/power"
+    ]
+}, {
+    // General Settings
+    "layer": "top",
+    "output": ["HDMI-A-1"],
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenuicon",
+        "hyprland/workspaces",
+        "wlr/taskbar",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    // "modules-center": [
+    //    "clock"
+    // ],
+
+    // Modules Right
+    "modules-right": [
+        "tray",
+        "custom/events"
+    ]
+},{
+    // General Settings
+    "layer": "top",
+    "output": ["DP-2"],
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/themes/meow-blur/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenuicon",
+        "hyprland/workspaces",
+        //"custom/appmenu",
+        //"group/settings",
+        "wlr/taskbar",
+        //"group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    "modules-center": [
+       "custom/events"
+    ],
+
+    // Modules Right
+    "modules-right": [
+        "custom/updates",
+        "group/hardware",
+        "group/hardware2",
+        "battery",
+        "battery#charging",
+        "tray",
+        "group/power"
+    ]
+},]
+
diff --git a/waybar/themes/meow-blur-laptop/mixed/config.sh b/waybar/themes/meow-blur-laptop/mixed/config.sh
new file mode 100644
index 0000000..07851d6
--- /dev/null
+++ b/waybar/themes/meow-blur-laptop/mixed/config.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="MEOW Blur Mixed Laptop"
diff --git a/waybar/themes/ml4w-blur/mixed/style.css b/waybar/themes/meow-blur-laptop/mixed/style.css
similarity index 100%
rename from waybar/themes/ml4w-blur/mixed/style.css
rename to waybar/themes/meow-blur-laptop/mixed/style.css
diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/meow-blur-laptop/style.css
similarity index 65%
rename from waybar/themes/ml4w-blur/style.css
rename to waybar/themes/meow-blur-laptop/style.css
index 65787f5..63db309 100644
--- a/waybar/themes/ml4w-blur/style.css
+++ b/waybar/themes/meow-blur-laptop/style.css
@@ -1,32 +1,33 @@
 /*
- * __        __          _                  ____  _         _       
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
- *                 |___/                              |___/         
- *  
- * by Stephan Raabe (2023) 
- * ----------------------------------------------------- 
+ * __        __          _                  ____  _         _
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___|
+ *                 |___/                              |___/
+ *
+ * by Stephan Raabe (2023)
+ * -----------------------------------------------------
 */
 
 /* -----------------------------------------------------
- * Import Pywal colors 
+ * Import Pywal colors
  * ----------------------------------------------------- */
 /* @import 'style-light.css'; */
 
 /* -----------------------------------------------------
- * General 
+ * General
  * ----------------------------------------------------- */
 
 * {
-    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-family: "Fira Code Nerd Font", "Noto Sans CJK SC";
+    font-weight: 700;
     border: none;
     border-radius: 0px;
 }
 
 window#waybar {
-    background-color: rgba(0,0,0,0.2);
+    background-color: rgba(0,0,0,0.1);
     border-bottom: 0px solid #ffffff;
     /* color: #FFFFFF; */
     transition-property: background-color;
@@ -34,49 +35,58 @@ window#waybar {
 }
 
 /* -----------------------------------------------------
- * Workspaces 
+ * Workspaces
  * ----------------------------------------------------- */
 
 #workspaces {
     background: @workspacesbackground1;
-    margin: 5px 1px 6px 1px;
+    margin: 8px 10px 8px 0px;
     padding: 0px 1px;
-    border-radius: 15px;
+    border-radius: 10px;
     border: 0px;
     font-weight: bold;
     font-style: normal;
     opacity: 0.8;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor1;
 }
 
 #workspaces button {
     padding: 0px 5px;
-    margin: 4px 3px;
+    margin: 3px;
     border-radius: 15px;
     border: 0px;
     color: @textcolor1;
-    background-color: @workspacesbackground2;
+    background: @workspacesbackground2;
     transition: all 0.3s ease-in-out;
     opacity: 0.4;
 }
 
+#workspaces button.empty {
+    border-radius: 15px;
+    border: 0px;
+    color: @textcolor1;
+    background: transparent;
+    transition: all 0.3s ease-in-out;
+    opacity: 0.5;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 10px;
+    opacity:0.7;
+}
+
 #workspaces button.active {
     color: @textcolor1;
     background: @workspacesbackground2;
     border-radius: 15px;
-    min-width: 40px;
+    min-width: 30px;
     transition: all 0.3s ease-in-out;
     opacity:1.0;
 }
 
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-    opacity:0.7;
-}
-
 /* -----------------------------------------------------
  * Tooltips
  * ----------------------------------------------------- */
@@ -98,12 +108,13 @@ tooltip label {
  * ----------------------------------------------------- */
 
 #window {
+    font-family: "Fira Code Semibold";
     background: @backgroundlight;
-    margin: 8px 15px 8px 0px;
-    padding: 2px 10px 0px 10px;
-    border-radius: 12px;
+    margin: 8px 10px 8px 0px;
+    padding: 0px 8px 0px 8px;
+    border-radius: 10px;
     color:@textcolor2;
-    font-size:16px;
+    font-size: 14px;
     font-weight:normal;
     opacity:0.8;
 }
@@ -118,9 +129,9 @@ window#waybar.empty #window {
 
 #taskbar {
     background: @backgroundlight;
-    margin: 6px 15px 6px 0px;
+    margin: 8px 10px 8px 0px;
     padding:0px;
-    border-radius: 15px;
+    border-radius: 10px;
     font-weight: normal;
     font-style: normal;
     opacity:0.8;
@@ -129,42 +140,36 @@ window#waybar.empty #window {
 
 #taskbar button {
     margin:0;
-    border-radius: 15px;
+    border-radius: 10px;
     padding: 0px 5px 0px 5px;
+    opacity: 0.7;
 }
 
-/* -----------------------------------------------------
- * Modules
- * ----------------------------------------------------- */
-
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0;
+#taskbar button.active {
+    background: @workspacesbackground2;
+    border-radius: 10px;
+    opacity:1.0;
 }
 
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0;
-}
 
 /* -----------------------------------------------------
  * Custom Quicklinks
  * ----------------------------------------------------- */
 
-#custom-brave, 
-#custom-browser, 
-#custom-keybindings, 
-#custom-outlook, 
-#custom-filemanager, 
-#custom-teams, 
-#custom-chatgpt, 
-#custom-calculator, 
-#custom-windowsvm, 
-#custom-cliphist, 
-#custom-wallpaper, 
-#custom-settings, 
-#custom-wallpaper, 
+#custom-brave,
+#custom-browser,
+#custom-keybindings,
+#custom-outlook,
+#custom-filemanager,
+#custom-teams,
+#custom-chatgpt,
+#custom-calculator,
+#custom-windowsvm,
+#custom-cliphist,
+#custom-wallpaper,
+#custom-settings,
+#custom-wallpaper,
 #custom-system,
-#custom-hyprshade,
-#custom-hypridle,
 #custom-waybarthemes {
     margin-right: 23px;
     font-size: 20px;
@@ -173,22 +178,6 @@ window#waybar.empty #window {
     color: @iconcolor;
 }
 
-#custom-hyprshade {
-    margin-right:12px;
-}
-
-#custom-hypridle {
-    margin-right:18px;
-}
-
-#custom-hypridle.active {
-    color: @iconcolor;
-}
-
-#custom-hypridle.notactive {
-    color: #dc2f2f;
-}
-
 #custom-system {
     margin-right:15px;
 }
@@ -202,23 +191,15 @@ window#waybar.empty #window {
 }
 
 #custom-ml4w-welcome {
-    margin-right: 12px;
+    margin-right: 15px;
     background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
 }
 
-#custom-ml4w-hyprland-settings {
-    margin-right: 12px;
-    background-image: url("../assets/hyprland-icon.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 16px;
-}
-
 #custom-chatgpt {
-    margin-right: 12px;
+    margin-right: 15px;
     background-image: url("../assets/ai-icon-20.png");
     background-repeat: no-repeat;
     background-position: center;
@@ -230,15 +211,15 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #idle_inhibitor {
-    margin-right: 17px;
-    font-size: 20px;
+    margin-right: 15px;
+    font-size: 16px;
     font-weight: bold;
     opacity: 0.8;
     color: @iconcolor;
 }
 
 #idle_inhibitor.activated {
-    margin-right: 15px;
+    margin-right: 10px;
     font-size: 20px;
     font-weight: bold;
     opacity: 0.8;
@@ -249,15 +230,20 @@ window#waybar.empty #window {
  * Custom Modules
  * ----------------------------------------------------- */
 
-#custom-appmenu {
+#custom-appmenu, #custom-appmenuicon {
     background-color: @backgrounddark;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor1;
-    border-radius: 15px;
+    border-radius: 10px;
     padding: 0px 10px 0px 10px;
-    margin: 8px 14px 8px 14px;
+    margin: 8px 10px 8px 10px;
     opacity:0.8;
-    border:3px solid @bordercolor;
+    /* border:3px solid @bordercolor; */
+}
+
+#custom-appmenuicon {
+    padding-right: 12px;
+    padding-left: 8px;
 }
 
 /* -----------------------------------------------------
@@ -265,10 +251,13 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #custom-exit {
-    margin: 0px 20px 0px 0px;
-    padding:0px;
-    font-size:20px;
+    margin: 8px 10px 8px 0px;
+    padding:0px 14px 0px 10px;
+    font-size: 14px;
     color: @iconcolor;
+    background: @backgrounddark;
+    border-radius: 10px;
+    opacity: 0.8;
 }
 
 /* -----------------------------------------------------
@@ -277,11 +266,11 @@ window#waybar.empty #window {
 
 #custom-updates {
     background-color: @backgroundlight;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
+    border-radius: 10px;
     padding: 2px 10px 0px 10px;
-    margin: 8px 15px 8px 0px;
+    margin: 8px 10px 8px 0px;
     opacity:0.8;
 }
 
@@ -305,9 +294,9 @@ window#waybar.empty #window {
 
 #custom-youtube {
     background-color: @backgroundlight;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
+    border-radius: 10px;
     padding: 2px 10px 0px 10px;
     margin: 8px 15px 8px 0px;
     opacity:0.8;
@@ -317,11 +306,43 @@ window#waybar.empty #window {
  * Hardware Group
  * ----------------------------------------------------- */
 
- #disk,#memory,#cpu,#language {
-    margin:0px;
-    padding:0px;
-    font-size:16px;
-    color:@iconcolor;
+ /* #disk,#memory,#cpu,#language {
+    background-color: @backgroundlight;
+    font-size: 14px;
+    color: @textcolor2;
+    border-radius: 10px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+} */
+
+/* #cpu {
+    color: @color2;
+} */
+
+#cpu.warning,#memory.warning{
+    color: #ff9800;
+}
+
+#cpu.critical,#memory.warning{
+    color: #f44336;
+}
+
+#hardware,#hardware2 {
+    background-color: @backgroundlight;
+    font-size: 14px;
+    color: @textcolor2;
+    border-radius: 10px;
+    padding: 0px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#custom-div {
+    font-weight: 900;
+    padding: 0px 2px;
+    color: @color2;
+    font-size: 18px;
 }
 
 #language {
@@ -333,14 +354,25 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #clock {
-    background-color: @backgrounddark;
-    font-size: 16px;
+    background-color: @backgroundlight;
+    font-size: 14px;
     color: @textcolor1;
-    border-radius: 15px;
-    padding: 1px 10px 0px 10px;
-    margin: 8px 15px 8px 0px;
+    border-radius: 10px;
+    padding: 0px 8px 0px 8px;
+    margin: 8px 10px 8px 0px;
     opacity:0.8;
-    border:3px solid @bordercolor;   
+    /* border:3px solid @bordercolor; */
+}
+
+#custom-events {
+    background-color: @backgroundlight;
+    font-size: 14px;
+    color: @textcolor1;
+    border-radius: 10px;
+    padding: 0px 8px 0px 8px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+    /* border:3px solid @bordercolor; */
 }
 
 /* -----------------------------------------------------
@@ -348,41 +380,51 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #pulseaudio {
-    background-color: @backgroundlight;
-    font-size: 16px;
+    /* background-color: @backgroundlight; */
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 8px 15px 8px 0px;
-    opacity:0.8;
+    /* border-radius: 10px; */
+    /* padding: 0px 10px 0px 10px; */
+    /* margin: 8px 10px 8px 0px; */
+    /* opacity:0.8; */
 }
 
 #pulseaudio.muted {
-    background-color: @backgrounddark;
+    /* background-color: @backgrounddark; */
     color: @textcolor1;
 }
 
+#systems {
+    background-color: @backgroundlight;
+    font-size: 14px;
+    color: @textcolor2;
+    border-radius: 10px;
+    padding: 0px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
 /* -----------------------------------------------------
  * Network
  * ----------------------------------------------------- */
 
 #network {
-    background-color: @backgroundlight;
-    font-size: 16px;
+    /* background-color: @backgroundlight; */
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 8px 15px 8px 0px;
-    opacity:0.8;
+    /* border-radius: 10px; */
+    /* padding: 2px 2px 0px 10px; */
+    /* margin: 8px 10px 8px 0px; */
+    /* opacity:0.8; */
 }
 
 #network.ethernet {
-    background-color: @backgroundlight;
+    /* background-color: @backgroundlight; */
     color: @textcolor2;
 }
 
 #network.wifi {
-    background-color: @backgroundlight;
+    /* background-color: @backgroundlight; */
     color: @textcolor2;
 }
 
@@ -392,12 +434,12 @@ window#waybar.empty #window {
 
  #bluetooth, #bluetooth.on, #bluetooth.connected {
     background-color: @backgroundlight;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
+    border-radius: 10px;
     padding: 2px 10px 0px 10px;
-    margin: 8px 15px 8px 0px;
-    opacity:0.8;
+    margin: 8px 10px 8px 0px;
+    /* opacity:0.8; */
 }
 
 #bluetooth.off {
@@ -412,11 +454,11 @@ window#waybar.empty #window {
 
 #battery {
     background-color: @backgroundlight;
-    font-size: 16px;
+    font-size: 14px;
     color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 15px 0px 10px;
-    margin: 8px 15px 8px 0px;
+    border-radius: 10px;
+    padding: 0px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
     opacity:0.8;
 }
 
@@ -447,8 +489,13 @@ window#waybar.empty #window {
  * ----------------------------------------------------- */
 
 #tray {
-    padding: 0px 15px 0px 0px;
+    padding: 0px 10px 0px 10px;
     color: @textcolor3;
+    background-color: @backgroundlight;
+    font-size: 14px;
+    border-radius: 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
 }
 
 #tray > .passive {
diff --git a/waybar/themes/meow-blur/modules.json b/waybar/themes/meow-blur/modules.json
index 6f69101..f67f986 100644
--- a/waybar/themes/meow-blur/modules.json
+++ b/waybar/themes/meow-blur/modules.json
@@ -468,5 +468,18 @@
         "exec": "python3 ~/dotfiles/scripts/waybar-khal.py",
         "return-type": "json",
         "on-click-right": "vdirsyncer sync"
+    },
+
+    "group/time": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },
+        "modules": [
+            "clock",
+            "custom/events"
+        ]
     }
 }
diff --git a/waybar/themes/ml4w-blur-bottom/black/config.sh b/waybar/themes/ml4w-blur-bottom/black/config.sh
deleted file mode 100644
index cea609a..0000000
--- a/waybar/themes/ml4w-blur-bottom/black/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom Black"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/black/style.css b/waybar/themes/ml4w-blur-bottom/black/style.css
deleted file mode 100644
index 2ec68f9..0000000
--- a/waybar/themes/ml4w-blur-bottom/black/style.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #000000;
-@define-color backgrounddark #000000;
-@define-color workspacesbackground1 #000000;
-@define-color workspacesbackground2 #222222;
-@define-color bordercolor #000000;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #000000;
-@define-color iconcolor #000000;
-
-@import '../../ml4w-blur/style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-dark.png");
-}
diff --git a/waybar/themes/ml4w-blur-bottom/colored/config.sh b/waybar/themes/ml4w-blur-bottom/colored/config.sh
deleted file mode 100644
index 7f55337..0000000
--- a/waybar/themes/ml4w-blur-bottom/colored/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom Colored"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/colored/style.css b/waybar/themes/ml4w-blur-bottom/colored/style.css
deleted file mode 100644
index de0b369..0000000
--- a/waybar/themes/ml4w-blur-bottom/colored/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color5;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 @color5;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w-blur/style.css';
diff --git a/waybar/themes/ml4w-blur-bottom/config b/waybar/themes/ml4w-blur-bottom/config
deleted file mode 100644
index 4b9fdf2..0000000
--- a/waybar/themes/ml4w-blur-bottom/config
+++ /dev/null
@@ -1,56 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-{
-    // General Settings
-    "position": "bottom",
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenu",
-        "group/links",
-        "group/settings",
-        //"wlr/taskbar",
-        "group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-        "hyprland/workspaces"
-    ],
-
-    // Modules Right    
-    "modules-right": [
-        "custom/updates",
-        "pulseaudio",
-        "bluetooth",
-        "battery", 
-        "network",
-        "group/hardware",
-        "custom/cliphist",
-        "custom/hypridle",
-        "custom/hyprshade",
-        "tray",
-        "custom/exit",
-        "custom/ml4w-welcome",
-        "clock"
-    ]
-}
diff --git a/waybar/themes/ml4w-blur-bottom/dark/config.sh b/waybar/themes/ml4w-blur-bottom/dark/config.sh
deleted file mode 100644
index df6f8c2..0000000
--- a/waybar/themes/ml4w-blur-bottom/dark/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom Dark"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/dark/style.css b/waybar/themes/ml4w-blur-bottom/dark/style.css
deleted file mode 100644
index 54e8317..0000000
--- a/waybar/themes/ml4w-blur-bottom/dark/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor @color8;
-
-@import '../../ml4w-blur/style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
diff --git a/waybar/themes/ml4w-blur-bottom/light/config.sh b/waybar/themes/ml4w-blur-bottom/light/config.sh
deleted file mode 100644
index da067d2..0000000
--- a/waybar/themes/ml4w-blur-bottom/light/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom Light"
diff --git a/waybar/themes/ml4w-blur-bottom/light/style.css b/waybar/themes/ml4w-blur-bottom/light/style.css
deleted file mode 100644
index 5caa16a..0000000
--- a/waybar/themes/ml4w-blur-bottom/light/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 @color11;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w-blur/style.css';
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/mixed/config.sh b/waybar/themes/ml4w-blur-bottom/mixed/config.sh
deleted file mode 100644
index dea299a..0000000
--- a/waybar/themes/ml4w-blur-bottom/mixed/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom Mixed"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/mixed/style.css b/waybar/themes/ml4w-blur-bottom/mixed/style.css
deleted file mode 100644
index fe8dbb3..0000000
--- a/waybar/themes/ml4w-blur-bottom/mixed/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w-blur/style.css';
diff --git a/waybar/themes/ml4w-blur-bottom/white/config.sh b/waybar/themes/ml4w-blur-bottom/white/config.sh
deleted file mode 100644
index 1592654..0000000
--- a/waybar/themes/ml4w-blur-bottom/white/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Bottom White"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur-bottom/white/style.css b/waybar/themes/ml4w-blur-bottom/white/style.css
deleted file mode 100644
index 04c725d..0000000
--- a/waybar/themes/ml4w-blur-bottom/white/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 #CCCCCC;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #000000;
-@define-color textcolor2 #000000;
-@define-color textcolor3 #000000;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w-blur/style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
diff --git a/waybar/themes/ml4w-blur/black/config.sh b/waybar/themes/ml4w-blur/black/config.sh
deleted file mode 100644
index 5c6fb05..0000000
--- a/waybar/themes/ml4w-blur/black/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Black"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/black/style.css b/waybar/themes/ml4w-blur/black/style.css
deleted file mode 100644
index ab90c15..0000000
--- a/waybar/themes/ml4w-blur/black/style.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #000000;
-@define-color backgrounddark #000000;
-@define-color workspacesbackground1 #000000;
-@define-color workspacesbackground2 #222222;
-@define-color bordercolor #000000;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #000000;
-@define-color iconcolor #000000;
-
-@import '../style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-dark.png");
-}
diff --git a/waybar/themes/ml4w-blur/colored/config.sh b/waybar/themes/ml4w-blur/colored/config.sh
deleted file mode 100644
index 7338fef..0000000
--- a/waybar/themes/ml4w-blur/colored/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Colored"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/config b/waybar/themes/ml4w-blur/config
deleted file mode 100644
index 8009d43..0000000
--- a/waybar/themes/ml4w-blur/config
+++ /dev/null
@@ -1,56 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-{
-    // General Settings
-    "layer": "top",
-    "margin-top": 0,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenu",
-        "group/links",
-        "group/settings",
-        //"wlr/taskbar",
-        "group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-        "hyprland/workspaces"
-    ],
-
-    // Modules Right    
-    "modules-right": [
-        "custom/updates",
-        "pulseaudio",
-        "bluetooth",
-        "battery", 
-        "network",
-        "group/hardware",
-        "custom/cliphist",
-        "custom/hypridle",
-        "custom/hyprshade",
-        "tray",
-        "custom/exit",
-        "custom/ml4w-welcome",
-        "clock"
-    ]
-}
diff --git a/waybar/themes/ml4w-blur/dark/config.sh b/waybar/themes/ml4w-blur/dark/config.sh
deleted file mode 100644
index a3b9e88..0000000
--- a/waybar/themes/ml4w-blur/dark/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Dark"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/dark/style.css b/waybar/themes/ml4w-blur/dark/style.css
deleted file mode 100644
index 8470788..0000000
--- a/waybar/themes/ml4w-blur/dark/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor @color8;
-
-@import '../style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
diff --git a/waybar/themes/ml4w-blur/light/config.sh b/waybar/themes/ml4w-blur/light/config.sh
deleted file mode 100644
index ca5fe11..0000000
--- a/waybar/themes/ml4w-blur/light/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Light"
diff --git a/waybar/themes/ml4w-blur/light/style.css b/waybar/themes/ml4w-blur/light/style.css
deleted file mode 100644
index 738cd66..0000000
--- a/waybar/themes/ml4w-blur/light/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 @color11;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../style.css';
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/mixed/config.sh b/waybar/themes/ml4w-blur/mixed/config.sh
deleted file mode 100644
index eb698ad..0000000
--- a/waybar/themes/ml4w-blur/mixed/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur Mixed"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/white/config.sh b/waybar/themes/ml4w-blur/white/config.sh
deleted file mode 100644
index e458b19..0000000
--- a/waybar/themes/ml4w-blur/white/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Blur White"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-blur/white/style.css b/waybar/themes/ml4w-blur/white/style.css
deleted file mode 100644
index 3e8f2fb..0000000
--- a/waybar/themes/ml4w-blur/white/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 #CCCCCC;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #000000;
-@define-color textcolor2 #000000;
-@define-color textcolor3 #000000;
-@define-color iconcolor #FFFFFF;
-
-@import '../style.css';
-
-window#waybar {
-    background-color: rgba(255,255,255,0.1);
-}
diff --git a/waybar/themes/ml4w-bottom/black/config.sh b/waybar/themes/ml4w-bottom/black/config.sh
deleted file mode 100644
index 5837eb6..0000000
--- a/waybar/themes/ml4w-bottom/black/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Black Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/black/style.css b/waybar/themes/ml4w-bottom/black/style.css
deleted file mode 100644
index ff14a02..0000000
--- a/waybar/themes/ml4w-bottom/black/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #000000;
-@define-color backgrounddark #000000;
-@define-color workspacesbackground1 #000000;
-@define-color workspacesbackground2 #222222;
-@define-color bordercolor #000000;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #000000;
-@define-color iconcolor #000000;
-
-@import '../../ml4w/style.css';
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-dark.png");
-}
diff --git a/waybar/themes/ml4w-bottom/colored/config.sh b/waybar/themes/ml4w-bottom/colored/config.sh
deleted file mode 100644
index 0a31bac..0000000
--- a/waybar/themes/ml4w-bottom/colored/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Colored Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/colored/style.css b/waybar/themes/ml4w-bottom/colored/style.css
deleted file mode 100644
index 53bf65c..0000000
--- a/waybar/themes/ml4w-bottom/colored/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color5;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 @color5;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w/style.css';
diff --git a/waybar/themes/ml4w-bottom/config b/waybar/themes/ml4w-bottom/config
deleted file mode 100644
index 935fe98..0000000
--- a/waybar/themes/ml4w-bottom/config
+++ /dev/null
@@ -1,56 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-{
-    // General Settings
-    "position": "bottom",
-    "margin-top": 0,
-    "margin-bottom": 14,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenu",
-        "group/links",
-        "group/settings",
-        //"wlr/taskbar",
-        "group/quicklinks",
-        "hyprland/window"
-    ],
-
-    // Modules Center
-    "modules-center": [
-        "hyprland/workspaces",
-        "custom/empty"
-    ],
-
-    // Modules Right    
-    "modules-right": [
-        "custom/updates",
-        "pulseaudio",
-        "bluetooth",
-        "battery", 
-        "network",
-        "group/hardware",
-        "custom/cliphist",
-        "custom/hypridle",
-        "custom/hyprshade",
-        "tray",
-        "custom/exit",
-        "custom/ml4w-welcome",
-        "clock"
-    ]
-}
diff --git a/waybar/themes/ml4w-bottom/dark/config.sh b/waybar/themes/ml4w-bottom/dark/config.sh
deleted file mode 100644
index a6fe8ff..0000000
--- a/waybar/themes/ml4w-bottom/dark/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Dark Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/dark/style.css b/waybar/themes/ml4w-bottom/dark/style.css
deleted file mode 100644
index 2179f76..0000000
--- a/waybar/themes/ml4w-bottom/dark/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor @color8;
-
-@import '../../ml4w/style.css';
diff --git a/waybar/themes/ml4w-bottom/light/config.sh b/waybar/themes/ml4w-bottom/light/config.sh
deleted file mode 100644
index e016502..0000000
--- a/waybar/themes/ml4w-bottom/light/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Light Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/light/style.css b/waybar/themes/ml4w-bottom/light/style.css
deleted file mode 100644
index 833b8c4..0000000
--- a/waybar/themes/ml4w-bottom/light/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 @color11;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w/style.css';
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/mixed/config.sh b/waybar/themes/ml4w-bottom/mixed/config.sh
deleted file mode 100644
index e5bc67e..0000000
--- a/waybar/themes/ml4w-bottom/mixed/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Mixed Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/mixed/style.css b/waybar/themes/ml4w-bottom/mixed/style.css
deleted file mode 100644
index f3ee832..0000000
--- a/waybar/themes/ml4w-bottom/mixed/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w/style.css';
diff --git a/waybar/themes/ml4w-bottom/white/config.sh b/waybar/themes/ml4w-bottom/white/config.sh
deleted file mode 100644
index 71dd9f5..0000000
--- a/waybar/themes/ml4w-bottom/white/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W White Bottom"
\ No newline at end of file
diff --git a/waybar/themes/ml4w-bottom/white/style.css b/waybar/themes/ml4w-bottom/white/style.css
deleted file mode 100644
index 69eb8de..0000000
--- a/waybar/themes/ml4w-bottom/white/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 #CCCCCC;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #000000;
-@define-color textcolor2 #000000;
-@define-color textcolor3 #000000;
-@define-color iconcolor #FFFFFF;
-
-@import '../../ml4w/style.css';
diff --git a/waybar/themes/ml4w-minimal/README.md b/waybar/themes/ml4w-minimal/README.md
deleted file mode 100644
index ed806a7..0000000
--- a/waybar/themes/ml4w-minimal/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Waybar Theme Starter
-
-Create your own Waybar Theme based on this starter theme.
-
-- Copy the folder "~/dotfiles/waybar/themes/starter" and define a custom folder name
-- Open config.sh and enter the name of your new theme
-- Select the theme with the Waybar Themeswitcher with <kbd>SUPER</kbd>+<kbd>CTRL</kbd>+<kbd>T</kbd>
-- Start your customization
-
-You can enable, disable and reorder waybar modules in the config file. 
-
-Your custom theme will not be overwritten with an update of the dotfiles.
\ No newline at end of file
diff --git a/waybar/themes/ml4w-minimal/config b/waybar/themes/ml4w-minimal/config
deleted file mode 100644
index bb8ef1d..0000000
--- a/waybar/themes/ml4w-minimal/config
+++ /dev/null
@@ -1,54 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-{
-    // General Settings
-    "layer": "top",
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenuicon",
-        "hyprland/workspaces",
-        "group/links",
-        "group/settings",
-        "group/quicklinks"
-    ],
-
-    // Modules Center
-    "modules-center": [
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Right    
-    "modules-right": [
-        "custom/updates",
-        "pulseaudio",
-        "bluetooth",
-        "battery", 
-        "network",
-        "group/hardware",
-        "custom/cliphist",
-        "custom/hypridle",
-        "custom/hyprshade",
-        "custom/exit",
-        "clock",
-        "tray",
-        "custom/ml4w-welcome"
-    ]
-}
diff --git a/waybar/themes/ml4w-minimal/config.sh b/waybar/themes/ml4w-minimal/config.sh
deleted file mode 100644
index eac2047..0000000
--- a/waybar/themes/ml4w-minimal/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Minimal"
diff --git a/waybar/themes/ml4w-minimal/style.css b/waybar/themes/ml4w-minimal/style.css
deleted file mode 100644
index 55da7c5..0000000
--- a/waybar/themes/ml4w-minimal/style.css
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * __        __          _                  ____  _         _       
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
- *                 |___/                              |___/         
- *  
- * by Stephan Raabe (2023) 
- * ----------------------------------------------------- 
-*/
-
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-/* @import 'style-light.css'; */
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 #CCCCCC;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #000000;
-@define-color textcolor2 #000000;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-/* -----------------------------------------------------
- * General 
- * ----------------------------------------------------- */
-
-* {
-    font-family: "Fira Sans semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    border: none;
-    border-radius: 0px;
-}
-
-window#waybar {
-    background-color: rgba(0,0,0,0.4);
-    border-bottom: 0px solid #ffffff;
-    /* color: #FFFFFF; */
-    transition-property: background-color;
-    transition-duration: .5s;
-}
-
-/* -----------------------------------------------------
- * Workspaces 
- * ----------------------------------------------------- */
-
- #workspaces {
-    margin: 3px 7px 3px 3px;
-    border: 0px;
-    font-size: 14px;
-    color: @textcolor1;
-}
-
-#workspaces button {
-    border: 0px;
-    margin:4px 5px 4px 0px;
-    padding:0px 4px 0px 4px;
-    color: @textcolor3;
-    transition: all 0.5s ease-in-out;
-}
-
-#workspaces button.active {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-}
-
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-}
-
-/* -----------------------------------------------------
- * Tooltips
- * ----------------------------------------------------- */
-
-tooltip {
-    border-radius: 10px;
-    background-color: @backgroundlight;
-    opacity:0.8;
-    padding:20px;
-    margin:0px;
-}
-
-tooltip label {
-    color: @textcolor2;
-}
-
-/* -----------------------------------------------------
- * Window
- * ----------------------------------------------------- */
-
-#window {
-    margin: 0px 15px 0px 0px;
-    border-radius: 12px;
-    color:@textcolor;
-    font-size:14px;
-    font-weight:normal;
-}
-
-window#waybar.empty #window {
-    background-color:transparent;
-}
-
-/* -----------------------------------------------------
- * Modules
- * ----------------------------------------------------- */
-
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0;
-}
-
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0;
-}
-
-/* -----------------------------------------------------
- * Custom Quicklinks
- * ----------------------------------------------------- */
-
-#custom-brave, 
-#custom-browser, 
-#custom-keybindings, 
-#custom-outlook, 
-#custom-filemanager, 
-#custom-teams, 
-#custom-chatgpt, 
-#custom-calculator, 
-#custom-windowsvm, 
-#custom-cliphist, 
-#custom-wallpaper, 
-#custom-settings, 
-#custom-wallpaper, 
-#custom-system,
-#custom-hyprshade,
-#custom-hypridle,
-#custom-waybarthemes {
-    margin-right: 23px;
-    font-size: 14px;
-    font-weight: bold;
-    color: @iconcolor;
-}
-
-#custom-hyprshade {
-    margin-right:12px;
-}
-
-#custom-hypridle {
-    margin-right:16px;
-}
-
-#custom-hypridle.active {
-    color: @iconcolor;
-}
-
-#custom-hypridle.notactive {
-    color: #dc2f2f;
-}
-
-#custom-settings {
-    margin-right: 15px;
-}
-
-#custom-browser {
-    margin-right: 16px;
-}
-
-#custom-wallpaper {
-    margin-right: 14px;
-}
-
-#custom-chatgpt {
-    margin-right: 10px;
-    background-image: url("../assets/ai-icon-20.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 23px;
-}
-
-#custom-waybarthemes,#custom-system {
-    margin-right:15px;
-}
-
-
-#custom-ml4w-welcome {
-    margin-right: 15px;
-    background-image: url("../assets/ml4w-icon-20.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 24px;
-}
-
-#custom-ml4w-hyprland-settings {
-    margin-right: 12px;
-    background-image: url("../assets/hyprland-icon-20.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 16px;
-}
-
-
-/* -----------------------------------------------------
- * Idle Inhibator
- * ----------------------------------------------------- */
-
- #idle_inhibitor {
-    margin-right: 15px;
-    font-size: 16px;
-    font-weight: bold;
-    color: @iconcolor;
-}
-
-#idle_inhibitor.activated {
-    margin-right: 15px;
-    font-size: 14px;
-    font-weight: bold;
-    color: #dc2f2f;
-}
-
-/* -----------------------------------------------------
- * Custom Modules
- * ----------------------------------------------------- */
-
-#custom-appmenuicon {
-    font-size: 20px;
-    color: @textcolor;
-    margin: 0px 15px 0px 10px;
-}
-
-/* -----------------------------------------------------
- * Custom Exit
- * ----------------------------------------------------- */
-
-#custom-exit {
-    margin: 0px 20px 0px 0px;
-    padding:0px;
-    font-size:16px;
-    color: @iconcolor;
-}
-
-/* -----------------------------------------------------
- * Custom Updates
- * ----------------------------------------------------- */
-
-#custom-updates {
-    font-size: 14px;
-    color: @textcolor;
-    border-radius: 15px;
-    margin: 0px 15px 0px 0px;
-}
-
-#custom-updates.green {
-}
-
-#custom-updates.yellow {
-    color: #ff9a3c;
-}
-
-#custom-updates.red {
-    color: #dc2f2f;
-}
-
-/* -----------------------------------------------------
- * Custom Youtube
- * ----------------------------------------------------- */
-
-#custom-youtube {
-    background-color: @backgroundlight;
-    font-size: 14px;
-    color: @textcolor2;
-    border-radius: 15px;
-    margin: 0px 15px 0px 0px;
-}
-
-/* -----------------------------------------------------
- * Hardware Group
- * ----------------------------------------------------- */
-
- #disk,#memory,#cpu,#language {
-    margin:0px;
-    padding:0px;
-    font-size:14px;
-    color:@iconcolor;
-}
-
-#language {
-    margin-right:10px;
-}
-
-/* -----------------------------------------------------
- * Clock
- * ----------------------------------------------------- */
-
-#clock {
-    font-size: 15px;
-    color: @textcolor;
-    margin: 0px 15px 0px 0px;
-}
-
-/* -----------------------------------------------------
- * Pulseaudio
- * ----------------------------------------------------- */
-
-#pulseaudio {
-    font-size: 14px;
-    color: @textcolor;
-    border-radius: 15px;
-    margin: 0px 15px 0px 0px;
-}
-
-#pulseaudio.muted {
-    color: @textcolor;
-}
-
-/* -----------------------------------------------------
- * Network
- * ----------------------------------------------------- */
-
-#network {
-    font-size: 14px;
-    color: @textcolor;
-    border-radius: 15px;
-    margin: 0px 15px 0px 0px;
-}
-
-#network.ethernet {
-    color: @textcolor;
-}
-
-#network.wifi {
-    color: @textcolor;
-}
-
-/* -----------------------------------------------------
- * Bluetooth
- * ----------------------------------------------------- */
-
- #bluetooth, #bluetooth.on, #bluetooth.connected {
-    font-size: 14px;
-    color: @textcolor;
-    border-radius: 15px;
-    margin: 10px 15px 10px 0px;
-}
-
-#bluetooth.off {
-    background-color: transparent;
-    padding: 0px;
-    margin: 0px;
-}
-
-/* -----------------------------------------------------
- * Battery
- * ----------------------------------------------------- */
-
-#battery {
-    font-size: 14px;
-    color: @textcolor;
-    border-radius: 15px;
-    margin: 10px 15px 10px 0px;
-}
-
-#battery.charging, #battery.plugged {
-    color: @textcolor;
-}
-
-@keyframes blink {
-    to {
-        background-color: @backgroundlight;
-        color: @textcolor2;
-    }
-}
-
-#battery.critical:not(.charging) {
-    color: #f53c3c;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-/* -----------------------------------------------------
- * Tray
- * ----------------------------------------------------- */
-
-#tray {
-    margin:0px 10px 0px 0px;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-}
-
-/* -----------------------------------------------------
- * Other
- * ----------------------------------------------------- */
-
-label:focus {
-    background-color: #000000;
-}
-
-#backlight {
-    background-color: #90b1b1;
-}
diff --git a/waybar/themes/ml4w/black/config.sh b/waybar/themes/ml4w/black/config.sh
deleted file mode 100644
index 39e19cb..0000000
--- a/waybar/themes/ml4w/black/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Black"
\ No newline at end of file
diff --git a/waybar/themes/ml4w/black/style.css b/waybar/themes/ml4w/black/style.css
deleted file mode 100644
index 641ab13..0000000
--- a/waybar/themes/ml4w/black/style.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
- @import '../../../../../.cache/wal/colors-waybar.css';
-
- @define-color backgroundlight #000000;
- @define-color backgrounddark #000000;
- @define-color workspacesbackground1 #000000;
- @define-color workspacesbackground2 #222222;
- @define-color bordercolor #000000;
- @define-color textcolor1 #FFFFFF;
- @define-color textcolor2 #FFFFFF;
- @define-color textcolor3 #000000;
- @define-color iconcolor #000000;
- 
- @import '../style.css';
- 
- #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-dark.png");
-}
diff --git a/waybar/themes/ml4w/colored/config.sh b/waybar/themes/ml4w/colored/config.sh
deleted file mode 100644
index 25dbee7..0000000
--- a/waybar/themes/ml4w/colored/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Colored"
\ No newline at end of file
diff --git a/waybar/themes/ml4w/colored/style.css b/waybar/themes/ml4w/colored/style.css
deleted file mode 100644
index f9008da..0000000
--- a/waybar/themes/ml4w/colored/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color5;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 @color5;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../style.css';
diff --git a/waybar/themes/ml4w/config b/waybar/themes/ml4w/config
deleted file mode 100644
index ded798e..0000000
--- a/waybar/themes/ml4w/config
+++ /dev/null
@@ -1,56 +0,0 @@
-// __        __          _                 
-// \ \      / /_ _ _   _| |__   __ _ _ __  
-//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
-//   \ V  V / (_| | |_| | |_) | (_| | |    
-//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
-//                 |___/                   
-//  
-// by Stephan Raabe (2023) 
-// ----------------------------------------------------- 
-//
-{
-    // General Settings
-    "layer": "top",
-    "margin-top": 14,
-    "margin-bottom": 0,
-    "layer": "top",
-    "margin-left": 0,
-    "margin-right": 0,    
-    "spacing": 0,
-
-    // Load Modules
-    "include": ["~/dotfiles/waybar/modules.json"],
-
-    // Modules Left
-    "modules-left": [
-        "custom/appmenu",
-        "group/links",
-        "group/settings",
-        //"wlr/taskbar",
-        "group/quicklinks",
-        "hyprland/window",
-        "custom/empty"
-    ],
-
-    // Modules Center
-    "modules-center": [
-        "hyprland/workspaces"
-    ],
-
-    // Modules Right    
-    "modules-right": [
-        "custom/updates",
-        "pulseaudio",
-        "bluetooth",
-        "battery", 
-        "network",
-        "group/hardware",
-        "custom/cliphist",
-        "custom/hypridle",
-        "custom/hyprshade",
-        "tray",
-        "custom/exit",
-        "custom/ml4w-welcome",
-        "clock"
-    ]
-}
diff --git a/waybar/themes/ml4w/dark/config.sh b/waybar/themes/ml4w/dark/config.sh
deleted file mode 100644
index 6c2cf9f..0000000
--- a/waybar/themes/ml4w/dark/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Dark"
\ No newline at end of file
diff --git a/waybar/themes/ml4w/dark/style.css b/waybar/themes/ml4w/dark/style.css
deleted file mode 100644
index 9e0e318..0000000
--- a/waybar/themes/ml4w/dark/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor @color8;
-
-@import '../style.css';
diff --git a/waybar/themes/ml4w/light/config.sh b/waybar/themes/ml4w/light/config.sh
deleted file mode 100644
index 55e4ffd..0000000
--- a/waybar/themes/ml4w/light/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Light"
diff --git a/waybar/themes/ml4w/light/style.css b/waybar/themes/ml4w/light/style.css
deleted file mode 100644
index 738cd66..0000000
--- a/waybar/themes/ml4w/light/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight #FFFFFF;
-@define-color backgrounddark @color11;
-@define-color workspacesbackground1 #FFFFFF;
-@define-color workspacesbackground2 @color11;
-@define-color bordercolor #FFFFFF;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 @color11;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../style.css';
\ No newline at end of file
diff --git a/waybar/themes/ml4w/mixed/config.sh b/waybar/themes/ml4w/mixed/config.sh
deleted file mode 100644
index c00e231..0000000
--- a/waybar/themes/ml4w/mixed/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W Mixed"
\ No newline at end of file
diff --git a/waybar/themes/ml4w/mixed/style.css b/waybar/themes/ml4w/mixed/style.css
deleted file mode 100644
index 09032ae..0000000
--- a/waybar/themes/ml4w/mixed/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-@import '../../../../../.cache/wal/colors-waybar.css';
-
-@define-color backgroundlight @color8;
-@define-color backgrounddark #FFFFFF;
-@define-color workspacesbackground1 @color8;
-@define-color workspacesbackground2 #FFFFFF;
-@define-color bordercolor @color8;
-@define-color textcolor1 @color8;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
-
-@import '../style.css';
diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css
deleted file mode 100644
index 64a4620..0000000
--- a/waybar/themes/ml4w/style.css
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * __        __          _                  ____  _         _       
- * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
- *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
- *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
- *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
- *                 |___/                              |___/         
- *  
- * by Stephan Raabe (2023) 
- * ----------------------------------------------------- 
-*/
-
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
-/* @import 'style-light.css'; */
-
-/* -----------------------------------------------------
- * General 
- * ----------------------------------------------------- */
-
-* {
-    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    border: none;
-    border-radius: 0px;
-}
-
-window#waybar {
-    background-color: rgba(0,0,0,0.8);
-    border-bottom: 0px solid #ffffff;
-    /* color: #FFFFFF; */
-    background: transparent;
-    transition-property: background-color;
-    transition-duration: .5s;
-}
-
-/* -----------------------------------------------------
- * Workspaces 
- * ----------------------------------------------------- */
-
-#workspaces {
-    background: @workspacesbackground1;
-    margin: 2px 1px 3px 1px;
-    padding: 0px 1px;
-    border-radius: 15px;
-    border: 0px;
-    font-weight: bold;
-    font-style: normal;
-    opacity: 0.8;
-    font-size: 16px;
-    color: @textcolor1;
-}
-
-#workspaces button {
-    padding: 0px 5px;
-    margin: 4px 3px;
-    border-radius: 15px;
-    border: 0px;
-    color: @textcolor1;
-    background-color: @workspacesbackground2;
-    transition: all 0.3s ease-in-out;
-    opacity: 0.4;
-}
-
-#workspaces button.active {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-    min-width: 40px;
-    transition: all 0.3s ease-in-out;
-    opacity:1.0;
-}
-
-#workspaces button:hover {
-    color: @textcolor1;
-    background: @workspacesbackground2;
-    border-radius: 15px;
-    opacity:0.7;
-}
-
-/* -----------------------------------------------------
- * Tooltips
- * ----------------------------------------------------- */
-
-tooltip {
-    border-radius: 10px;
-    background-color: @backgroundlight;
-    opacity:0.8;
-    padding:20px;
-    margin:0px;
-}
-
-tooltip label {
-    color: @textcolor2;
-}
-
-/* -----------------------------------------------------
- * Window
- * ----------------------------------------------------- */
-
-#window {
-    background: @backgroundlight;
-    margin: 5px 15px 5px 0px;
-    padding: 2px 10px 0px 10px;
-    border-radius: 12px;
-    color:@textcolor2;
-    font-size:16px;
-    font-weight:normal;
-    opacity:0.8;
-}
-
-window#waybar.empty #window {
-    background-color:transparent;
-}
-
-/* -----------------------------------------------------
- * Taskbar
- * ----------------------------------------------------- */
-
-#taskbar {
-    background: @backgroundlight;
-    margin: 3px 15px 3px 0px;
-    padding:0px;
-    border-radius: 15px;
-    font-weight: normal;
-    font-style: normal;
-    opacity:0.8;
-    border: 3px solid @backgroundlight;
-}
-
-#taskbar button {
-    margin:0;
-    border-radius: 15px;
-    padding: 0px 5px 0px 5px;
-}
-
-/* -----------------------------------------------------
- * Modules
- * ----------------------------------------------------- */
-
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0;
-}
-
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0;
-}
-
-/* -----------------------------------------------------
- * Custom Quicklinks
- * ----------------------------------------------------- */
-
-#custom-brave, 
-#custom-browser, 
-#custom-keybindings, 
-#custom-outlook, 
-#custom-filemanager, 
-#custom-teams, 
-#custom-chatgpt, 
-#custom-calculator, 
-#custom-windowsvm, 
-#custom-cliphist, 
-#custom-wallpaper, 
-#custom-settings, 
-#custom-wallpaper, 
-#custom-system,
-#custom-hyprshade,
-#custom-hypridle,
-#custom-waybarthemes {
-    margin-right: 23px;
-    font-size: 20px;
-    font-weight: bold;
-    opacity: 0.8;
-    color: @iconcolor;
-}
-
-#custom-hyprshade {
-    margin-right:12px;
-}
-
-#custom-hypridle {
-    margin-right:18px;
-}
-
-#custom-hypridle.active {
-    color: @iconcolor;
-}
-
-#custom-hypridle.notactive {
-    color: #dc2f2f;
-}
-
-#custom-system {
-    margin-right:15px;
-}
-
-#custom-wallpaper {
-    margin-right:25px;
-}
-
-#custom-waybarthemes, #custom-settings {
-    margin-right:20px;
-}
-
-#custom-chatgpt {
-    margin-right: 12px;
-    background-image: url("../assets/ai-icon.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 24px;
-}
-
-#custom-ml4w-welcome {
-    margin-right: 12px;
-    background-image: url("../assets/ml4w-icon.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 24px;
-}
-
-#custom-ml4w-hyprland-settings {
-    margin-right: 12px;
-    background-image: url("../assets/hyprland-icon.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    padding-right: 16px;
-}
-
-/* -----------------------------------------------------
- * Idle Inhibator
- * ----------------------------------------------------- */
-
-#idle_inhibitor {
-    margin-right: 15px;
-    font-size: 22px;
-    font-weight: bold;
-    opacity: 0.8;
-    color: @iconcolor;
-}
-
-#idle_inhibitor.activated {
-    margin-right: 15px;
-    font-size: 20px;
-    font-weight: bold;
-    opacity: 0.8;
-    color: #dc2f2f;
-}
-
-/* -----------------------------------------------------
- * Custom Modules
- * ----------------------------------------------------- */
-
-#custom-appmenu, #custom-appmenuwlr {
-    background-color: @backgrounddark;
-    font-size: 16px;
-    color: @textcolor1;
-    border-radius: 15px;
-    padding: 0px 10px 0px 10px;
-    margin: 3px 15px 3px 14px;
-    opacity:0.8;
-    border:3px solid @bordercolor;
-}
-
-/* -----------------------------------------------------
- * Custom Exit
- * ----------------------------------------------------- */
-
-#custom-exit {
-    margin: 0px 20px 0px 0px;
-    padding:0px;
-    font-size:20px;
-    color: @iconcolor;
-}
-
-/* -----------------------------------------------------
- * Custom Updates
- * ----------------------------------------------------- */
-
-#custom-updates {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-#custom-updates.green {
-    background-color: @backgroundlight;
-}
-
-#custom-updates.yellow {
-    background-color: #ff9a3c;
-    color: #FFFFFF;
-}
-
-#custom-updates.red {
-    background-color: #dc2f2f;
-    color: #FFFFFF;
-}
-
-/* -----------------------------------------------------
- * Custom Youtube
- * ----------------------------------------------------- */
-
-#custom-youtube {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-/* -----------------------------------------------------
- * Hardware Group
- * ----------------------------------------------------- */
-
-#disk,#memory,#cpu,#language {
-    margin:0px;
-    padding:0px;
-    font-size:16px;
-    color:@iconcolor;
-}
-
-#language {
-    margin-right:10px;
-}
-
-/* -----------------------------------------------------
- * Clock
- * ----------------------------------------------------- */
-
-#clock {
-    background-color: @backgrounddark;
-    font-size: 16px;
-    color: @textcolor1;
-    border-radius: 15px;
-    padding: 1px 10px 0px 10px;
-    margin: 3px 15px 3px 0px;
-    opacity:0.8;
-    border:3px solid @bordercolor;   
-}
-
-/* -----------------------------------------------------
- * Pulseaudio
- * ----------------------------------------------------- */
-
-#pulseaudio {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-#pulseaudio.muted {
-    background-color: @backgrounddark;
-    color: @textcolor1;
-}
-
-/* -----------------------------------------------------
- * Network
- * ----------------------------------------------------- */
-
-#network {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-#network.ethernet {
-    background-color: @backgroundlight;
-    color: @textcolor2;
-}
-
-#network.wifi {
-    background-color: @backgroundlight;
-    color: @textcolor2;
-}
-
-/* -----------------------------------------------------
- * Bluetooth
- * ----------------------------------------------------- */
-
-#bluetooth, #bluetooth.on, #bluetooth.connected {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 10px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-#bluetooth.off {
-    background-color: transparent;
-    padding: 0px;
-    margin: 0px;
-}
-
-/* -----------------------------------------------------
- * Battery
- * ----------------------------------------------------- */
-
-#battery {
-    background-color: @backgroundlight;
-    font-size: 16px;
-    color: @textcolor2;
-    border-radius: 15px;
-    padding: 2px 15px 0px 10px;
-    margin: 5px 15px 5px 0px;
-    opacity:0.8;
-}
-
-#battery.charging, #battery.plugged {
-    color: @textcolor2;
-    background-color: @backgroundlight;
-}
-
-@keyframes blink {
-    to {
-        background-color: @backgroundlight;
-        color: @textcolor2;
-    }
-}
-
-#battery.critical:not(.charging) {
-    background-color: #f53c3c;
-    color: @textcolor3;
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: linear;
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-/* -----------------------------------------------------
- * Tray
- * ----------------------------------------------------- */
-
-#tray {
-    padding: 0px 15px 0px 0px;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-}
-
-
diff --git a/waybar/themes/ml4w/white/config.sh b/waybar/themes/ml4w/white/config.sh
deleted file mode 100644
index 685088f..0000000
--- a/waybar/themes/ml4w/white/config.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-theme_name="ML4W White"
\ No newline at end of file
diff --git a/waybar/themes/ml4w/white/style.css b/waybar/themes/ml4w/white/style.css
deleted file mode 100644
index 83c474f..0000000
--- a/waybar/themes/ml4w/white/style.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -----------------------------------------------------
- * Import Pywal colors 
- * ----------------------------------------------------- */
- @import '../../../../../.cache/wal/colors-waybar.css';
-
- @define-color backgroundlight #FFFFFF;
- @define-color backgrounddark #FFFFFF;
- @define-color workspacesbackground1 #FFFFFF;
- @define-color workspacesbackground2 #CCCCCC;
- @define-color bordercolor #FFFFFF;
- @define-color textcolor1 #000000;
- @define-color textcolor2 #000000;
- @define-color textcolor3 #000000;
- @define-color iconcolor #FFFFFF;
- 
- @import '../style.css';
- 
\ No newline at end of file