diff --git a/.install/general-packages.sh b/.install/general-packages.sh
index 3f11279..1f910ac 100644
--- a/.install/general-packages.sh
+++ b/.install/general-packages.sh
@@ -11,14 +11,11 @@ packagesPacman=(
     "chromium" 
     "dunst" 
     "starship"
-    "neovim" 
     "mpv" 
     "freerdp" 
-    "xfce4-power-manager" 
     "thunar" 
     "mousepad"
     "noto-fonts" 
-    "ttf-font-awesome"
     "otf-font-awesome" 
     "ttf-fira-sans" 
     "ttf-fira-code" 
@@ -32,11 +29,9 @@ packagesPacman=(
     "python-click" 
     "pavucontrol" 
     "tumbler" 
-    "xautolock" 
     "blueman"
     "papirus-icon-theme"
     "polkit-gnome"
-    "qalculate-gtk"
     "brightnessctl"
     "gum"
     "man-pages"
@@ -54,3 +49,7 @@ packagesYay=(
     "trizen"
     "pacseek"
 );
+
+# Removed packages
+# "xfce4-power-manager" 
+# "ttf-font-awesome"
diff --git a/.install/qtile-packages.sh b/.install/qtile-packages.sh
index 865fcf4..7d3675e 100644
--- a/.install/qtile-packages.sh
+++ b/.install/qtile-packages.sh
@@ -9,6 +9,7 @@ packagesPacman=(
     "python-dbus-next"
     "python-iwlib"
     "xclip"
+    "xautolock" 
 );
 
 packagesYay=(
diff --git a/waybar/modules.json b/waybar/modules.json
index b9b16c2..774840c 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -358,6 +358,7 @@
         "icon": false,
     },
 
+    // Idle Inhibator
     "idle_inhibitor": {
         "format": "{icon}",
         "tooltip": true,
diff --git a/waybar/themes/assets/ml4w-icon.png b/waybar/themes/assets/ml4w-icon.png
new file mode 100644
index 0000000..92a54e0
Binary files /dev/null and b/waybar/themes/assets/ml4w-icon.png differ
diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css
index f907226..da18725 100644
--- a/waybar/themes/ml4w-blur/style.css
+++ b/waybar/themes/ml4w-blur/style.css
@@ -185,7 +185,7 @@ window#waybar.empty #window {
 
 #custom-ml4w-welcome {
     margin-right: 15px;
-    background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png");
+    background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css
index ebc0e17..42edc59 100644
--- a/waybar/themes/ml4w/style.css
+++ b/waybar/themes/ml4w/style.css
@@ -186,7 +186,7 @@ window#waybar.empty #window {
 
 #custom-ml4w-welcome {
     margin-right: 15px;
-    background-image: url("../../../hypr/apps/ml4w-welcome/src/icon-small.png");
+    background-image: url("../assets/ml4w-icon.png");
     background-repeat: no-repeat;
     background-position: center;
     padding-right: 24px;
@@ -196,7 +196,7 @@ window#waybar.empty #window {
  * Idle Inhibator
  * ----------------------------------------------------- */
 
- #idle_inhibitor {
+#idle_inhibitor {
     margin-right: 15px;
     font-size: 22px;
     font-weight: bold;
diff --git a/waybar/themes/starter/config b/waybar/themes/starter/config
index d45dbe7..1dfd1a9 100644
--- a/waybar/themes/starter/config
+++ b/waybar/themes/starter/config
@@ -34,7 +34,9 @@
         "custom/settings",
         "custom/waybarthemes",
         "custom/wallpaper",
+        // START TASK TOOGLE
         // "wlr/taskbar",
+        // END TASK TOOGLE
         "group/quicklinks",
         "hyprland/window",
         "custom/starter"
@@ -49,12 +51,23 @@
     "modules-right": [
         "custom/updates",
         "pulseaudio",
+        // START BT TOOGLE
         "bluetooth",
+        // END BT TOOGLE
         "battery", 
+        // START NETWORK TOOGLE
         "network",
+        // END NETWORK TOOGLE
         "group/hardware",
         "custom/cliphist",
+        // START IDLE TOOGLE
+        "idle_inhibitor",
+        // END IDLE TOOGLE
+        // START TRAY TOOGLE
+        "tray",
+        // END TRAY TOOGLE
         "custom/exit",
+        "custom/ml4w-welcome",
         "clock"
     ]
 }
diff --git a/waybar/themes/starter/modules.json b/waybar/themes/starter/modules.json
index 76aad7f..593d16e 100644
--- a/waybar/themes/starter/modules.json
+++ b/waybar/themes/starter/modules.json
@@ -56,15 +56,6 @@
         "separate-outputs": true
     },
 
-    // Youtube Subscriber Count
-    "custom/youtube": {
-        "format": " {}",
-        "exec": "python ~/private/youtube.py",
-        "restart-interval": 600,
-        "on-click": "chromium https://studio.youtube.com",
-        "tooltip": false
-    },
-    
     // Cliphist
     "custom/cliphist": {
         "format": "",
@@ -86,7 +77,7 @@
         "tooltip": false
     },
 
-    // Wallpaper
+    // Theme Starter Label
     "custom/starter": {
         "format": "THEME STARTER",
         "tooltip": false
@@ -128,27 +119,20 @@
         "tooltip": false
     },
 
-    // Outlook Launcher
-    "custom/outlook": {
-        "format": "",
-        "on-click": "chromium --app=https://outlook.office.com/mail/",
-        "tooltip": false
-    },
-
-    // Teams Launcher
-    "custom/teams": {
-        "format": "",
-        "on-click": "chromium --app=https://teams.microsoft.com/go",
-        "tooltip": false
-    },
-
     // Browser Launcher
     "custom/browser": {
         "format": "",
-        "on-click": "chromium",
+        "on-click": "~/dotfiles/.settings/browser.sh",
         "tooltip": false
     },    
 
+    // ML4W Welcome App
+    "custom/ml4w-welcome": {
+        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+        "format": " ",
+        "tooltip": false
+    },
+
     // ChatGPT Launcher
     "custom/chatgpt": {
         "format": "",
@@ -156,20 +140,6 @@
         "tooltip": false
     },
 
-    // Calculator
-    "custom/calculator": {
-        "format": "",
-        "on-click": "qalculate-gtk",
-        "tooltip": false
-    },
-
-    // Windows VM
-    "custom/windowsvm": {
-        "format": "",
-        "on-click": "~/dotfiles/scripts/launchvm.sh",
-        "tooltip": false
-    },
-
     // Rofi Application Launcher
     "custom/appmenu": {
         "format": "Apps",
@@ -344,5 +314,16 @@
         "format": "{user}",
         "interval": 60,
         "icon": false,
+    },
+
+    // Idle Inhibator
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "tooltip": true,
+        "format-icons":{
+            "activated": "",
+            "deactivated": ""
+        },
+        "on-click-right": "swaylock"        
     }
 }
diff --git a/waybar/themes/starter/style.css b/waybar/themes/starter/style.css
index f1ae480..4224494 100644
--- a/waybar/themes/starter/style.css
+++ b/waybar/themes/starter/style.css
@@ -150,31 +150,60 @@ window#waybar.empty #window {
  * 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-waybarthemes {
-     margin-right: 23px;
-     font-size: 20px;
-     font-weight: bold;
-     color: @iconcolor;
- }
+#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-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    color: @iconcolor;
+}
  
  #custom-waybarthemes,#custom-system {
      margin-right:15px;
  }
 
+
+ #custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+/* -----------------------------------------------------
+ * 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
  * ----------------------------------------------------- */