diff --git a/themes.json b/themes.json
index 5adc1d8..6b7c5b1 100644
--- a/themes.json
+++ b/themes.json
@@ -2,7 +2,7 @@
     "20650dea-7e59-4e8a-b69b-c8664666805d": {
         "id": "20650dea-7e59-4e8a-b69b-c8664666805d",
         "name": "Deep Work Control",
-        "description": "Clean theme with grouped widgets",
+        "description": "Theme with grouped widgets",
         "homepage": "https://github.com/stylebending/yasb-deep-work-control",
         "style": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css",
         "config": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml",
@@ -647,4 +647,4 @@
         "author": "amnweb",
         "publish_date": "2025-02-20T13:52:07"
     }
-}
\ No newline at end of file
+}
diff --git a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml
index 2033389..4b5a8f0 100644
--- a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml
+++ b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml
@@ -2,10 +2,6 @@ watch_stylesheet: true
 watch_config: true
 debug: false
 update_check: true
-komorebi:
-  start_command: "komorebic start --whkd"
-  stop_command: "komorebic stop --whkd"
-  reload_command: "komorebic stop --whkd && komorebic start --whkd"
 bars:
   primary-bar:
     enabled: true
@@ -36,15 +32,12 @@ bars:
       bottom: 4
       right: 4
     widgets:
-      left: 
-      - "grouped_widgets_1"
+      left:
+        - "grouped_widgets_1"
       center:
-      - "grouped_widgets_2"
+        - "grouped_widgets_2"
       right:
-      - "grouped_widgets_3"
-      - "media"
-      - "grouped_widgets_4"
-      - "power_menu"
+        - "grouped_widgets_3"
 widgets:
   media:
     type: "yasb.media.MediaWidget"
@@ -98,32 +91,6 @@ widgets:
         pause: "\ue769"
         prev_track: "\ue892"
         next_track: "\ue893"
-  language:
-    type: "yasb.language.LanguageWidget"
-    options:
-      label: "<span>\uf11c</span> {lang[country_code]}"
-      label_alt: "{lang[full_name]}"
-      update_interval: 5
-      callbacks:
-        on_left: "toggle_menu"
-        on_middle: "do_nothing"
-        on_right: "toggle_label"
-      language_menu:
-        blur: true
-        round_corners: true
-        round_corners_type: "normal"
-        border_color: "None"
-        alignment: "right"
-        direction: "down"
-        offset_top: 6
-        offset_left: 0
-        show_layout_icon: true
-        layout_icon: "\uf11c"
-      container_padding:
-        top: 0
-        left: 2
-        bottom: 0
-        right: 2
   memory:
     type: "yasb.memory.MemoryWidget"
     options:
@@ -134,8 +101,7 @@ widgets:
         enabled: true
         size: 14
         thickness: 2
-        color: "#91d7e3"
-        background_color: "#242739" 
+        color: "#89b4fa"
       callbacks:
         on_left: "toggle_label"
       memory_thresholds:
@@ -152,8 +118,7 @@ widgets:
         position: "left"
         size: 14
         thickness: 2
-        color: "#91d7e3"
-        background_color: "#242739" 
+        color: "#89b4fa"
       update_interval: 2000
       callbacks:
         on_right: "do_nothing"
@@ -163,7 +128,7 @@ widgets:
       label: "{%H:%M}"
       label_alt: "{%A, %d %B %Y %H:%M}"
       timezones: []
-      calendar: 
+      calendar:
         blur: true
         round_corners: true
         round_corners_type: "normal"
@@ -173,22 +138,10 @@ widgets:
       callbacks:
         on_left: "toggle_calendar"
         on_right: "toggle_label"
-  komorebi_workspaces:
-    type: "komorebi.workspaces.WorkspaceWidget"
-    options:
-      label_offline: "\u23fc Offline"
-      label_workspace_btn: "\udb80\udd30"
-      label_workspace_active_btn: "\udb80\udd2f"
-      label_workspace_populated_btn: "\udb80\udd30"
-      label_default_name: "{index}"
-      label_zero_index: false
-      hide_empty_workspaces: false
-      hide_if_offline: true
-      animation: false
   volume:
     type: "yasb.volume.VolumeWidget"
     options:
-      label: "<span>{icon}</span> {level}"
+      label: "<span>{icon}</span>"
       label_alt: "{level}"
       volume_icons:
         - "\ueee8"
@@ -298,17 +251,6 @@ widgets:
         current_line_color: "#8EAEE8"
         current_line_width: 2
         current_line_style: "dot"
