diff --git a/home/modules/hyprland/waybar-modules.jsonc b/home/modules/hyprland/waybar-modules.jsonc
deleted file mode 100644
index 91f0e41..0000000
--- a/home/modules/hyprland/waybar-modules.jsonc
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-  // Taskbar
-  "wlr/taskbar": {
-    "format": "{icon}",
-    "icon-size": 18,
-    "tooltip-format": "{title}",
-    "on-click": "activate",
-    "on-click-middle": "close",
-    "ignore-list": ["Alacritty"],
-    "app_ids-mapping": {
-      "firefoxdeveloperedition": "firefox-developer-edition",
-    },
-    "rewrite": {
-      "Firefox Web Browser": "Firefox",
-      "Foot Server": "Terminal",
-    },
-  },
-  // Hyprland Window
-  "hyprland/window": {
-    "rewrite": {
-      "(.*) - Brave": "$1",
-      "(.*) - Chromium": "$1",
-      "(.*) - Brave Search": "$1",
-      "(.*) - Outlook": "$1",
-      "(.*) Microsoft Teams": "$1",
-    },
-    "separate-outputs": true,
-  },
-  // ML4W Welcome App
-  "custom/ml4w-welcome": {
-    "on-click": "sleep 0.1 && ~/dotfiles/eww/ml4w-sidebar/launch.sh",
-    "on-click-right": "sleep 0.1 && ~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
-    "format": " ",
-    "tooltip": false,
-  },
-  // ML4W Welcome App
-  "custom/ml4w-hyprland-settings": {
-    "on-click": "~/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage",
-    "format": " ",
-    "tooltip": false,
-  },
-  // Empty
-  "custom/empty": {
-    "format": "",
-  },
-  // 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": "",
-    "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
-    "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
-    "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
-    "tooltip": false,
-  },
-  // Updates Count
-  "custom/updates": {
-    "format": "   {}",
-    "tooltip-format": "{}",
-    "escape": true,
-    "return-type": "json",
-    "exec": "~/dotfiles/scripts/updates.sh",
-    "restart-interval": 60,
-    "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
-    "on-click-right": "~/dotfiles/.settings/software.sh",
-    "tooltip": false,
-  },
-  // Wallpaper
-  "custom/wallpaper": {
-    "format": "",
-    "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
-    "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
-    "tooltip": false,
-  },
-  // Waybar Themes
-  "custom/waybarthemes": {
-    "format": "",
-    "on-click": "~/dotfiles/waybar/themeswitcher.sh",
-    "tooltip": false,
-  },
-  // Settings
-  "custom/settings": {
-    "format": "",
-    "on-click": "~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage",
-    "tooltip": false,
-  },
-  // Keybindings
-  "custom/keybindings": {
-    "format": "",
-    "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
-    "tooltip": false,
-  },
-  // Filemanager Launcher
-  "custom/filemanager": {
-    "format": "",
-    "on-click": "thunar",
-    "tooltip": false,
-  },
-  // Browser Launcher
-  "custom/browser": {
-    "format": "",
-    "on-click": "microsoft-edge",
-    "tooltip": false,
-  },
-  // ChatGPT Launcher
-  "custom/chatgpt": {
-    "format": "󰭹",
-    "on-click": "chromium --app=https://chat.openai.com",
-    "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": {
-    // START APPS LABEL
-    "format": "Apps",
-    // END APPS LABEL
-    "on-click": "sleep 0.2;rofi -show drun -replace",
-    "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
-    "tooltip": false,
-  },
-  // Rofi Application Launcher
-  "custom/appmenuicon": {
-    "format": "",
-    "on-click": "rofi -show drun -replace",
-    "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
-    "tooltip": false,
-  },
-  // Power Menu
-  "custom/exit": {
-    "format": "",
-    "on-click": "wlogout",
-    "tooltip": false,
-  },
-  // Keyboard State
-  "keyboard-state": {
-    "numlock": true,
-    "capslock": true,
-    "format": "{name} {icon}",
-    "format-icons": {
-      "locked": "",
-      "unlocked": "",
-    },
-  },
-  // System tray
-  "tray": {
-    "icon-size": 21,
-    "spacing": 10,
-  },
-  // Clock
-  "clock": {
-    "format": "{:%H:%M %a}",
-    // "timezone": "America/New_York",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    // START CLOCK FORMAT
-    "format-alt": "{:%Y-%m-%d}",
-    // END CLOCK FORMAT
-  },
-  // System
-  "custom/system": {
-    "format": "",
-    "tooltip": false,
-  },
-  // CPU
-  "cpu": {
-    "format": "/ C {usage}% ",
-    "on-click": "kitty --override confirm_os_window_close=0 btop",
-  },
-  // Memory
-  "memory": {
-    "format": "/ M {}% ",
-    "on-click": "kitty --override confirm_os_window_close=0 btop",
-  },
-  // Harddisc space used
-  "disk": {
-    "interval": 30,
-    "format": "D {percentage_used}% ",
-    "path": "/",
-    "on-click": "kitty --override confirm_os_window_close=0 btop",
-  },
-  "hyprland/language": {
-    "format": "/ K {short}",
-  },
-  // Group Hardware
-  "group/hardware": {
-    "orientation": "inherit",
-    "drawer": {
-      "transition-duration": 300,
-      "children-class": "not-memory",
-      "transition-left-to-right": false,
-    },
-    "modules": ["custom/system", "disk", "cpu", "memory", "hyprland/language"],
-  },
-  // Group Settings
-  "group/links": {
-    "orientation": "horizontal",
-    "modules": ["custom/chatgpt", "custom/empty"],
-  },
-  // Group Settings
-  "group/settings": {
-    "orientation": "inherit",
-    "drawer": {
-      "transition-duration": 300,
-      "children-class": "not-memory",
-      "transition-left-to-right": false,
-    },
-    "modules": [
-      "custom/settings",
-      "custom/waybarthemes",
-      "custom/wallpaper",
-      "custom/ml4w-hyprland-settings",
-    ],
-  },
-  // Group Quicklinks
-  "group/quicklinks": {
-    "orientation": "horizontal",
-    "modules": ["custom/browser", "custom/filemanager", "custom/chatgpt"],
-  },
-  // Network
-  "network": {
-    "format": "{ifname}",
-    "format-wifi": "   {signalStrength}%",
-    "format-ethernet": "  {ifname}",
-    "format-disconnected": "Disconnected",
-    "tooltip-format": " {ifname} via {gwaddri}",
-    "tooltip-format-wifi": "  {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
-    "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
-    "tooltip-format-disconnected": "Disconnected",
-    "max-length": 50,
-    "on-click": "nm-connection-editor",
-  },
-  // Battery
-  "battery": {
-    "states": {
-      // "good": 95,
-      "warning": 30,
-      "critical": 15,
-    },
-    "format": "{icon}   {capacity}%",
-    "format-charging": "  {capacity}%",
-    "format-plugged": "  {capacity}%",
-    "format-alt": "{icon}  {time}",
-    // "format-good": "", // An empty format will hide the module
-    // "format-full": "",
-    "format-icons": [" ", " ", " ", " ", " "],
-  },
-  // Pulseaudio
-  "pulseaudio": {
-    // "scroll-step": 1, // %, can be a float
-    "format": "{icon}   {volume}%",
-    "format-bluetooth": "{volume}%  {icon} {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
-    "format-muted": " {format_source}",
-    "format-source": "{volume}% ",
-    "format-source-muted": "",
-    "format-icons": {
-      "headphone": " ",
-      "hands-free": " ",
-      "headset": " ",
-      "phone": " ",
-      "portable": " ",
-      "car": " ",
-      "default": [" ", " ", " "],
-    },
-    "on-click": "pavucontrol",
-  },
-  // Bluetooth
-  "bluetooth": {
-    "format": "  {status}",
-    "format-disabled": "",
-    "format-off": "",
-    "interval": 30,
-    "on-click": "blueman-manager",
-    "format-no-controller": "",
-  },
-  // Other
-  "user": {
-    "format": "{user}",
-    "interval": 60,
-    "icon": false,
-  },
-  // Idle Inhibator
-  "idle_inhibitor": {
-    "format": "{icon}",
-    "tooltip": true,
-    "format-icons": {
-      "activated": "",
-      "deactivated": "",
-    },
-    "on-click-right": "hyprlock",
-  },
-}