-  active_window:
-    type: "yasb.active_window.ActiveWindowWidget"
-    options:
-      label: "{win[title]}"
-      label_alt: "[class_name='{win[class_name]}' exe='{win[process][name]}' hwnd={win[hwnd]}]"
-      label_no_window: ""
-      label_icon: true
-      label_icon_size: 16
-      max_length: 36
-      max_length_ellipsis: "..."
-      monitor_exclusive: false
   battery:
     type: "yasb.battery.BatteryWidget"
     options:
@@ -338,7 +280,7 @@ widgets:
       enabled: true
       color: "black"
       radius: 3
-      offset: [ 1, 1 ]
+      offset: [1, 1]
   glazewm_workspaces:
     type: "glazewm.workspaces.GlazewmWorkspacesWidget"
     options:
@@ -346,106 +288,80 @@ widgets:
       hide_empty_workspaces: true
       hide_if_offline: false
       enable_scroll_switching: true
-    btn_shadow:
-      enabled: true
-      color: "black"
-      radius: 3
-      offset: [ 1, 1 ]
-    app_icons:
-      enabled_populated: false
-      enabled_active: false
-      size: 16
-      max_icons: 0
-      hide_label: false
-      hide_duplicates: false
-      hide_floating: false
-    animation: false
+      btn_shadow:
+        enabled: true
+        color: "black"
+        radius: 3
+        offset: [1, 1]
+      app_icons:
+        enabled_populated: true
+        enabled_active: true
+        size: 16
+        max_icons: 0
+        hide_label: false
+        hide_duplicates: false
+        hide_floating: false
+      animation: false
   gpu:
     type: "yasb.gpu.GpuWidget"
     options:
-      label: "<span>\uf4bc</span> {info[temp]}°C"
+      label: "<span>GPU</span> {info[temp]}°C"
       label_alt: "<span>\uf4bc</span> {info[temp]}°C | {info[mem_used]} / {info[mem_total]}"
       update_interval: 2000
       progress_bar:
         enabled: true
         size: 14
         thickness: 2
-        color: "#91d7e3"
-        background_color: "#242739"
-    gpu_thresholds:
-      low: 25
-      medium: 50
-      high: 90
-    histogram_icons:
-      - "\u2581" # 0%
-      - "\u2581" # 10%
-      - "\u2582" # 20%
-      - "\u2583" # 30%
-      - "\u2584" # 40%
-      - "\u2585" # 50%
-      - "\u2586" # 60%
-      - "\u2587" # 70%
-      - "\u2588" # 80%+
-    histogram_num_columns: 8
-    callbacks:
-      on_left: "toggle_label"
+        color: "#89b4fa"
+      gpu_thresholds:
+        low: 25
+        medium: 50
+        high: 90
+      histogram_icons:
+        - "\u2581" # 0%
+        - "\u2581" # 10%
+        - "\u2582" # 20%
+        - "\u2583" # 30%
+        - "\u2584" # 40%
+        - "\u2585" # 50%
+        - "\u2586" # 60%
+        - "\u2587" # 70%
+        - "\u2588" # 80%+
+      histogram_num_columns: 8
+      callbacks:
+        on_left: "toggle_label"
   microphone:
     type: "yasb.microphone.MicrophoneWidget"
     options:
       label: "<span>{icon}</span>"
       label_alt: "<span>{icon}</span> {level}"
       mute_text: "mute"
-    icons:
-      normal: "\uf130"
-      muted: "\uf131"
-    mic_menu:
-      blur: true
-      round_corners: true
-      round_corners_type: "normal"
-      border_color: "system"
-      alignment: "right"
-      direction: "down"
-    callbacks:
-      on_left: "toggle_mic_menu"
-      on_middle: "toggle_label"
-      on_right: "toggle_mute"
-    label_shadow:
-      enabled: true
-      color: "black"
-      radius: 3
-      offset: [ 1, 1 ]
-  taskbar:
-    type: "yasb.taskbar.TaskbarWidget"
-    options:
-      icon_size: 16
-      tooltip: true
-      show_only_visible: true
-      strict_filtering: true
-      monitor_exclusive: false
-    animation:
-      enabled: false
-    preview:
-      enabled: false
-      width: 240
-      delay: 400
-      padding: 8
-      margin: 8
-    title_label:
-      enabled: false
-      show: "always"
-      min_length: 10
-      max_length: 30
-    ignore_apps:
-      processes: []
-      titles: []
-      classes: []
+      icons:
+        normal: "\uf130"
+        muted: "\uf131"
+      mic_menu:
+        blur: true
+        round_corners: true
+        round_corners_type: "normal"
+        border_color: "system"
+        alignment: "right"
+        direction: "down"
+      callbacks:
+        on_left: "toggle_mic_menu"
+        on_middle: "toggle_label"
+        on_right: "toggle_mute"
+      label_shadow:
+        enabled: true
+        color: "black"
+        radius: 3
+        offset: [1, 1]
   systray:
     type: "yasb.systray.SystrayWidget"
     options:
       class_name: "systray"
       label_collapsed: "▼"
-      label_expanded: "▶"
-      label_position: "left" # Can be "left" or "right"
+      label_expanded: "◀"
+      label_position: "right" # Can be "left" or "right"
       icon_size: 16 # Can be any integer between 8 and 64
       pin_click_modifier: "alt" # Can be "ctrl", "alt" or "shift"
       show_unpinned: false
@@ -453,65 +369,87 @@ widgets:
       show_battery: false
       show_volume: false
       show_network: false
-    btn_shadow:
-      enabled: true
-      color: "black"
-      radius: 3
-      offset: [ 1, 1 ]
+      btn_shadow:
+        enabled: true
+        color: "black"
+        radius: 3
+        offset: [1, 1]
+  wifi:
+    type: "yasb.wifi.WifiWidget"
+    options:
+      label: "<span>{wifi_icon}</span>"
+      label_alt: "{wifi_name} {wifi_strength}%"
+      update_interval: 5000
+      callbacks:
+        on_left: "toggle_menu"
+        on_middle: "exec cmd.exe /c start ms-settings:network"
+        on_right: "toggle_label"
+      ethernet_label: "<span>{wifi_icon}</span>"
+      ethernet_label_alt: "<span>{wifi_icon}</span>{ip_addr}"
+      ethernet_icon: "\ueba9"
+      get_exact_wifi_strength: false # Optional. Will require location access permission if true.
+      wifi_icons: [
+          "\udb82\udd2e", # Icon for 0% strength
+          "\udb82\udd1f", # Icon for 1-24% strength
+          "\udb82\udd22", # Icon for 25-49% strength
+          "\udb82\udd25", # Icon for 50-74% strength
+          "\udb82\udd28", # Icon for 75-100% strength
+        ]
+      label_shadow:
+        enabled: true
+        color: "black"
+        radius: 3
+        offset: [1, 1]
+      menu_config:
+        blur: true
+        round_corners: true
+        round_corners_type: "normal"
+        border_color: "System"
+        alignment: "right"
+        direction: "down"
+        offset_top: 6
+        offset_left: 0
+        wifi_icons_secured: ["\ue670", "\ue671", "\ue672", "\ue673"]
+        wifi_icons_unsecured: ["\uec3c", "\uec3d", "\uec3e", "\uec3f"]
   grouped_widgets_1:
     type: "yasb.grouper.GrouperWidget"
     options:
       class_name: "grouped-widgets"
-      widgets: [
-        "glazewm_workspaces",
-        "active_window",
-        "taskbar",
-        "systray",
-      ]
+      widgets: ["memory", "cpu", "gpu"]
       container_padding:
         top: 0
-        left: 2
+        left: 0
         bottom: 0
-        right: 6
+        right: 0
   grouped_widgets_2:
     type: "yasb.grouper.GrouperWidget"
     options:
       class_name: "grouped-widgets"
-      widgets: [
-        "clock",
-      ]
+      widgets: ["glazewm_workspaces"]
       container_padding:
         top: 0
-        left: 2
+        left: 0
         bottom: 0
-        right: 6
+        right: 0
   grouped_widgets_3:
     type: "yasb.grouper.GrouperWidget"
     options:
       class_name: "grouped-widgets"
-      widgets: [
-        "memory",
-        "cpu",
-        "gpu",
-        "weather",
-      ]
+      widgets:
+        [
+          "systray",
+          "media",
+          "weather",
+          "notifications",
+          "microphone",
+          "volume",
+          "wifi",
+          "battery",
+          "clock",
+          "power_menu",
+        ]
       container_padding:
         top: 0
-        left: 2
-        bottom: 0
-        right: 6
-  grouped_widgets_4:
-    type: "yasb.grouper.GrouperWidget"
-    options:
-      class_name: "grouped-widgets"
-      widgets: [
-        "volume",
-        "microphone",
-        "battery",
-        "notifications",
-      ]
-      container_padding:
-        top: 0
-        left: 2
+        left: 0
         bottom: 0
-        right: 6
+        right: 0
diff --git a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png
index 249ac1e..c914c61 100644
Binary files a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png and b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png differ
diff --git a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md
index b6de963..3be9fa1 100644
--- a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md
+++ b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md
@@ -1,9 +1,5 @@
 # Deep Work Control
 
-**Deep Work Control** is a clean, focused, and highly customizable theme for [YASB](https://github.com/amnweb/yasb). Designed for productivity, it minimizes clutter by using grouped "pill" widgets while keeping essential system information accessible at a glance.
+**Deep Work Control** is a clean, focused, and highly customizable theme for [YASB](https://github.com/amnweb/yasb). Designed for productivity, it minimizes clutter by using grouped widgets while keeping essential system information accessible at a glance.
 
-![Theme Screenshot](https://i.imgur.com/5IS0qY1.png)
-
----
-
-## 🛠 Features & Configurat
\ No newline at end of file
+![Theme Screenshot](https://i.imgur.com/ibojVyx.png)
diff --git a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css
index e781029..9d7ee08 100644
--- a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css
+++ b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css
@@ -1,6 +1,6 @@
 :root {
     --mauve: #cba6f7;
-    --red: #f38ba8;
+    --red: #ff6b6b;
     --yellow: #f9e2af;
     --orange: #fab387;
     --blue: #89b4fa;
@@ -39,7 +39,7 @@
     color: var(--text);
     padding: 4px 8px 5px 8px;
     font-size: 12px;
-    font-family: 'Segoe UI';
+    font-family: "Segoe UI";
     font-weight: 600;
     margin-top: 4px;
 }
@@ -50,12 +50,12 @@
 /* Global context menu style */
 .context-menu,
 .context-menu .menu-checkbox {
-    background-color: #202020;
+    background-color: var(--base);
     border: none;
     padding: 4px 0px;
-    font-family: 'Segoe UI';
+    font-family: "Segoe UI";
     font-size: 12px;
-    color: #FFFFFF;
+    color: var(--text);
 }
 .context-menu::right-arrow {
     width: 8px;
@@ -72,16 +72,16 @@
 }
 .context-menu::item:selected,
 .context-menu .menu-checkbox:hover {
-    background-color: #313131;
-    color: #FFFFFF;
+    background-color: var(--base);
+    color: var(--text);
 }
 .context-menu::separator {
     height: 1px;
-    background-color: #404040;
+    background-color: var(--base);
     margin: 4px 8px;
 }
 .context-menu::item:disabled {
-    color: #666666;
+    color: var(--overlay0);
     background-color: transparent;
 }
 .context-menu .menu-checkbox .checkbox {
@@ -89,15 +89,15 @@
     padding: 8px 16px;
     font-size: 12px;
     margin: 0;
-    color: #FFFFFF;
-    font-family: 'Segoe UI'
+    color: var(--text);
+    font-family: "Segoe UI";
 }
 .context-menu .submenu::item:disabled {
     margin: 0;
     padding-left: 16px;
 }
 .context-menu .menu-checkbox .checkbox:unchecked {
-    color: #999
+    color: var(--overlay0);
 }
 .context-menu .menu-checkbox .checkbox::indicator {
     width: 12px;
@@ -106,11 +106,11 @@
     margin-right: 8px;
 }
 .context-menu .menu-checkbox .checkbox::indicator:unchecked {
-    background: #444444;
+    background: var(--base);
     border-radius: 2px;
 }
 .context-menu .menu-checkbox .checkbox::indicator:checked {
-    background: #007acc;
+    background: var(--blue);
     border-radius: 2px;
 }
 .context-menu .menu-checkbox .checkbox:focus {
@@ -125,36 +125,12 @@
     padding-right: 4px;
 }
 .widget .label {
-    padding: 0px 2px;
+    padding: 0px 5px;
 }
 .grouped-widgets .container {
     background-color: var(--base);
-    margin: 4px 0 4px 0;
-    border-radius: 12px;
-    border: 1px solid var(--surface1);
-}
-.komorebi-workspaces .offline-status {
-    color: var(--surface2);
-    font-size: 12px;
-    padding: 0 0 0 4px;
-    font-weight: 600;
-}
-.komorebi-workspaces .ws-btn {
-    border: none;
-    background-color: transparent;
-    margin: 0 3px;
-    padding: 0;
-    font-size: 14px;
-    color: var(--surface2);
-}
-.komorebi-workspaces .ws-btn:hover {
-    color: var(--overlay2);
-}
-.komorebi-workspaces .ws-btn.populated {
-    color: var(--text);
-}
-.komorebi-workspaces .ws-btn.active {
-    color: var(--text);
+    border-radius: 6px;
+    border: 1px solid var(--overlay1);
 }
 .cpu-widget .icon {
     color: var(--orange);
@@ -164,24 +140,24 @@
     padding-right: 8px;
 }
 .clock-widget .label {
-    color: var(--green);
+    color: var(--text);
 }
 .calendar {
-    background-color: var(--crust)
+    background-color: var(--crust);
 }
 .calendar .calendar-table,
 .calendar .calendar-table::item {
-    background-color: rgba(17, 17, 27, 0);
-    color: rgba(162, 177, 196, 0.85);
-    font-family: 'Segoe UI';
+    background-color: var(--base);
+    color: var(--text);
+    font-family: "Segoe UI";
     margin: 0;
     padding: 0;
     border: none;
     outline: none;
 }
 .calendar .calendar-table::item:selected {
-    color: rgb(255, 255, 255);
-    background-color: #007acc;
+    color: var(--text);
+    background-color: var(--blue);
     border-radius: 12px;
 }
 .calendar .day-label {
@@ -192,9 +168,9 @@
 .calendar .date-label,
 .calendar .week-label,
 .calendar .holiday-label {
-    font-family: 'Segoe UI';
+    font-family: "Segoe UI";
     font-size: 16px;
-    color: #fff;
+    color: var(--text);
     font-weight: 700;
     min-width: 180px;
     max-width: 180px;
@@ -206,7 +182,7 @@
 .calendar .holiday-label {
     font-size: 12px;
     font-weight: 600;
-    color: rgba(162, 177, 196, 0.85);
+    color: var(--text);
 }
 .calendar .holiday-label {
     color: var(--red);
@@ -215,7 +191,7 @@
 .calendar .date-label {
     font-size: 88px;
     font-weight: 900;
-    color: rgb(255, 255, 255);
+    color: var(--text);
     margin-top: -20px;
     margin-bottom: -10px;
 }
@@ -224,7 +200,7 @@
     font-size: 15px;
 }
 .power-menu-popup {
-    background-color: transparent
+    background-color: transparent;
 }
 .power-menu-popup .button {
     padding: 0;
@@ -232,35 +208,35 @@
     height: 230px;
     border-radius: 0;
     background-color: var(--crust);
-    color: var(--green);
-    border-left: 4px solid rgba(58, 83, 80, 0);
-    border-right: 4px solid rgba(58, 83, 80, 0);
-    border-top: 4px solid rgba(58, 83, 80, 0);
-    border-bottom: 4px solid rgba(58, 83, 80, 0);
+    color: var(--blue);
+    border-left: 4px solid var(--blue);
+    border-right: 4px solid var(--blue);
+    border-top: 4px solid var(--blue);
+    border-bottom: 4px solid var(--blue);
     margin: 0px;
 }
 .power-menu-popup .button.hover {
-    border-left: 4px solid #94e2d5;
-    border-right: 4px solid #94e2d5;
-    border-top: 4px solid #94e2d5;
-    border-bottom: 4px solid #94e2d5;
+    border-left: 4px solid var(--blue);
+    border-right: 4px solid var(--blue);
+    border-top: 4px solid var(--blue);
+    border-bottom: 4px solid var(--blue);
 }
 .power-menu-popup .button.cancel.hover {
-    border-left: 4px solid #e29494;
-    border-right: 4px solid #e29494;
-    border-top: 4px solid #e29494;
-    border-bottom: 4px solid #e29494;
+    border-left: 4px solid var(--red);
+    border-right: 4px solid var(--red);
+    border-top: 4px solid var(--red);
+    border-bottom: 4px solid var(--red);
 }
 .power-menu-popup .button .label {
     margin-bottom: 8px;
     font-size: 16px;
     font-weight: 500;
-    color: var(--green)
+    color: var(--blue);
 }
 .power-menu-popup .button .icon {
     font-size: 64px;
     padding-top: 32px;
-    color: var(--green)
+    color: var(--blue);
 }
 .power-menu-popup .button.cancel .icon,
 .power-menu-popup .button.cancel .label {
@@ -273,72 +249,11 @@
     font-weight: 600;
 }
 .audio-menu {
-    background-color: var(--crust)
-}
-.volume-widget .icon {
-    font-size: 12px;
-    color: var(--green);
-}
-.language-widget .icon {
-    color: var(--green);
-}
-.language-menu {
     background-color: var(--crust);
-    min-width: 300px;
 }
-.language-menu .header {
-    font-family: 'Segoe UI';
-    font-size: 14px;
-    font-weight: 600;
-    margin-bottom: 2px;
-    padding: 12px;
-}
-.language-menu .footer {
-    font-family: 'Segoe UI';
-    font-size: 12px;
-    font-weight: 600;
-    padding: 12px;
-    margin-top: 2px;
-    color: #9399b2;
-}
-.language-menu .footer:hover {
-    background-color: rgba(255, 255, 255, 0.05);
-}
-.language-menu .language-item {
-    padding: 6px 12px;
-    margin: 2px 4px;
-}
-.language-menu .language-item.active {
-    background-color: rgba(255, 255, 255, 0.1);
-    border-radius: 4px;
-}
-.language-menu .language-item:hover {
-    background-color: rgba(255, 255, 255, 0.05);
-}
-.language-menu .language-item.active:hover {
-    background-color: rgba(255, 255, 255, 0.1);
-    border-radius: 4px;
-}
-.language-menu .language-item .code {
-    font-weight: 900;
-    font-size: 14px;
-    min-width: 40px;
-    text-transform: uppercase;
-}
-.language-menu .language-item .icon {
-    font-size: 16px;
-    margin-right: 8px;
-    color: #fff;
-}
-.language-menu .language-item .name {
-    font-weight: 600;
-    font-family: 'Segoe UI';
-    font-size: 14px;
-}
-.language-menu .language-item .layout {
-    font-weight: 600;
-    font-family: 'Segoe UI';
+.volume-widget .icon {
     font-size: 12px;
+    color: var(--blue);
 }
 .notification-widget .icon.new-notification {
     color: var(--blue);
@@ -346,7 +261,7 @@
 .media-menu {
     min-width: 360px;
     max-width: 360px;
-    background-color: var(--crust)
+    background-color: var(--crust);
 }
 .media-menu .title,
 .media-menu .artist,
@@ -354,37 +269,45 @@
     font-size: 14px;
     font-weight: 600;
     margin-left: 10px;
-    font-family: 'Segoe UI'
+    font-family: "Segoe UI";
 }
 .media-menu .artist {
     font-size: 13px;
-    color: #6c7086;
+    color: var(--overlay0);
     margin-top: 0px;
     margin-bottom: 8px;
 }
 .media-menu .source {
     font-size: 11px;
-    color: #000;
+    color: var(--base);
     font-weight: normal;
     border-radius: 3px;
-    background-color: #bac2de;
+    background-color: var(--lavender);
     padding: 2px 4px;
 }
 .media-menu .source.firefox {
-    background-color: #ff583b;
-    color: #ffffff;
+    background-color: var(--red);
+    color: var(--text);
 }
-.media-menu .source.spotify {
-    background-color: #199143;
-    color: #ffffff;
+.media-menu .source.brave {
+    background-color: var(--red);
+    color: var(--text);
+}
+.media-menu .source.chrome {
+    background-color: var(--orange);
+    color: var(--text);
 }
 .media-menu .source.edge {
-    background-color: #0078d4;
-    color: #ffffff;
+    background-color: var(--blue);
+    color: var(--text);
+}
+.media-menu .source.spotify {
+    background-color: var(--green);
+    color: var(--text);
 }
 .media-menu .source.windows-media {
-    background-color: #0078d4;
-    color: #ffffff;
+    background-color: var(--blue);
+    color: var(--text);
 }
 .media-menu .btn {
     font-family: "Segoe Fluent Icons";
@@ -401,22 +324,22 @@
     margin-left: 10px;
 }
 .media-menu .btn:hover {
-    color: white;
+    color: var(--text);
     background-color: rgba(255, 255, 255, 0.1);
 }
 .media-menu .btn.play {
     background-color: rgba(255, 255, 255, 0.1);
-    font-size: 20px
+    font-size: 20px;
 }
 .media-menu .btn.disabled:hover,
 .media-menu .btn.disabled {
-    color: #4e525c;
-    background-color: rgba(0, 0, 0, 0);
+    color: var(--surface1);
+    background-color: var(--base);
 }
 .media-menu .playback-time {
     font-size: 13px;
-    font-family: 'Segoe UI';
-    color: #7f849c;
+    font-family: "Segoe UI";
+    color: var(--overlay1);
     margin-top: 0px;
     min-width: 100px;
 }
@@ -430,7 +353,6 @@
     height: 2px;
     border-radius: 3px;
     background: rgba(255, 255, 255, 0.1);
-
 }
 .media-menu .progress-slider::groove:hover {
     background: transparent;
@@ -461,39 +383,38 @@
 .weather-card-today .label.alert {
     font-size: 13px;
     font-weight: 600;
-    background-color: rgba(247, 175, 42, 0.05);
-    border: 1px solid rgba(247, 209, 42, 0.1);
-    color: rgba(196, 181, 162, 0.85);
+    background-color: var(--orange);
+    border: 1px solid var(--orange);
+    color: var(--red);
     border-radius: 6px;
     padding: 5px 0;
 }
 .weather-card-day {
     border-radius: 6px;
-    background-color: var(--crust)
+    background-color: var(--crust);
 }
 .weather-card-day .label {
     font-size: 13px;
-
 }
 .weather-card-day.active {
-    background-color: rgba(40, 40, 60, 0.6);
-    border: 1px solid rgba(50, 50, 75, 1);
+    background-color: var(--base);
+    border: 1px solid var(--base);
 }
 .weather-card-day:hover {
-    background-color: rgba(40, 40, 60, 0.6);
+    background-color: var(--crust);
 }
 .weather-card .hourly-container {
     border: none;
-    background-color: rgba(40, 40, 60, 0.0);
+    background-color: var(--crust);
     min-height: 150px;
 }
 .weather-card .hourly-data {
-    background-color: #FAE93F;
+    background-color: var(--yellow);
     font-size: 11px;
     font-weight: bold;
 }
 .battery-widget .widget-container .icon {
-    color: #94e2d5;
+    color: var(--blue);
 }
 .glazewm-workspaces {
     margin: 0;
@@ -502,44 +423,44 @@
 .glazewm-workspaces .ws-btn {
     font-size: 14px;
     background-color: transparent;
-    padding: 0px 4px 0px 4px;
+    padding: 0px 10px 0px 10px;
     margin: 0 2px 0 2px;
-    color: #CDD6F4;
+    color: var(--text);
 }
 
 .glazewm-workspaces .ws-btn.active_populated {
-    color: #000000;
-    background-color: #94e2d5;
+    color: var(--base);
+    background-color: var(--surface2);
 }
 .glazewm-workspaces .ws-btn.active_empty {
-    color: #000000;
-    background-color: #94e2d5;
+    color: var(--base);
+    background-color: var(--surface2);
 }
 
 .glazewm-workspaces .ws-btn.populated {
-    color: #C2DAF7;
+    color: var(--text);
 }
 
 .glazewm-workspaces .ws-btn.empty {
-    color: #7D8B9D;
+    color: var(--text);
 }
 
 .glazewm-workspaces .ws-btn:hover,
 .glazewm-workspaces .ws-btn.populated:hover,
 .glazewm-workspaces .ws-btn.empty:hover {
-    background-color: #727272;
+    background-color: var(--overlay1);
 }
 .microphone-widget .icon.muted {
-    color: #ff6b6b;
+    color: var(--red);
     margin: 0 2px 0 0;
 }
 
 .microphone-widget .icon {
-    color: #94e2d5;
+    color: var(--blue);
     margin: 0 2px 0 0;
 }
 .microphone-menu {
-    background-color: rgba(17, 17, 27, 0.4);
+    background-color: var(--base);
     min-width: 300px;
 }
 /* System microphone volume */
@@ -561,3 +482,234 @@
 .microphone-menu .microphone-container .device:hover {
     background-color: rgba(255, 255, 255, 0.06);
 }
+.taskbar-widget .app-container {
+    margin: 4px 2px;
+    border-radius: 4px;
+    padding: 0 4px;
+}
+.taskbar-widget .app-container.foreground {
+    background-color: rgba(255, 255, 255, 0.1);
+}
+.taskbar-widget .app-container.flashing {
+    background-color: var(--red);
+}
+.taskbar-widget .app-container.running {
+    background-color: rgba(255, 255, 255, 0.25);
+}
+.taskbar-widget .app-container:hover {
+    background-color: rgba(255, 255, 255, 0.15);
+}
+.taskbar-widget .app-container .app-title {
+    padding-left: 4px;
+}
+/* Taskbar preview popup is very limited in styling options, do not use margins/paddings here */
+.taskbar-preview {
+    border-radius: 8px;
+    background-color: var(--sruface0);
+}
+.taskbar-preview.flashing {
+    background-color: var(--red);
+}
+.taskbar-preview .header {
+    padding-bottom: 12px;
+    padding-top: 4px;
+}
+.taskbar-preview .header .title {
+    color: var(--text);
+    font-family: "Segoe UI";
+    font-weight: 600;
+    font-size: 13px;
+}
+.systray {
+    border: none;
+    margin: 0;
+}
+
+.systray .unpinned-container {
+    border-radius: 8px;
+}
+
+.systray .pinned-container {
+    background: transparent;
+}
+
+.systray .pinned-container[forceshow="true"] {
+    background: red;
+}
+
+.systray .button {
+    border-radius: 4px;
+    padding: 4px 4px;
+    margin: 2px 2px;
+    background: var(--surface0);
+}
+
+.systray .button:hover {
+    background: var(--overlay1);
+}
+
+.systray .button[dragging="true"] {
+    background: var(--orange);
+    border-color: var(--orange);
+}
+
+.systray .unpinned-visibility-btn {
+    border-radius: 4px;
+    height: 20px;
+    width: 16px;
+}
+
+.systray .unpinned-visibility-btn:checked {
+}
+
+.systray .unpinned-visibility-btn:hover {
+    border: 1px solid var(--subtext1);
+    border-radius: 4px;
+    border-color: var(--subtext1);
+}
+.wifi-widget .widget-container .icon {
+    color: var(--blue);
+}
+
+.wifi-menu {
+    font-family: "Segoe UI";
+    background-color: var(--base);
+    max-height: 350px;
+    min-height: 375px;
+    min-width: 375px;
+}
+
+.wifi-menu .progress-bar {
+    max-height: 2px;
+}
+
+.wifi-menu .progress-bar::chunk {
+    background-color: var(--blue);
+}
+
+.wifi-menu .header {
+    font-family: "Segoe UI";
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 2px;
+    padding: 12px;
+    background-color: var(--base);
+    color: var(--text);
+    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.wifi-menu .error-message {
+    font-family: "Segoe UI";
+    font-size: 14px;
+    font-weight: 600;
+    margin-bottom: 2px;
+    padding: 12px;
+    background-color: var(--red);
+    color: var(--text);
+    border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.wifi-menu .wifi-list {
+    background-color: var(--base);
+    margin-right: 3px;
+}
+
+.wifi-menu .wifi-item {
+    min-height: 35px;
+    padding: 2px 12px;
+    margin: 2px 4px;
+}
+
+.wifi-menu .wifi-item:hover {
+    background-color: rgba(255, 255, 255, 0.05);
+    border-radius: 6px;
+}
+
+.wifi-menu .wifi-item[active="true"] {
+    background-color: rgba(255, 255, 255, 0.15);
+    font-size: 14px;
+    border-radius: 6px;
+    min-height: 80px;
+}
+
+.wifi-menu .wifi-item .icon {
+    font-family: "Segoe Fluent Icons";
+    font-size: 26px;
+    margin-right: 10px;
+}
+
+.wifi-menu .wifi-item .name {
+    font-family: "Segoe UI";
+    font-size: 14px;
+    margin-right: 10px;
+}
+
+.wifi-menu .wifi-item .password {
+    font-family: "Segoe UI";
+    background-color: transparent;
+    font-size: 14px;
+}
+
+.wifi-menu .wifi-item .status {
+    font-family: "Segoe UI";
+    font-size: 14px;
+}
+
+.wifi-menu .wifi-item .strength {
+    font-family: "Segoe UI";
+    font-size: 14px;
+}
+
+.wifi-menu .wifi-item .controls-container {
+    padding-top: 8px;
+}
+
+.wifi-menu .wifi-item .connect {
+    background-color: rgba(255, 255, 255, 0.15);
+    padding: 4px 30px;
+    border-radius: 4px;
+    border: none;
+    font-size: 14px;
+}
+
+.wifi-menu .wifi-item .connect:hover {
+    background-color: rgba(255, 255, 255, 0.2);
+}
+
+.wifi-menu .wifi-item .connect:pressed {
+    background-color: rgba(255, 255, 255, 0.3);
+}
+
+.wifi-menu .footer {
+    font-size: 12px;
+    font-weight: 600;
+    padding: 12px;
+    margin-top: 2px;
+    color: var(--overlay2);
+    background-color: var(--base);
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.wifi-menu .footer .settings-button {
+    font-family: "Segoe UI";
+    background-color: transparent;
+    border: none;
+    padding: 0 2px;
+    min-width: 26px;
+    min-height: 26px;
+    color: var(--tetx);
+}
+
+.wifi-menu .footer .refresh-icon {
+    font-family: "Segoe Fluent Icons";
+    background-color: transparent;
+    border: none;
+    min-width: 26px;
+    min-height: 26px;
+    color: var(--text);
+}
+
+.wifi-menu .footer .refresh-icon:hover {
+    background-color: rgba(255, 255, 255, 0.1);
+    border-radius: 4px;
+}
diff --git a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/theme.json b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/theme.json
index 037d683..4f69fb3 100644
--- a/themes/20650dea-7e59-4e8a-b69b-c8664666805d/theme.json
+++ b/themes/20650dea-7e59-4e8a-b69b-c8664666805d/theme.json
@@ -1 +1,12 @@
-{"id": "20650dea-7e59-4e8a-b69b-c8664666805d", "name": "Deep Work Control", "description": "Clean theme with grouped widgets", "homepage": "https://github.com/stylebending/yasb-deep-work-control", "style": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css", "config": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml", "readme": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md", "image": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png", "author": "stylebending", "publish_date": "2026-01-24T20:53:00.622587"}
\ No newline at end of file
+{
+    "id": "20650dea-7e59-4e8a-b69b-c8664666805d",
+    "name": "Deep Work Control",
+    "description": "Theme with grouped widgets",
+    "homepage": "https://github.com/stylebending/yasb-deep-work-control",
+    "style": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/styles.css",
+    "config": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/config.yaml",
+    "readme": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/readme.md",
+    "image": "https://raw.githubusercontent.com/amnweb/yasb-themes/main/themes/20650dea-7e59-4e8a-b69b-c8664666805d/image.png",
+    "author": "stylebending",
+    "publish_date": "2026-01-24T20:53:00.622587"
+}