From 052e490f8f1bc88bd8d762ecf5445c41c333a0e9 Mon Sep 17 00:00:00 2001
From: lars-berger <lars.berger@yahoo.com>
Date: Fri, 27 Sep 2024 14:28:15 +0800
Subject: [PATCH] feat: rename windows -> widgets; add json schema for configs
 (#110)

---
 README.md                                     |   6 +-
 .../boilerplates/react-buildless/index.html   |   6 +-
 .../react-buildless/my-window.zebar.json      |  36 ++--
 .../solid-ts/my-window.zebar.json             |  36 ++--
 examples/boilerplates/solid-ts/src/index.tsx  |   6 +-
 examples/starter/vanilla.html                 |   6 +-
 examples/starter/vanilla.zebar.json           |  36 ++--
 examples/starter/with-glazewm.html            |   6 +-
 examples/starter/with-glazewm.zebar.json      |  36 ++--
 examples/starter/with-komorebi.html           |   6 +-
 examples/starter/with-komorebi.zebar.json     |  36 ++--
 .../client-api/src/desktop/current-window.ts  |  80 --------
 .../src/desktop/desktop-commands.ts           |  43 ++---
 .../src/desktop/get-open-window-args.ts       |  17 --
 packages/client-api/src/desktop/index.ts      |   6 +-
 packages/client-api/src/desktop/monitors.ts   |  62 ++++--
 .../{desktop-events.ts => provider-emit.ts}   |   7 +-
 .../client-api/src/desktop/shared/index.ts    |   2 -
 .../src/desktop/shared/monitor-info.model.ts  |   8 -
 .../src/desktop/shared/window-state.model.ts  |   9 -
 packages/client-api/src/desktop/widgets.ts    |  62 ++++++
 packages/client-api/src/desktop/windows.ts    |  39 ++++
 packages/client-api/src/index.ts              |  11 +-
 packages/client-api/src/init.ts               |  69 -------
 .../src/providers/create-provider-group.ts    |   5 +-
 .../src/providers/create-provider.ts          |  12 +-
 .../glazewm/create-glazewm-provider.ts        |   4 +-
 .../komorebi/create-komorebi-provider.ts      |   2 +-
 packages/client-api/src/shims.d.ts            |   9 +-
 packages/client-api/src/user-config/index.ts  |   1 -
 .../src/user-config/window-config.ts          |  66 -------
 .../client-api/src/utils/convert-bytes.ts     |  76 --------
 packages/client-api/src/utils/index.ts        |   1 -
 .../client-api/src/zebar-context.model.ts     | 109 -----------
 packages/desktop/package.json                 |   2 +-
 packages/desktop/src/cli.rs                   |  37 ++--
 packages/desktop/src/commands.rs              |  27 +--
 packages/desktop/src/config.rs                | 131 ++++++-------
 packages/desktop/src/main.rs                  | 111 +++++------
 packages/desktop/src/monitor_state.rs         |  39 +---
 .../desktop/src/providers/provider_manager.rs |   1 -
 packages/desktop/src/sys_tray.rs              |  90 ++++-----
 .../{window_factory.rs => widget_factory.rs}  | 181 +++++++++---------
 resources/widget-schema.json                  | 136 +++++++++++++
 44 files changed, 715 insertions(+), 956 deletions(-)
 delete mode 100644 packages/client-api/src/desktop/current-window.ts
 delete mode 100644 packages/client-api/src/desktop/get-open-window-args.ts
 rename packages/client-api/src/desktop/{desktop-events.ts => provider-emit.ts} (93%)
 delete mode 100644 packages/client-api/src/desktop/shared/index.ts
 delete mode 100644 packages/client-api/src/desktop/shared/monitor-info.model.ts
 delete mode 100644 packages/client-api/src/desktop/shared/window-state.model.ts
 create mode 100644 packages/client-api/src/desktop/widgets.ts
 create mode 100644 packages/client-api/src/desktop/windows.ts
 delete mode 100644 packages/client-api/src/init.ts
 delete mode 100644 packages/client-api/src/user-config/index.ts
 delete mode 100644 packages/client-api/src/user-config/window-config.ts
 delete mode 100644 packages/client-api/src/utils/convert-bytes.ts
 delete mode 100644 packages/client-api/src/zebar-context.model.ts
 rename packages/desktop/src/{window_factory.rs => widget_factory.rs} (59%)
 create mode 100644 resources/widget-schema.json

diff --git a/README.md b/README.md
index ac2d1418..26eec28d 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ When Zebar is first launched, a set of default widget configs are generated to `
 
 To create a new widget, simply copy its config file into the `%userprofile%/.glzr/zebar` directory.
 
-Widgets are powered by native webviews (_similar_ to Electron, but less resource heavy). Every widget has its own config file and a corresponding HTML file for the markup and styling of the window. This is an ordinary HTML file, so any frontend framework (React, Angular, Vue, etc.) can be used.
+Widgets are powered by native webviews (_similar_ to Electron, but less resource heavy). Every widget has its own config file and a corresponding HTML file for the markup and styling of the widget. This is an ordinary HTML file, so any frontend framework (React, Angular, Vue, etc.) can be used.
 
 Zebar exposes various system information (refered to as "providers") which can be used and displayed by your frontend. This includes stats like CPU usage, battery info, various window manager integrations, and lots more.
 
@@ -134,7 +134,7 @@ No config options.
 | `allWorkspaces` | Workspaces across all monitors.        | `Workspace[]` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `allMonitors` | All monitors.        | `Monitor[]` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `focusedMonitor` | Monitor that currently has focus.        | `Monitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
-| `currentMonitor` | Monitor that is nearest to this Zebar window.        | `Monitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
+| `currentMonitor` | Monitor that is nearest to this Zebar widget.        | `Monitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `focusedContainer` | Container that currently has focus (on any monitor).        | `Container` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `tilingDirection` | Tiling direction of the focused container.        | `TilingDirection` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `bindingModes` | Active binding modes;        | `BindingModeConfig[]` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
@@ -268,7 +268,7 @@ No config options.
 | `allWorkspaces` | Workspaces across all monitors.        | `KomorebiWorkspace[]` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `allMonitors` | All monitors.        | `KomorebiMonitor[]` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 | `focusedMonitor` | Monitor that currently has focus.        | `KomorebiMonitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
-| `currentMonitor` | Monitor that is nearest to this Zebar window.        | `KomorebiMonitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
+| `currentMonitor` | Monitor that is nearest to this Zebar widget.        | `KomorebiMonitor` | <img src="https://github.com/glzr-io/zebar/assets/34844898/568e90c8-cd32-49a5-a17f-ab233d41f1aa" alt="microsoft icon" width="24"> |
 
 
 ### Weather
diff --git a/examples/boilerplates/react-buildless/index.html b/examples/boilerplates/react-buildless/index.html
index 67fad032..8c8595bb 100644
--- a/examples/boilerplates/react-buildless/index.html
+++ b/examples/boilerplates/react-buildless/index.html
@@ -24,11 +24,9 @@
     <script type="text/babel" data-type="module">
       import React, { useState, useEffect } from 'react';
       import { createRoot } from 'react-dom/client';
-      import { init } from 'zebar';
+      import * as zebar from 'zebar';
 
-      const zebarCtx = await init();
-
-      const providers = await zebarCtx.createProviderGroup({
+      const providers = await zebar.createProviderGroup({
         cpu: { type: 'cpu' },
         battery: { type: 'battery' },
         memory: { type: 'memory' },
diff --git a/examples/boilerplates/react-buildless/my-window.zebar.json b/examples/boilerplates/react-buildless/my-window.zebar.json
index cd2e9811..52ee6eca 100644
--- a/examples/boilerplates/react-buildless/my-window.zebar.json
+++ b/examples/boilerplates/react-buildless/my-window.zebar.json
@@ -1,23 +1,21 @@
 {
-  "$schema": "TODO",
+  "$schema": "https://github.com/glzr-io/zebar/raw/v2.1.0/resources/widget-schema.json",
   "htmlPath": "./index.html",
-  "launchOptions": {
-    "zOrder": "normal",
-    "shownInTaskbar": false,
-    "focused": false,
-    "resizable": false,
-    "transparent": false,
-    "placements": [
-      {
-        "anchor": "top_left",
-        "offsetX": "0px",
-        "offsetY": "0px",
-        "width": "100%",
-        "height": "40px",
-        "monitorSelection": {
-          "type": "all"
-        }
+  "zOrder": "normal",
+  "shownInTaskbar": false,
+  "focused": false,
+  "resizable": false,
+  "transparent": false,
+  "defaultPlacements": [
+    {
+      "anchor": "top_left",
+      "offsetX": "0px",
+      "offsetY": "0px",
+      "width": "100%",
+      "height": "40px",
+      "monitorSelection": {
+        "type": "all"
       }
-    ]
-  }
+    }
+  ]
 }
diff --git a/examples/boilerplates/solid-ts/my-window.zebar.json b/examples/boilerplates/solid-ts/my-window.zebar.json
index 48bdd0f2..baf8aa05 100644
--- a/examples/boilerplates/solid-ts/my-window.zebar.json
+++ b/examples/boilerplates/solid-ts/my-window.zebar.json
@@ -1,23 +1,21 @@
 {
-  "$schema": "TODO",
+  "$schema": "https://github.com/glzr-io/zebar/raw/v2.1.0/resources/widget-schema.json",
   "htmlPath": "./dist/index.html",
-  "launchOptions": {
-    "zOrder": "normal",
-    "shownInTaskbar": false,
-    "focused": false,
-    "resizable": false,
-    "transparent": false,
-    "placements": [
-      {
-        "anchor": "top_left",
-        "offsetX": "0px",
-        "offsetY": "0px",
-        "width": "100%",
-        "height": "40px",
-        "monitorSelection": {
-          "type": "all"
-        }
+  "zOrder": "normal",
+  "shownInTaskbar": false,
+  "focused": false,
+  "resizable": false,
+  "transparent": false,
+  "defaultPlacements": [
+    {
+      "anchor": "top_left",
+      "offsetX": "0px",
+      "offsetY": "0px",
+      "width": "100%",
+      "height": "40px",
+      "monitorSelection": {
+        "type": "all"
       }
-    ]
-  }
+    }
+  ]
 }
diff --git a/examples/boilerplates/solid-ts/src/index.tsx b/examples/boilerplates/solid-ts/src/index.tsx
index 6eedea48..097a3786 100644
--- a/examples/boilerplates/solid-ts/src/index.tsx
+++ b/examples/boilerplates/solid-ts/src/index.tsx
@@ -2,11 +2,9 @@
 import './index.css';
 import { render } from 'solid-js/web';
 import { createStore } from 'solid-js/store';
-import { init } from 'zebar';
+import * as zebar from 'zebar';
 
-const zebarCtx = await init();
-
-const providers = await zebarCtx.createProviderGroup({
+const providers = await zebar.createProviderGroup({
   cpu: { type: 'cpu' },
   battery: { type: 'battery' },
   memory: { type: 'memory' },
diff --git a/examples/starter/vanilla.html b/examples/starter/vanilla.html
index c03f3dfc..c3df66d5 100644
--- a/examples/starter/vanilla.html
+++ b/examples/starter/vanilla.html
@@ -24,11 +24,9 @@
     <script type="text/babel" data-type="module">
       import React, { useState, useEffect } from 'react';
       import { createRoot } from 'react-dom/client';
-      import { init } from 'zebar';
+      import * as zebar from 'zebar';
 
-      const zebarCtx = await init();
-
-      const providers = await zebarCtx.createProviderGroup({
+      const providers = await zebar.createProviderGroup({
         network: { type: 'network' },
         cpu: { type: 'cpu' },
         date: { type: 'date', formatting: 'EEE d MMM t' },
diff --git a/examples/starter/vanilla.zebar.json b/examples/starter/vanilla.zebar.json
index 390b8f67..06c39939 100644
--- a/examples/starter/vanilla.zebar.json
+++ b/examples/starter/vanilla.zebar.json
@@ -1,23 +1,21 @@
 {
-  "$schema": "TODO",
+  "$schema": "https://github.com/glzr-io/zebar/raw/v2.1.0/resources/widget-schema.json",
   "htmlPath": "./vanilla.html",
-  "launchOptions": {
-    "zOrder": "normal",
-    "shownInTaskbar": false,
-    "focused": false,
-    "resizable": false,
-    "transparent": false,
-    "placements": [
-      {
-        "anchor": "top_left",
-        "offsetX": "0px",
-        "offsetY": "0px",
-        "width": "100%",
-        "height": "40px",
-        "monitorSelection": {
-          "type": "all"
-        }
+  "zOrder": "normal",
+  "shownInTaskbar": false,
+  "focused": false,
+  "resizable": false,
+  "transparent": false,
+  "defaultPlacements": [
+    {
+      "anchor": "top_left",
+      "offsetX": "0px",
+      "offsetY": "0px",
+      "width": "100%",
+      "height": "40px",
+      "monitorSelection": {
+        "type": "all"
       }
-    ]
-  }
+    }
+  ]
 }
diff --git a/examples/starter/with-glazewm.html b/examples/starter/with-glazewm.html
index 1dcbd05a..3efb0d14 100644
--- a/examples/starter/with-glazewm.html
+++ b/examples/starter/with-glazewm.html
@@ -24,11 +24,9 @@
     <script type="text/babel" data-type="module">
       import React, { useState, useEffect } from 'react';
       import { createRoot } from 'react-dom/client';
-      import { init } from 'zebar';
+      import * as zebar from 'zebar';
 
-      const zebarCtx = await init();
-
-      const providers = await zebarCtx.createProviderGroup({
+      const providers = await zebar.createProviderGroup({
         network: { type: 'network' },
         glazewm: { type: 'glazewm' },
         cpu: { type: 'cpu' },
diff --git a/examples/starter/with-glazewm.zebar.json b/examples/starter/with-glazewm.zebar.json
index 465424d7..d4a389bb 100644
--- a/examples/starter/with-glazewm.zebar.json
+++ b/examples/starter/with-glazewm.zebar.json
@@ -1,23 +1,21 @@
 {
-  "$schema": "TODO",
+  "$schema": "https://github.com/glzr-io/zebar/raw/v2.1.0/resources/widget-schema.json",
   "htmlPath": "./with-glazewm.html",
-  "launchOptions": {
-    "zOrder": "normal",
-    "shownInTaskbar": false,
-    "focused": false,
-    "resizable": false,
-    "transparent": false,
-    "placements": [
-      {
-        "anchor": "top_left",
-        "offsetX": "0px",
-        "offsetY": "0px",
-        "width": "100%",
-        "height": "40px",
-        "monitorSelection": {
-          "type": "all"
-        }
+  "zOrder": "normal",
+  "shownInTaskbar": false,
+  "focused": false,
+  "resizable": false,
+  "transparent": false,
+  "defaultPlacements": [
+    {
+      "anchor": "top_left",
+      "offsetX": "0px",
+      "offsetY": "0px",
+      "width": "100%",
+      "height": "40px",
+      "monitorSelection": {
+        "type": "all"
       }
-    ]
-  }
+    }
+  ]
 }
diff --git a/examples/starter/with-komorebi.html b/examples/starter/with-komorebi.html
index a527fb09..445f8b44 100644
--- a/examples/starter/with-komorebi.html
+++ b/examples/starter/with-komorebi.html
@@ -24,11 +24,9 @@
     <script type="text/babel" data-type="module">
       import React, { useState, useEffect } from 'react';
       import { createRoot } from 'react-dom/client';
-      import { init } from 'zebar';
+      import * as zebar from 'zebar';
 
-      const zebarCtx = await init();
-
-      const providers = await zebarCtx.createProviderGroup({
+      const providers = await zebar.createProviderGroup({
         network: { type: 'network' },
         komorebi: { type: 'komorebi' },
         cpu: { type: 'cpu' },
diff --git a/examples/starter/with-komorebi.zebar.json b/examples/starter/with-komorebi.zebar.json
index 92316f36..9fcb867b 100644
--- a/examples/starter/with-komorebi.zebar.json
+++ b/examples/starter/with-komorebi.zebar.json
@@ -1,23 +1,21 @@
 {
-  "$schema": "TODO",
+  "$schema": "https://github.com/glzr-io/zebar/raw/v2.1.0/resources/widget-schema.json",
   "htmlPath": "./with-komorebi.html",
-  "launchOptions": {
-    "zOrder": "normal",
-    "shownInTaskbar": false,
-    "focused": false,
-    "resizable": false,
-    "transparent": false,
-    "placements": [
-      {
-        "anchor": "top_left",
-        "offsetX": "0px",
-        "offsetY": "0px",
-        "width": "100%",
-        "height": "40px",
-        "monitorSelection": {
-          "type": "all"
-        }
+  "zOrder": "normal",
+  "shownInTaskbar": false,
+  "focused": false,
+  "resizable": false,
+  "transparent": false,
+  "defaultPlacements": [
+    {
+      "anchor": "top_left",
+      "offsetX": "0px",
+      "offsetY": "0px",
+      "width": "100%",
+      "height": "40px",
+      "monitorSelection": {
+        "type": "all"
       }
-    ]
-  }
+    }
+  ]
 }
diff --git a/packages/client-api/src/desktop/current-window.ts b/packages/client-api/src/desktop/current-window.ts
deleted file mode 100644
index ed35922f..00000000
--- a/packages/client-api/src/desktop/current-window.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import {
-  PhysicalPosition,
-  PhysicalSize,
-  getCurrentWindow,
-  type Window,
-} from '@tauri-apps/api/window';
-
-import { WindowZOrder } from '~/user-config';
-import { createLogger } from '~/utils';
-import { setAlwaysOnTop, setSkipTaskbar } from './desktop-commands';
-
-export interface WindowPosition {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
-export interface WindowStyles {
-  zOrder: WindowZOrder;
-  shownInTaskbar: boolean;
-  resizable: boolean;
-}
-
-const logger = createLogger('current-window');
-
-export async function setWindowPosition(
-  position: Partial<WindowPosition>,
-) {
-  logger.debug(`Setting window position to:`, position);
-
-  const window = getCurrentWindow();
-
-  // Avoid setting position if neither x/y are defined.
-  if (position.x !== undefined || position.y !== undefined) {
-    const newPosition = new PhysicalPosition(
-      position.x ?? (await window.outerPosition()).x,
-      position.y ?? (await window.outerPosition()).y,
-    );
-
-    // Set position twice to handle DPI changes on cross-monitor moves.
-    await window.setPosition(newPosition);
-    await window.setPosition(newPosition);
-  }
-
-  // Avoid setting size if neither width/height are defined.
-  if (position.width !== undefined || position.height !== undefined) {
-    const newSize = new PhysicalSize(
-      position.width ?? (await window.outerSize()).width,
-      position.height ?? (await window.outerSize()).height,
-    );
-
-    // Set size twice to handle DPI changes on cross-monitor moves.
-    await window.setSize(newSize);
-    await window.setSize(newSize);
-  }
-}
-
-export async function setWindowStyles(styles: Partial<WindowStyles>) {
-  const window = getCurrentWindow();
-
-  await Promise.all([
-    setSkipTaskbar(styles.shownInTaskbar !== true),
-    window.setResizable(styles.resizable === true),
-    setWindowZOrder(window, styles.zOrder),
-  ]);
-}
-
-export async function setWindowZOrder(
-  window: Window,
-  zOrder?: WindowZOrder,
-) {
-  if (zOrder === 'always_on_bottom') {
-    await window.setAlwaysOnBottom(true);
-  } else if (zOrder === 'always_on_top') {
-    await setAlwaysOnTop();
-  } else {
-    await window.setAlwaysOnTop(false);
-  }
-}
diff --git a/packages/client-api/src/desktop/desktop-commands.ts b/packages/client-api/src/desktop/desktop-commands.ts
index 1a185440..a546a8e9 100644
--- a/packages/client-api/src/desktop/desktop-commands.ts
+++ b/packages/client-api/src/desktop/desktop-commands.ts
@@ -4,60 +4,45 @@ import {
 } from '@tauri-apps/api/core';
 
 import { createLogger } from '../utils';
-import type { WindowState } from './shared';
 import type { ProviderConfig } from '~/providers';
 
 const logger = createLogger('desktop-commands');
 
-/**
- * Get state associated with the given {@link windowId}.
- */
-export function getWindowState(
-  windowId: string,
-): Promise<WindowState | null> {
-  return invoke<WindowState | null>('get_window_state', {
-    windowId,
-  });
-}
+export const desktopCommands = {
+  startWidget,
+  listenProvider,
+  unlistenProvider,
+  setAlwaysOnTop,
+  setSkipTaskbar,
+};
 
-export function openWindow(configPath: string): Promise<void> {
-  return invoke<void>('open_window', { configPath });
+function startWidget(configPath: string): Promise<void> {
+  return invoke<void>('start_widget', { configPath });
 }
 
-// TODO: Add support for only fetching selected variables.
-export function listenProvider(args: {
+function listenProvider(args: {
   configHash: string;
   config: ProviderConfig;
-  trackedAccess: string[];
 }): Promise<void> {
   return invoke<void>('listen_provider', args);
 }
 
-export function unlistenProvider(configHash: string): Promise<void> {
+function unlistenProvider(configHash: string): Promise<void> {
   return invoke<void>('unlisten_provider', { configHash });
 }
 
-export function setAlwaysOnTop(): Promise<void> {
+function setAlwaysOnTop(): Promise<void> {
   return invoke<void>('set_always_on_top');
 }
 
-export function setSkipTaskbar(skip: boolean): Promise<void> {
+function setSkipTaskbar(skip: boolean): Promise<void> {
   return invoke<void>('set_skip_taskbar', { skip });
 }
 
-// TODO: Implement this. Should kill the window and show error dialog. If
-// there are no windows remaining, then exit the app.
-export function exitWithError(message: string): never {
-  throw new Error(message);
-}
-
 /**
  * Invoke a Tauri command with logging and error handling.
  */
-export async function invoke<T>(
-  command: string,
-  args?: InvokeArgs,
-): Promise<T> {
+async function invoke<T>(command: string, args?: InvokeArgs): Promise<T> {
   logger.info(`Calling '${command}' with args:`, args ?? {});
 
   try {
diff --git a/packages/client-api/src/desktop/get-open-window-args.ts b/packages/client-api/src/desktop/get-open-window-args.ts
deleted file mode 100644
index d2c91f26..00000000
--- a/packages/client-api/src/desktop/get-open-window-args.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getCurrentWindow } from '@tauri-apps/api/window';
-
-import { getWindowState } from './desktop-commands';
-
-let promise: Promise<any> | null = null;
-
-export async function _getOpenWindowArgs() {
-  return promise ?? (promise = fetchOpenWindowArgs());
-}
-
-async function fetchOpenWindowArgs() {
-  if (window.__ZEBAR_INITIAL_STATE) {
-    return window.__ZEBAR_INITIAL_STATE;
-  }
-
-  return getWindowState(getCurrentWindow().label);
-}
diff --git a/packages/client-api/src/desktop/index.ts b/packages/client-api/src/desktop/index.ts
index a9872ab4..3a722ba1 100644
--- a/packages/client-api/src/desktop/index.ts
+++ b/packages/client-api/src/desktop/index.ts
@@ -1,6 +1,6 @@
-export * from './shared';
-export * from './current-window';
 export * from './desktop-commands';
-export * from './desktop-events';
 export * from './dialogs';
 export * from './monitors';
+export * from './provider-emit';
+export * from './widgets';
+export * from './windows';
diff --git a/packages/client-api/src/desktop/monitors.ts b/packages/client-api/src/desktop/monitors.ts
index db74f40b..92b20197 100644
--- a/packages/client-api/src/desktop/monitors.ts
+++ b/packages/client-api/src/desktop/monitors.ts
@@ -1,20 +1,50 @@
 import {
-  type Monitor,
+  type Monitor as TauriMonitor,
   availableMonitors as getAvailableMonitors,
   currentMonitor as getCurrentMonitor,
   primaryMonitor as getPrimaryMonitor,
   getCurrentWindow,
 } from '@tauri-apps/api/window';
 
-import type { MonitorInfo } from './shared';
+export interface Monitor {
+  /**
+   * Human-readable name of the monitor.
+   */
+  name: string | null;
+
+  /**
+   * Width of monitor in physical pixels.
+   */
+  width: number;
+
+  /**
+   * Height of monitor in physical pixels.
+   */
+  height: number;
+
+  /**
+   * X-coordinate of monitor in physical pixels.
+   */
+  x: number;
+
+  /**
+   * Y-coordinate of monitor in physical pixels.
+   */
+  y: number;
+
+  /**
+   * Scale factor to map physical pixels to logical pixels.
+   */
+  scaleFactor: number;
+}
 
 let createCachePromise: Promise<MonitorCache> | null = null;
 
 interface MonitorCache {
-  currentMonitor: MonitorInfo | null;
-  primaryMonitor: MonitorInfo | null;
-  secondaryMonitors: MonitorInfo[];
-  allMonitors: MonitorInfo[];
+  currentMonitor: Monitor | null;
+  primaryMonitor: Monitor | null;
+  secondaryMonitors: Monitor[];
+  allMonitors: Monitor[];
 }
 
 export async function getMonitors() {
@@ -37,10 +67,10 @@ async function createMonitorCache() {
   // Ref https://github.com/tauri-apps/tauri/issues/8405
 
   const monitorCache = {
-    currentMonitor: currentMonitor ? toMonitorInfo(currentMonitor) : null,
-    primaryMonitor: primaryMonitor ? toMonitorInfo(primaryMonitor) : null,
-    secondaryMonitors: secondaryMonitors.map(toMonitorInfo),
-    allMonitors: allMonitors.map(toMonitorInfo),
+    currentMonitor: currentMonitor ? toMonitor(currentMonitor) : null,
+    primaryMonitor: primaryMonitor ? toMonitor(primaryMonitor) : null,
+    secondaryMonitors: secondaryMonitors.map(toMonitor),
+    allMonitors: allMonitors.map(toMonitor),
   };
 
   getCurrentWindow().onResized(() => updateCurrentMonitor());
@@ -52,16 +82,14 @@ async function createMonitorCache() {
 
     // TODO: Avoid mutating the cache object.
     Object.assign(monitorCache, {
-      currentMonitor: currentMonitor
-        ? toMonitorInfo(currentMonitor)
-        : null,
+      currentMonitor: currentMonitor ? toMonitor(currentMonitor) : null,
     });
   }
 
   return monitorCache;
 }
 
-function isMatch(monitorA: Monitor, monitorB: Monitor) {
+function isMatch(monitorA: TauriMonitor, monitorB: TauriMonitor) {
   return (
     monitorA.name === monitorB.name &&
     monitorA.position.x === monitorB.position.x &&
@@ -71,13 +99,13 @@ function isMatch(monitorA: Monitor, monitorB: Monitor) {
   );
 }
 
-function toMonitorInfo(monitor: Monitor): MonitorInfo {
+function toMonitor(monitor: TauriMonitor): Monitor {
   return {
-    name: monitor.name ?? '',
-    scaleFactor: monitor.scaleFactor,
+    name: monitor.name,
     width: monitor.size.width,
     height: monitor.size.height,
     x: monitor.position.x,
     y: monitor.position.y,
+    scaleFactor: monitor.scaleFactor,
   };
 }
diff --git a/packages/client-api/src/desktop/desktop-events.ts b/packages/client-api/src/desktop/provider-emit.ts
similarity index 93%
rename from packages/client-api/src/desktop/desktop-events.ts
rename to packages/client-api/src/desktop/provider-emit.ts
index 5e3f90dd..ae326fa4 100644
--- a/packages/client-api/src/desktop/desktop-events.ts
+++ b/packages/client-api/src/desktop/provider-emit.ts
@@ -6,7 +6,7 @@ import {
 import type { ProviderConfig } from '~/providers';
 
 import { createLogger, simpleHash } from '~/utils';
-import { listenProvider, unlistenProvider } from './desktop-commands';
+import { desktopCommands } from './desktop-commands';
 
 const logger = createLogger('desktop-events');
 
@@ -36,10 +36,9 @@ export async function onProviderEmit<T = unknown>(
   const unlisten = await (listenPromise ??
     (listenPromise = listenProviderEmit()));
 
-  await listenProvider({
+  await desktopCommands.listenProvider({
     configHash,
     config,
-    trackedAccess: [],
   });
 
   return async () => {
@@ -47,7 +46,7 @@ export async function onProviderEmit<T = unknown>(
       callback => callback.configHash !== configHash,
     );
 
-    await unlistenProvider(configHash);
+    await desktopCommands.unlistenProvider(configHash);
 
     // Unlisten when there are no active callbacks.
     if (callbacks.length === 0) {
diff --git a/packages/client-api/src/desktop/shared/index.ts b/packages/client-api/src/desktop/shared/index.ts
deleted file mode 100644
index 07e227a5..00000000
--- a/packages/client-api/src/desktop/shared/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './monitor-info.model';
-export * from './window-state.model';
diff --git a/packages/client-api/src/desktop/shared/monitor-info.model.ts b/packages/client-api/src/desktop/shared/monitor-info.model.ts
deleted file mode 100644
index 1656814c..00000000
--- a/packages/client-api/src/desktop/shared/monitor-info.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface MonitorInfo {
-  name: string;
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-  scaleFactor: number;
-}
diff --git a/packages/client-api/src/desktop/shared/window-state.model.ts b/packages/client-api/src/desktop/shared/window-state.model.ts
deleted file mode 100644
index f348c881..00000000
--- a/packages/client-api/src/desktop/shared/window-state.model.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { WindowConfig } from '~/user-config';
-
-export interface WindowState {
-  windowId: string;
-
-  config: WindowConfig;
-
-  configPath: string;
-}
diff --git a/packages/client-api/src/desktop/widgets.ts b/packages/client-api/src/desktop/widgets.ts
new file mode 100644
index 00000000..3df46f03
--- /dev/null
+++ b/packages/client-api/src/desktop/widgets.ts
@@ -0,0 +1,62 @@
+import { join } from '@tauri-apps/api/path';
+
+import { desktopCommands } from './desktop-commands';
+
+export interface Widget {
+  /**
+   * Unique identifier for the widget instance.
+   */
+  id: string;
+
+  /**
+   * Absolute path to the widget's config file.
+   */
+  configPath: string;
+
+  /**
+   * Absolute path to the widget's HTML file.
+   */
+  htmlPath: string;
+}
+
+function getWidgetState(): Widget {
+  if (window.__ZEBAR_STATE) {
+    return window.__ZEBAR_STATE;
+  }
+
+  const widgetState = sessionStorage.getItem('ZEBAR_STATE');
+
+  if (!widgetState) {
+    throw new Error('No widget state found.');
+  }
+
+  return JSON.parse(widgetState);
+}
+
+export function currentWidget(): Widget {
+  const state = getWidgetState();
+
+  return {
+    id: state.id,
+    configPath: state.configPath,
+    htmlPath: state.htmlPath,
+  };
+}
+
+/**
+ * Opens a new widget instance by a relative path to its config file.
+ */
+export async function startWidget(configPath: string) {
+  // Ensure the config path ends with '.zebar.json'.
+  const filePath = configPath.endsWith('.zebar.json')
+    ? configPath
+    : `${configPath}.zebar.json`;
+
+  const absolutePath = await join(
+    getWidgetState().configPath,
+    '../',
+    filePath,
+  );
+
+  return desktopCommands.startWidget(absolutePath);
+}
diff --git a/packages/client-api/src/desktop/windows.ts b/packages/client-api/src/desktop/windows.ts
new file mode 100644
index 00000000..259c5893
--- /dev/null
+++ b/packages/client-api/src/desktop/windows.ts
@@ -0,0 +1,39 @@
+import { getCurrentWindow } from '@tauri-apps/api/window';
+
+import { desktopCommands } from './desktop-commands';
+
+export type ZOrder = 'always_on_bottom' | 'always_on_top' | 'normal';
+
+export interface Window {
+  /**
+   * The underlying Tauri window.
+   */
+  readonly tauri: ReturnType<typeof getCurrentWindow>;
+
+  /**
+   * Sets the z-order of the Tauri window.
+   */
+  setZOrder(zOrder: ZOrder): Promise<void>;
+}
+
+/**
+ * Gets the window of the current widget.
+ */
+export function currentWindow(): Window {
+  return {
+    get tauri() {
+      return getCurrentWindow();
+    },
+    setZOrder,
+  };
+}
+
+async function setZOrder(zOrder: ZOrder) {
+  if (zOrder === 'always_on_bottom') {
+    await getCurrentWindow().setAlwaysOnBottom(true);
+  } else if (zOrder === 'always_on_top') {
+    await desktopCommands.setAlwaysOnTop();
+  } else {
+    await getCurrentWindow().setAlwaysOnTop(false);
+  }
+}
diff --git a/packages/client-api/src/index.ts b/packages/client-api/src/index.ts
index 8eca8acb..8b013ad1 100644
--- a/packages/client-api/src/index.ts
+++ b/packages/client-api/src/index.ts
@@ -1,3 +1,8 @@
-export * from './user-config';
-export * from './zebar-context.model';
-export * from './init';
+export * from './providers';
+export {
+  currentWidget,
+  currentWindow,
+  startWidget,
+  type Widget,
+  type Window,
+} from './desktop';
diff --git a/packages/client-api/src/init.ts b/packages/client-api/src/init.ts
deleted file mode 100644
index 23336ff5..00000000
--- a/packages/client-api/src/init.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { getCurrentWindow } from '@tauri-apps/api/window';
-import { join } from '@tauri-apps/api/path';
-
-import {
-  getWindowState,
-  openWindow,
-  setWindowZOrder,
-  showErrorDialog,
-} from '~/desktop';
-import { createLogger } from '~/utils';
-import { createProvider, createProviderGroup } from '~/providers';
-import type { ZebarContext } from './zebar-context.model';
-
-const logger = createLogger('init-window');
-
-/**
- * Handles initialization.
- */
-export async function init(): Promise<ZebarContext> {
-  try {
-    const currentWindow = getCurrentWindow();
-
-    const windowState =
-      window.__ZEBAR_INITIAL_STATE ??
-      (await getWindowState(currentWindow.label));
-
-    // @ts-ignore - TODO
-    return {
-      openWindow: async (configPath: string) => {
-        // Ensure the config path ends with '.zebar.json'.
-        const filePath = configPath.endsWith('.zebar.json')
-          ? configPath
-          : `${configPath}.zebar.json`;
-
-        const absolutePath = await join(
-          windowState.configPath,
-          '../',
-          filePath,
-        );
-
-        return openWindow(absolutePath);
-      },
-      createProvider,
-      createProviderGroup,
-      currentWindow: {
-        ...windowState,
-        tauri: currentWindow,
-        setZOrder: zOrder => {
-          return setWindowZOrder(currentWindow, zOrder);
-        },
-      },
-      allWindows: [],
-      currentMonitor: {},
-      allMonitors: [],
-    } as ZebarContext;
-  } catch (err) {
-    logger.error('Failed to initialize window:', err);
-
-    await showErrorDialog({
-      title: 'Failed to initialize window',
-      error: err,
-    });
-
-    // Error during window initialization is unrecoverable, so we close
-    // the window.
-    getCurrentWindow().close();
-    throw err;
-  }
-}
diff --git a/packages/client-api/src/providers/create-provider-group.ts b/packages/client-api/src/providers/create-provider-group.ts
index 6a99746c..c3eda5d3 100644
--- a/packages/client-api/src/providers/create-provider-group.ts
+++ b/packages/client-api/src/providers/create-provider-group.ts
@@ -1,4 +1,3 @@
-import type { ZebarContext } from '~/zebar-context.model';
 import {
   createProvider,
   type ProviderConfig,
@@ -80,7 +79,9 @@ export type ProviderGroup<T extends ProviderGroupConfig> = {
 };
 
 /**
- * Docs {@link ZebarContext.createProviderGroup}
+ * Creates multiple providers at once. A provider is a collection of
+ * functions and variables that can change over time. Alternatively, a
+ * single provider can be created using {@link createProvider}.
  */
 export async function createProviderGroup<T extends ProviderGroupConfig>(
   configMap: T,
diff --git a/packages/client-api/src/providers/create-provider.ts b/packages/client-api/src/providers/create-provider.ts
index a404e6b8..50592d92 100644
--- a/packages/client-api/src/providers/create-provider.ts
+++ b/packages/client-api/src/providers/create-provider.ts
@@ -1,4 +1,3 @@
-import type { ZebarContext } from '~/zebar-context.model';
 import {
   createBatteryProvider,
   type BatteryProvider,
@@ -90,7 +89,16 @@ export type ProviderConfig = ProviderConfigMap[keyof ProviderConfigMap];
 export type ProviderOutput = ProviderMap[keyof ProviderMap]['output'];
 
 /**
- * Docs {@link ZebarContext.createProvider}
+ * Creates a provider, which is a collection of functions and variables
+ * that can change over time. Alternatively, multiple providers can be
+ * created using {@link createProviderGroup}.
+ *
+ * Waits until the provider has emitted either its first output or first
+ * error. The provider will continue to output until its `stop` function is
+ * called.
+ *
+ * @throws If the provider config is invalid. *Does not throw* if the
+ * provider's first emission is an error.
  */
 export function createProvider<T extends ProviderConfig>(
   config: T,
diff --git a/packages/client-api/src/providers/glazewm/create-glazewm-provider.ts b/packages/client-api/src/providers/glazewm/create-glazewm-provider.ts
index 9ba7d3ab..1cf87e9a 100644
--- a/packages/client-api/src/providers/glazewm/create-glazewm-provider.ts
+++ b/packages/client-api/src/providers/glazewm/create-glazewm-provider.ts
@@ -70,7 +70,7 @@ export interface GlazeWmOutput {
   focusedMonitor: Monitor;
 
   /**
-   * Monitor that is nearest to this Zebar window.
+   * Monitor that is nearest to this Zebar widget.
    */
   currentMonitor: Monitor;
 
@@ -213,7 +213,7 @@ export async function createGlazeWmProvider(
 
         const { monitors: glazeWmMonitors } = await client.queryMonitors();
 
-        // Get GlazeWM monitor that corresponds to the Zebar window's monitor.
+        // Get GlazeWM monitor that corresponds to the widget's monitor.
         const currentGlazeWmMonitor = glazeWmMonitors.reduce((a, b) =>
           getCoordinateDistance(currentPosition, a) <
           getCoordinateDistance(currentPosition, b)
diff --git a/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts b/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts
index 699b8ddf..4fe9422c 100644
--- a/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts
+++ b/packages/client-api/src/providers/komorebi/create-komorebi-provider.ts
@@ -52,7 +52,7 @@ export interface KomorebiOutput {
   focusedMonitor: KomorebiMonitor;
 
   /**
-   * Monitor that is nearest to this Zebar window.
+   * Monitor that is nearest to this Zebar widget.
    */
   currentMonitor: KomorebiMonitor;
 }
diff --git a/packages/client-api/src/shims.d.ts b/packages/client-api/src/shims.d.ts
index b1dc5a88..d41d6f61 100644
--- a/packages/client-api/src/shims.d.ts
+++ b/packages/client-api/src/shims.d.ts
@@ -1,9 +1,4 @@
 interface Window {
-  __TAURI__: any;
-  __ZEBAR_INITIAL_STATE: import('./desktop').WindowState;
-}
-
-declare module '*.css' {
-  const src: string;
-  export default src;
+  // TODO: Add typing.
+  __ZEBAR_STATE: any;
 }
diff --git a/packages/client-api/src/user-config/index.ts b/packages/client-api/src/user-config/index.ts
deleted file mode 100644
index d2673b74..00000000
--- a/packages/client-api/src/user-config/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './window-config';
diff --git a/packages/client-api/src/user-config/window-config.ts b/packages/client-api/src/user-config/window-config.ts
deleted file mode 100644
index 2a120393..00000000
--- a/packages/client-api/src/user-config/window-config.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-export interface WindowConfig {
-  /**
-   * Whether to show the window above/below all others.
-   */
-  z_order: WindowZOrder;
-
-  /**
-   * Whether the window should be shown in the taskbar.
-   */
-  shown_in_taskbar: boolean;
-
-  /**
-   * Whether the window should have resize handles.
-   */
-  resizable: boolean;
-
-  /**
-   * Whether the window is transparent.
-   */
-  transparent: boolean;
-
-  /**
-   * Entry point HTML file for the window.
-   */
-  html_path: string;
-
-  /**
-   * Where to place the window.
-   */
-  placements: WindowPlacement[];
-}
-
-export enum WindowZOrder {
-  ALWAYS_ON_BOTTOM = 'always_on_bottom',
-  ALWAYS_ON_TOP = 'always_on_top',
-  NORMAL = 'normal',
-}
-
-export interface WindowPlacement {
-  /**
-   * The monitor index to place the window on.
-   */
-  monitor_index: 0;
-
-  /**
-   * TODO: Add description.
-   */
-  position: WindowPosition;
-
-  /**
-   * TODO: Add description.
-   */
-  offset_x: 20;
-
-  /**
-   * TODO: Add description.
-   */
-  offset_y: 20;
-}
-
-export enum WindowPosition {
-  TOP = 'top',
-  BOTTOM = 'bottom',
-  LEFT = 'left',
-  RIGHT = 'right',
-}
diff --git a/packages/client-api/src/utils/convert-bytes.ts b/packages/client-api/src/utils/convert-bytes.ts
deleted file mode 100644
index f757b772..00000000
--- a/packages/client-api/src/utils/convert-bytes.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-const bitUnits = ['b', 'Kb', 'Mb', 'Gb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb'];
-
-const byteCommonUnits = [
-  'B',
-  'KB',
-  'MB',
-  'GB',
-  'TB',
-  'PB',
-  'EB',
-  'ZB',
-  'YB',
-];
-
-const byteIECUnits = [
-  'B',
-  'KiB',
-  'MiB',
-  'GiB',
-  'TiB',
-  'PiB',
-  'EiB',
-  'ZiB',
-  'YiB',
-];
-
-export enum DataUnit {
-  BITS = 'bits',
-  SI_BYTES = 'si_bytes',
-  IEC_BYTES = 'iec_bytes',
-}
-
-export function convertBytes(
-  bytes: number,
-  decimals: number = 0,
-  unitType: DataUnit = DataUnit.BITS,
-) {
-  let unitIndex = 1; // Kb/KB/KiB
-
-  if (unitType === DataUnit.BITS) {
-    bytes *= 8;
-    return convert(1000, bitUnits, bytes, decimals, unitIndex);
-  }
-
-  if (unitType === DataUnit.SI_BYTES) {
-    return convert(1000, byteCommonUnits, bytes, decimals, unitIndex);
-  }
-
-  if (unitType === DataUnit.IEC_BYTES) {
-    return convert(1024, byteIECUnits, bytes, decimals, unitIndex);
-  }
-
-  return 'NoUnit';
-}
-
-function convert(
-  k: number,
-  units: string[],
-  bytes: number,
-  decimals: number,
-  unitIndex: number,
-) {
-  const dm = decimals < 0 ? 0 : decimals;
-
-  if (!+bytes) {
-    return `${(0.0).toFixed(dm)} ${units[unitIndex]}`;
-  }
-
-  let i = Math.floor(Math.log(bytes) / Math.log(k));
-
-  if (i < unitIndex) {
-    i = unitIndex;
-  }
-
-  return `${(bytes / Math.pow(k, i)).toFixed(dm)} ${units[i]?.trimStart()}`;
-}
diff --git a/packages/client-api/src/utils/index.ts b/packages/client-api/src/utils/index.ts
index 7f41fa57..fdf86944 100644
--- a/packages/client-api/src/utils/index.ts
+++ b/packages/client-api/src/utils/index.ts
@@ -1,4 +1,3 @@
-export * from './convert-bytes';
 export * from './create-logger';
 export * from './deferred';
 export * from './get-coordinate-distance';
diff --git a/packages/client-api/src/zebar-context.model.ts b/packages/client-api/src/zebar-context.model.ts
deleted file mode 100644
index d88ee37f..00000000
--- a/packages/client-api/src/zebar-context.model.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Window as TauriWindow } from '@tauri-apps/api/window';
-
-import type { WindowConfig, WindowZOrder } from '~/user-config';
-import type {
-  ProviderConfig,
-  ProviderGroup,
-  ProviderGroupConfig,
-  ProviderMap,
-} from './providers';
-
-export interface ZebarContext {
-  currentWindow: ZebarWindow;
-
-  allWindows: ZebarWindow;
-
-  currentMonitor: Monitor;
-
-  allMonitors: Monitor;
-
-  /**
-   * Opens a new window by a relative path to its config file.
-   */
-  openWindow(
-    configPath: string,
-    args?: Record<string, string>,
-  ): Promise<void>;
-
-  /**
-   * Creates an instance of a provider. Alternatively, multiple
-   * providers can be created using {@link createProviderGroup}.
-   *
-   * Waits until the provider has emitted either its first output or first
-   * error. The provider will continue to output until its `stop` function is
-   * called.
-   *
-   * @throws If the provider config is invalid. *Does not throw* if the
-   * provider's first emission is an error.
-   */
-  createProvider<T extends ProviderConfig>(
-    providerConfig: T,
-  ): Promise<ProviderMap[T['type']]>;
-
-  /**
-   * Creates multiple provider instances at once. Alternatively, a single
-   * provider can be created using {@link createProvider}.
-   */
-  createProviderGroup<T extends ProviderGroupConfig>(
-    configMap: T,
-  ): Promise<ProviderGroup<T>>;
-}
-
-export interface ZebarWindow {
-  /**
-   * Unique identifier for the window.
-   */
-  windowId: string;
-
-  /**
-   * Parsed window config.
-   */
-  config: WindowConfig;
-
-  /**
-   * Absolute path to the window's config file.
-   */
-  configPath: string;
-
-  /**
-   * Tauri window instance.
-   */
-  tauri: TauriWindow;
-
-  /**
-   * Sets the z-order of the window.
-   */
-  setZOrder(zOrder: WindowZOrder): Promise<void>;
-}
-
-export interface Monitor {
-  /**
-   * Human-readable name of the monitor.
-   */
-  name: string | null;
-
-  /**
-   * Width of monitor in physical pixels.
-   */
-  width: number;
-
-  /**
-   * Height of monitor in physical pixels.
-   */
-  height: number;
-
-  /**
-   * X-coordinate of monitor in physical pixels.
-   */
-  x: number;
-
-  /**
-   * Y-coordinate of monitor in physical pixels.
-   */
-  y: number;
-
-  /**
-   * Scale factor to map physical pixels to logical pixels.
-   */
-  scaleFactor: number;
-}
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index be717727..fb96cac1 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "build": "npm run tauri build -- --verbose",
-    "dev": "npm run tauri dev -- -- -- open-all --config-dir=../../examples",
+    "dev": "npm run tauri dev -- -- -- startup --config-dir=../../examples",
     "format": "cargo fmt",
     "lint": "cargo fmt --check",
     "tauri": "tauri"
diff --git a/packages/desktop/src/cli.rs b/packages/desktop/src/cli.rs
index aa0eec4f..ad35a31d 100644
--- a/packages/desktop/src/cli.rs
+++ b/packages/desktop/src/cli.rs
@@ -19,33 +19,36 @@ impl Cli {
 
 #[derive(Clone, Debug, PartialEq, Subcommand)]
 pub enum CliCommand {
-  /// Open a window by its config path.
+  /// Opens a widget by its config path. Uses its default placements.
   ///
   /// Config path is relative within the Zebar config directory (e.g.
-  /// `zebar open ./material/config.yaml`).
+  /// `zebar open-widget ./material/config.yaml`).
   ///
   /// Starts Zebar if it is not already running.
-  Open(OpenWindowArgs),
+  OpenWidgetDefaults(OpenWidgetDefaultsArgs),
 
-  /// Open all default windows.
+  /// Opens all widgets that are set to launch on startup.
   ///
   /// Starts Zebar if it is not already running.
-  OpenAll(OpenAllWindowsArgs),
+  Startup(StartupArgs),
 
-  /// Output available monitors.
-  Monitors(OutputMonitorsArgs),
+  /// Retrieves and outputs a specific part of the state.
+  ///
+  /// Requires an already running instance of Zebar.
+  #[clap(subcommand)]
+  Query(QueryArgs),
 
   /// Used when Zebar is launched with no arguments.
   ///
   /// If Zebar is already running, this command will no-op, otherwise it
-  /// will start Zebar and open all default windows.
+  /// will behave as `CliCommand::Startup`.
   #[clap(hide = true)]
   Empty,
 }
 
 #[derive(Args, Clone, Debug, PartialEq)]
-pub struct OpenWindowArgs {
-  /// Relative file path to window config within the Zebar config
+pub struct OpenWidgetDefaultsArgs {
+  /// Relative file path to widget config within the Zebar config
   /// directory.
   pub config_path: PathBuf,
 
@@ -57,7 +60,7 @@ pub struct OpenWindowArgs {
 }
 
 #[derive(Args, Clone, Debug, PartialEq)]
-pub struct OpenAllWindowsArgs {
+pub struct StartupArgs {
   /// Absolute or relative path to the Zebar config directory.
   ///
   /// The default path is `%userprofile%/.glzr/zebar/`
@@ -65,14 +68,10 @@ pub struct OpenAllWindowsArgs {
   pub config_dir: Option<PathBuf>,
 }
 
-#[derive(Args, Clone, Debug, PartialEq)]
-pub struct OutputMonitorsArgs {
-  /// Use ASCII NUL character (character code 0) instead of newlines
-  /// for delimiting monitors.
-  ///
-  /// Useful for piping to `xargs -0`.
-  #[clap(short, long)]
-  pub print0: bool,
+#[derive(Clone, Debug, Parser, PartialEq)]
+pub enum QueryArgs {
+  /// Outputs available monitors.
+  Monitors,
 }
 
 /// Prints to stdout/stderror and exits the process.
diff --git a/packages/desktop/src/commands.rs b/packages/desktop/src/commands.rs
index ed7b0f6b..f8ccf75d 100644
--- a/packages/desktop/src/commands.rs
+++ b/packages/desktop/src/commands.rs
@@ -6,33 +6,25 @@ use crate::{
   common::WindowExt,
   config::Config,
   providers::{ProviderConfig, ProviderManager},
-  window_factory::{WindowFactory, WindowState},
+  widget_factory::WidgetFactory,
 };
 
 #[tauri::command]
-pub async fn get_window_state(
-  window_id: String,
-  window_factory: State<'_, Arc<WindowFactory>>,
-) -> anyhow::Result<Option<WindowState>, String> {
-  Ok(window_factory.state_by_id(&window_id).await)
-}
-
-#[tauri::command]
-pub async fn open_window(
+pub async fn start_widget(
   config_path: String,
   config: State<'_, Arc<Config>>,
-  window_factory: State<'_, Arc<WindowFactory>>,
+  widget_factory: State<'_, Arc<WidgetFactory>>,
 ) -> anyhow::Result<(), String> {
-  let window_config = config
-    .window_config_by_path(&PathBuf::from(config_path))
+  let widget_config = config
+    .widget_config_by_path(&PathBuf::from(config_path))
     .await
     .and_then(|opt| {
-      opt.ok_or_else(|| anyhow::anyhow!("Window config not found."))
+      opt.ok_or_else(|| anyhow::anyhow!("Widget config not found."))
     })
     .map_err(|err| err.to_string())?;
 
-  window_factory
-    .open(window_config)
+  widget_factory
+    .open(widget_config)
     .await
     .map_err(|err| err.to_string())
 }
@@ -41,11 +33,10 @@ pub async fn open_window(
 pub async fn listen_provider(
   config_hash: String,
   config: ProviderConfig,
-  tracked_access: Vec<String>,
   provider_manager: State<'_, Arc<ProviderManager>>,
 ) -> anyhow::Result<(), String> {
   provider_manager
-    .create(config_hash, config, tracked_access)
+    .create(config_hash, config)
     .await
     .map_err(|err| err.to_string())
 }
diff --git a/packages/desktop/src/config.rs b/packages/desktop/src/config.rs
index bf64e6b7..b1cc0a70 100644
--- a/packages/desktop/src/config.rs
+++ b/packages/desktop/src/config.rs
@@ -21,59 +21,52 @@ pub struct SettingsConfig {
   #[serde(rename = "$schema")]
   schema: Option<String>,
 
-  /// Relative paths to window configs to launch on startup.
+  /// Relative paths to widget configs to launch on startup.
   pub startup_configs: Vec<PathBuf>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WindowConfig {
-  /// JSON schema URL to validate the window config file.
+pub struct WidgetConfig {
+  /// JSON schema URL to validate the widget config file.
   #[serde(rename = "$schema")]
   schema: Option<String>,
 
   /// Relative path to entry point HTML file.
   pub html_path: PathBuf,
 
-  /// Default options for when the window is opened.
-  pub launch_options: WindowLaunchOptions,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct WindowLaunchOptions {
-  /// Whether to show the window above/below all others.
-  pub z_order: WindowZOrder,
+  /// Whether to show the Tauri window above/below all others.
+  pub z_order: ZOrder,
 
-  /// Whether the window should be shown in the taskbar.
+  /// Whether the Tauri window should be shown in the taskbar.
   pub shown_in_taskbar: bool,
 
-  /// Whether the window should be focused when opened.
+  /// Whether the Tauri window should be focused when opened.
   pub focused: bool,
 
-  /// Whether the window should have resize handles.
+  /// Whether the Tauri window should have resize handles.
   pub resizable: bool,
 
-  /// Whether the window frame should be transparent.
+  /// Whether the Tauri window frame should be transparent.
   pub transparent: bool,
 
-  /// Where to place the window.
-  pub placements: Vec<WindowPlacement>,
+  /// Where to place the widget.
+  pub default_placements: Vec<WidgetPlacement>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
-pub enum WindowZOrder {
-  AlwaysOnBottom,
-  AlwaysOnTop,
+pub enum ZOrder {
+  BottomMost,
   Normal,
+  TopMost,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct WindowPlacement {
-  /// Anchor-point of the window.
-  pub anchor: WindowAnchor,
+pub struct WidgetPlacement {
+  /// Anchor-point of the widget.
+  pub anchor: AnchorPoint,
 
   /// Offset from the anchor-point.
   pub offset_x: LengthValue,
@@ -81,19 +74,19 @@ pub struct WindowPlacement {
   /// Offset from the anchor-point.
   pub offset_y: LengthValue,
 
-  /// Width of the window in % or physical pixels.
+  /// Width of the widget in % or physical pixels.
   pub width: LengthValue,
 
-  /// Height of the window in % or physical pixels.
+  /// Height of the widget in % or physical pixels.
   pub height: LengthValue,
 
-  /// Monitor(s) to place the window on.
+  /// Monitor(s) to place the widget on.
   pub monitor_selection: MonitorSelection,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "snake_case")]
-pub enum WindowAnchor {
+pub enum AnchorPoint {
   TopLeft,
   TopCenter,
   TopRight,
@@ -106,7 +99,7 @@ pub enum WindowAnchor {
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
+#[serde(tag = "type", content = "match", rename_all = "snake_case")]
 pub enum MonitorSelection {
   All,
   Primary,
@@ -126,28 +119,28 @@ pub struct Config {
   /// Global settings.
   pub settings: Arc<Mutex<SettingsConfig>>,
 
-  /// List of window configs.
-  pub window_configs: Arc<Mutex<Vec<WindowConfigEntry>>>,
+  /// List of widget configs.
+  pub widget_configs: Arc<Mutex<Vec<WidgetConfigEntry>>>,
 
   _settings_change_rx: broadcast::Receiver<SettingsConfig>,
 
   pub settings_change_tx: broadcast::Sender<SettingsConfig>,
 
-  _window_configs_change_rx: broadcast::Receiver<Vec<WindowConfigEntry>>,
+  _widget_configs_change_rx: broadcast::Receiver<Vec<WidgetConfigEntry>>,
 
-  pub window_configs_change_tx: broadcast::Sender<Vec<WindowConfigEntry>>,
+  pub widget_configs_change_tx: broadcast::Sender<Vec<WidgetConfigEntry>>,
 }
 
 #[derive(Clone, Debug)]
-pub struct WindowConfigEntry {
-  /// Absolute path to the window config file.
+pub struct WidgetConfigEntry {
+  /// Absolute path to the widget's config file.
   pub config_path: PathBuf,
 
-  /// Absolute path to the window's HTML file.
+  /// Absolute path to the widget's HTML file.
   pub html_path: PathBuf,
 
-  /// Parsed window config.
-  pub config: WindowConfig,
+  /// Parsed widget config.
+  pub config: WidgetConfig,
 }
 
 impl Config {
@@ -167,21 +160,21 @@ impl Config {
     };
 
     let settings = Self::read_settings_or_init(app_handle, &config_dir)?;
-    let window_configs = Self::read_window_configs(&config_dir)?;
+    let widget_configs = Self::read_widget_configs(&config_dir)?;
 
     let (settings_change_tx, _settings_change_rx) = broadcast::channel(16);
-    let (window_configs_change_tx, _window_configs_change_rx) =
+    let (widget_configs_change_tx, _widget_configs_change_rx) =
       broadcast::channel(16);
 
     Ok(Self {
       app_handle: app_handle.clone(),
       config_dir: config_dir.to_absolute()?,
       settings: Arc::new(Mutex::new(settings)),
-      window_configs: Arc::new(Mutex::new(window_configs)),
+      widget_configs: Arc::new(Mutex::new(widget_configs)),
       _settings_change_rx,
       settings_change_tx,
-      _window_configs_change_rx,
-      window_configs_change_tx,
+      _widget_configs_change_rx,
+      widget_configs_change_tx,
     })
   }
 
@@ -189,7 +182,7 @@ impl Config {
   pub async fn reload(&self) -> anyhow::Result<()> {
     let new_settings =
       Self::read_settings_or_init(&self.app_handle, &self.config_dir)?;
-    let new_window_configs = Self::read_window_configs(&self.config_dir)?;
+    let new_widget_configs = Self::read_widget_configs(&self.config_dir)?;
 
     {
       let mut settings = self.settings.lock().await;
@@ -197,12 +190,12 @@ impl Config {
     }
 
     {
-      let mut window_configs = self.window_configs.lock().await;
-      *window_configs = new_window_configs.clone();
+      let mut widget_configs = self.widget_configs.lock().await;
+      *widget_configs = new_widget_configs.clone();
     }
 
     self.settings_change_tx.send(new_settings)?;
-    self.window_configs_change_tx.send(new_window_configs)?;
+    self.widget_configs_change_tx.send(new_widget_configs)?;
 
     Ok(())
   }
@@ -263,13 +256,13 @@ impl Config {
     Ok(())
   }
 
-  /// Recursively aggregates all valid window configs in the given
+  /// Recursively aggregates all valid widget configs in the given
   /// directory.
   ///
   /// Returns a list of `ConfigEntry` instances.
-  fn read_window_configs(
+  fn read_widget_configs(
     dir: &PathBuf,
-  ) -> anyhow::Result<Vec<WindowConfigEntry>> {
+  ) -> anyhow::Result<Vec<WidgetConfigEntry>> {
     let mut configs = Vec::new();
 
     let entries = fs::read_dir(dir).with_context(|| {
@@ -282,9 +275,9 @@ impl Config {
 
       if path.is_dir() {
         // Recursively aggregate configs in subdirectories.
-        configs.extend(Self::read_window_configs(&path)?);
+        configs.extend(Self::read_widget_configs(&path)?);
       } else if has_extension(&path, ".zebar.json") {
-        let parse_res = read_and_parse_json::<WindowConfig>(&path)
+        let parse_res = read_and_parse_json::<WidgetConfig>(&path)
           .and_then(|config| {
             let config_path = path.to_absolute()?;
 
@@ -301,7 +294,7 @@ impl Config {
                 )
               })?;
 
-            Ok(WindowConfigEntry {
+            Ok(WidgetConfigEntry {
               config,
               config_path,
               html_path,
@@ -311,7 +304,7 @@ impl Config {
         match parse_res {
           Ok(config) => {
             info!(
-              "Found valid window config at: {}",
+              "Found valid widget config at: {}",
               config.config_path.display()
             );
 
@@ -331,10 +324,10 @@ impl Config {
     Ok(configs)
   }
 
-  /// Initializes settings and window configs at the given path.
+  /// Initializes settings and widget configs at the given path.
   ///
   /// `settings.json` is initialized with either `starter/vanilla.json` or
-  /// `starter/with-glazewm.json` as startup config. Window configs are
+  /// `starter/with-glazewm.json` as startup config. Widget configs are
   /// initialized from `examples/` directory.
   fn create_from_examples(
     app_handle: &AppHandle,
@@ -372,14 +365,14 @@ impl Config {
     Ok(())
   }
 
-  pub async fn window_configs(&self) -> Vec<WindowConfigEntry> {
-    self.window_configs.lock().await.clone()
+  pub async fn widget_configs(&self) -> Vec<WidgetConfigEntry> {
+    self.widget_configs.lock().await.clone()
   }
 
-  /// Returns the window configs to open on startup.
-  pub async fn startup_window_configs(
+  /// Returns the widget configs to open on startup.
+  pub async fn startup_widget_configs(
     &self,
-  ) -> anyhow::Result<Vec<WindowConfigEntry>> {
+  ) -> anyhow::Result<Vec<WidgetConfigEntry>> {
     let startup_configs =
       { self.settings.lock().await.startup_configs.clone() };
 
@@ -388,11 +381,11 @@ impl Config {
     for config_path in startup_configs {
       let abs_config_path = self.join_config_dir(&config_path);
       let config = self
-        .window_config_by_path(&abs_config_path)
+        .widget_config_by_path(&abs_config_path)
         .await
         .unwrap_or(None)
         .context(format!(
-          "Failed to get window config at {}.",
+          "Failed to get widget config at {}.",
           abs_config_path.display()
         ))?;
 
@@ -409,7 +402,7 @@ impl Config {
     &self,
     config_path: &PathBuf,
   ) -> anyhow::Result<()> {
-    let startup_configs = self.startup_window_configs().await?;
+    let startup_configs = self.startup_widget_configs().await?;
 
     // Check if the config is already set to be launched on startup.
     if startup_configs
@@ -470,16 +463,16 @@ impl Config {
       .map(Into::into)
   }
 
-  /// Returns the window config at the given absolute path.
-  pub async fn window_config_by_path(
+  /// Returns the widget config at the given absolute path.
+  pub async fn widget_config_by_path(
     &self,
     config_path: &PathBuf,
-  ) -> anyhow::Result<Option<WindowConfigEntry>> {
+  ) -> anyhow::Result<Option<WidgetConfigEntry>> {
     let formatted_config_path =
       PathBuf::from(config_path).to_absolute()?;
 
-    let window_configs = self.window_configs.lock().await;
-    let config_entry = window_configs
+    let widget_configs = self.widget_configs.lock().await;
+    let config_entry = widget_configs
       .iter()
       .find(|entry| entry.config_path == formatted_config_path);
 
diff --git a/packages/desktop/src/main.rs b/packages/desktop/src/main.rs
index 18a2ae1d..af5e7925 100644
--- a/packages/desktop/src/main.rs
+++ b/packages/desktop/src/main.rs
@@ -13,12 +13,12 @@ use tracing::{error, info, level_filters::LevelFilter};
 use tracing_subscriber::EnvFilter;
 
 use crate::{
-  cli::{Cli, CliCommand, OutputMonitorsArgs},
+  cli::{Cli, CliCommand, QueryArgs},
   config::Config,
   monitor_state::MonitorState,
   providers::ProviderManager,
   sys_tray::SysTray,
-  window_factory::WindowFactory,
+  widget_factory::WidgetFactory,
 };
 
 mod cli;
@@ -28,7 +28,7 @@ mod config;
 mod monitor_state;
 mod providers;
 mod sys_tray;
-mod window_factory;
+mod widget_factory;
 
 /// Main entry point for the application.
 ///
@@ -48,7 +48,7 @@ async fn main() -> anyhow::Result<()> {
   let cli = Cli::parse();
 
   match cli.command() {
-    CliCommand::Monitors(args) => output_monitors(args),
+    CliCommand::Query(args) => output_query(args),
     _ => {
       let start_res = start_app(cli);
 
@@ -64,18 +64,22 @@ async fn main() -> anyhow::Result<()> {
   }
 }
 
-/// Prints available monitors to console.
-fn output_monitors(args: OutputMonitorsArgs) -> anyhow::Result<()> {
-  let _ = tauri::Builder::default().setup(|app| {
-    let monitors = MonitorState::new(app.handle());
-    cli::print_and_exit(monitors.output_str(args));
-    Ok(())
-  });
+/// Query state and print to the console.
+fn output_query(args: QueryArgs) -> anyhow::Result<()> {
+  match args {
+    QueryArgs::Monitors => {
+      let _ = tauri::Builder::default().setup(|app| {
+        let monitors = MonitorState::new(app.handle());
+        cli::print_and_exit(monitors.output_str());
+        Ok(())
+      });
 
-  Ok(())
+      Ok(())
+    }
+  }
 }
 
-/// Starts Zebar - either with a specific window or all windows.
+/// Starts Zebar - either with a specific widget or all widgets.
 fn start_app(cli: Cli) -> anyhow::Result<()> {
   tracing_subscriber::fmt()
     .with_env_filter(
@@ -91,8 +95,8 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
       task::block_in_place(|| {
         block_on(async move {
           let config_dir_override = match cli.command() {
-            CliCommand::Open(args) => args.config_dir,
-            CliCommand::OpenAll(args) => args.config_dir,
+            CliCommand::OpenWidgetDefaults(args) => args.config_dir,
+            CliCommand::Startup(args) => args.config_dir,
             _ => None,
           };
 
@@ -105,13 +109,13 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
           let monitor_state = Arc::new(MonitorState::new(app.handle()));
           app.manage(monitor_state.clone());
 
-          // Initialize `WindowFactory` in Tauri state.
-          let window_factory = Arc::new(WindowFactory::new(
+          // Initialize `WidgetFactory` in Tauri state.
+          let widget_factory = Arc::new(WidgetFactory::new(
             app.handle(),
             config.clone(),
             monitor_state.clone(),
           ));
-          app.manage(window_factory.clone());
+          app.manage(widget_factory.clone());
 
           // If this is not the first instance of the app, this will emit
           // within the original instance and exit immediately. The CLI
@@ -119,7 +123,7 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
           setup_single_instance(
             app,
             config.clone(),
-            window_factory.clone(),
+            widget_factory.clone(),
           )?;
 
           // Prevent windows from showing up in the dock on MacOS.
@@ -139,11 +143,11 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
           let manager = Arc::new(ProviderManager::new(app.handle()));
           app.manage(manager);
 
-          // Open windows based on CLI command.
-          open_windows_by_cli_command(
+          // Open widgets based on CLI command.
+          open_widgets_by_cli_command(
             cli,
             config.clone(),
-            window_factory.clone(),
+            widget_factory.clone(),
           )
           .await?;
 
@@ -151,19 +155,18 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
           let tray = SysTray::new(
             app.handle(),
             config.clone(),
-            window_factory.clone(),
+            widget_factory.clone(),
           )
           .await?;
 
-          listen_events(config, monitor_state, window_factory, tray);
+          listen_events(config, monitor_state, widget_factory, tray);
 
           Ok(())
         })
       })
     })
     .invoke_handler(tauri::generate_handler![
-      commands::get_window_state,
-      commands::open_window,
+      commands::start_widget,
       commands::listen_provider,
       commands::unlisten_provider,
       commands::set_always_on_top,
@@ -186,25 +189,25 @@ fn start_app(cli: Cli) -> anyhow::Result<()> {
 fn listen_events(
   config: Arc<Config>,
   monitor_state: Arc<MonitorState>,
-  window_factory: Arc<WindowFactory>,
+  widget_factory: Arc<WidgetFactory>,
   tray: Arc<SysTray>,
 ) {
-  let mut window_open_rx = window_factory.open_tx.subscribe();
-  let mut window_close_rx = window_factory.close_tx.subscribe();
+  let mut widget_open_rx = widget_factory.open_tx.subscribe();
+  let mut widget_close_rx = widget_factory.close_tx.subscribe();
   let mut settings_change_rx = config.settings_change_tx.subscribe();
   let mut monitors_change_rx = monitor_state.change_tx.subscribe();
-  let mut window_configs_change_rx =
-    config.window_configs_change_tx.subscribe();
+  let mut widget_configs_change_rx =
+    config.widget_configs_change_tx.subscribe();
 
   task::spawn(async move {
     loop {
       let res = tokio::select! {
-        Ok(_) = window_open_rx.recv() => {
-          info!("Window opened.");
+        Ok(_) = widget_open_rx.recv() => {
+          info!("Widget opened.");
           tray.refresh().await
         },
-        Ok(_) = window_close_rx.recv() => {
-          info!("Window closed.");
+        Ok(_) = widget_close_rx.recv() => {
+          info!("Widget closed.");
           tray.refresh().await
         },
         Ok(_) = settings_change_rx.recv() => {
@@ -213,11 +216,11 @@ fn listen_events(
         },
         Ok(_) = monitors_change_rx.recv() => {
           info!("Monitors changed.");
-          window_factory.relaunch_all().await
+          widget_factory.relaunch_all().await
         },
-        Ok(_) = window_configs_change_rx.recv() => {
-          info!("Window configs changed.");
-          window_factory.relaunch_all().await
+        Ok(_) = widget_configs_change_rx.recv() => {
+          info!("Widget configs changed.");
+          widget_factory.relaunch_all().await
         },
       };
 
@@ -232,19 +235,19 @@ fn listen_events(
 fn setup_single_instance(
   app: &tauri::App,
   config: Arc<Config>,
-  window_factory: Arc<WindowFactory>,
+  widget_factory: Arc<WidgetFactory>,
 ) -> anyhow::Result<()> {
   app.handle().plugin(tauri_plugin_single_instance::init(
     move |_, args, _| {
       let config = config.clone();
-      let window_factory = window_factory.clone();
+      let widget_factory = widget_factory.clone();
 
       task::spawn(async move {
         let res = match Cli::try_parse_from(args) {
           Ok(cli) => {
             // No-op if no subcommand is provided.
             if cli.command() != CliCommand::Empty {
-              open_windows_by_cli_command(cli, config, window_factory)
+              open_widgets_by_cli_command(cli, config, widget_factory)
                 .await
             } else {
               Ok(())
@@ -263,31 +266,31 @@ fn setup_single_instance(
   Ok(())
 }
 
-/// Opens windows based on CLI command.
-async fn open_windows_by_cli_command(
+/// Opens widgets based on CLI command.
+async fn open_widgets_by_cli_command(
   cli: Cli,
   config: Arc<Config>,
-  window_factory: Arc<WindowFactory>,
+  widget_factory: Arc<WidgetFactory>,
 ) -> anyhow::Result<()> {
-  let window_configs = match cli.command() {
-    CliCommand::Open(args) => {
-      let window_config = config
-        .window_config_by_path(&config.join_config_dir(&args.config_path))
+  let widget_configs = match cli.command() {
+    CliCommand::OpenWidgetDefaults(args) => {
+      let widget_config = config
+        .widget_config_by_path(&config.join_config_dir(&args.config_path))
         .await?
         .with_context(|| {
           format!(
-            "Window config not found at {}.",
+            "Widget config not found at {}.",
             args.config_path.display()
           )
         })?;
 
-      vec![window_config]
+      vec![widget_config]
     }
-    _ => config.startup_window_configs().await?,
+    _ => config.startup_widget_configs().await?,
   };
 
-  for window_config in window_configs {
-    if let Err(err) = window_factory.open(window_config).await {
+  for widget_config in widget_configs {
+    if let Err(err) = widget_factory.open(widget_config).await {
       error!("Failed to open window: {:?}", err);
     }
   }
diff --git a/packages/desktop/src/monitor_state.rs b/packages/desktop/src/monitor_state.rs
index 79ba359e..3f7c45a3 100644
--- a/packages/desktop/src/monitor_state.rs
+++ b/packages/desktop/src/monitor_state.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use anyhow::bail;
+use serde::Serialize;
 use tauri::AppHandle;
 use tokio::{
   sync::{broadcast, Mutex},
@@ -8,12 +8,9 @@ use tokio::{
 };
 use tracing::info;
 
-use crate::{cli::OutputMonitorsArgs, config::MonitorSelection};
+use crate::config::MonitorSelection;
 
 pub struct MonitorState {
-  /// Handle to the Tauri application.
-  app_handle: AppHandle,
-
   _change_rx: broadcast::Receiver<Vec<Monitor>>,
 
   pub change_tx: broadcast::Sender<Vec<Monitor>>,
@@ -22,7 +19,7 @@ pub struct MonitorState {
   monitors: Arc<Mutex<Vec<Monitor>>>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct Monitor {
   pub name: Option<String>,
   pub is_primary: bool,
@@ -48,7 +45,6 @@ impl MonitorState {
     );
 
     Self {
-      app_handle: app_handle.clone(),
       monitors,
       _change_rx,
       change_tx,
@@ -121,34 +117,11 @@ impl MonitorState {
   }
 
   /// Returns a string representation of the monitors.
-  pub fn output_str(
-    &self,
-    args: OutputMonitorsArgs,
-  ) -> anyhow::Result<String> {
+  pub fn output_str(&self) -> anyhow::Result<String> {
     let monitors = self.monitors.try_lock()?;
 
-    if monitors.len() == 0 {
-      bail!("No monitors found")
-    }
-
-    let mut monitors_str = String::new();
-
-    for monitor in monitors.iter() {
-      monitors_str += &format!(
-      "MONITOR_NAME=\"{}\" MONITOR_X=\"{}\" MONITOR_Y=\"{}\" MONITOR_WIDTH=\"{}\" MONITOR_HEIGHT=\"{}\" MONITOR_SCALE_FACTOR=\"{}\"",
-      monitor.name.clone().unwrap_or("".into()),
-      monitor.x,
-      monitor.y,
-      monitor.width,
-      monitor.height,
-      monitor.scale_factor
-    );
-
-      monitors_str += match args.print0 {
-        true => "\0",
-        false => "\n",
-      };
-    }
+    let monitors_str =
+      serde_json::to_string::<Vec<Monitor>>(monitors.as_ref())?;
 
     Ok(monitors_str)
   }
diff --git a/packages/desktop/src/providers/provider_manager.rs b/packages/desktop/src/providers/provider_manager.rs
index 1f7069f8..b54afc80 100644
--- a/packages/desktop/src/providers/provider_manager.rs
+++ b/packages/desktop/src/providers/provider_manager.rs
@@ -38,7 +38,6 @@ impl ProviderManager {
     &self,
     config_hash: String,
     config: ProviderConfig,
-    _tracked_access: Vec<String>,
   ) -> anyhow::Result<()> {
     {
       let mut providers = self.providers.lock().await;
diff --git a/packages/desktop/src/sys_tray.rs b/packages/desktop/src/sys_tray.rs
index 84d619d1..cc6b4568 100644
--- a/packages/desktop/src/sys_tray.rs
+++ b/packages/desktop/src/sys_tray.rs
@@ -13,7 +13,7 @@ use tracing::{error, info};
 use crate::{
   common::PathExt,
   config::Config,
-  window_factory::{WindowFactory, WindowState},
+  widget_factory::{WidgetFactory, WidgetState},
 };
 
 #[derive(Debug, Clone)]
@@ -21,8 +21,8 @@ enum MenuEvent {
   ShowConfigFolder,
   ReloadConfigs,
   Exit,
-  ToggleWindowConfig { enable: bool, path: PathBuf },
-  ToggleStartupWindowConfig { enable: bool, path: PathBuf },
+  ToggleWidgetConfig { enable: bool, path: PathBuf },
+  ToggleStartupWidgetConfig { enable: bool, path: PathBuf },
 }
 
 impl ToString for MenuEvent {
@@ -31,16 +31,16 @@ impl ToString for MenuEvent {
       MenuEvent::ShowConfigFolder => "show_config_folder".to_string(),
       MenuEvent::ReloadConfigs => "reload_configs".to_string(),
       MenuEvent::Exit => "exit".to_string(),
-      MenuEvent::ToggleWindowConfig { enable, path } => {
+      MenuEvent::ToggleWidgetConfig { enable, path } => {
         format!(
-          "toggle_window_config_{}_{}",
+          "toggle_widget_config_{}_{}",
           enable,
           path.to_unicode_string()
         )
       }
-      MenuEvent::ToggleStartupWindowConfig { enable, path } => {
+      MenuEvent::ToggleStartupWidgetConfig { enable, path } => {
         format!(
-          "toggle_startup_window_config_{}_{}",
+          "toggle_startup_widget_config_{}_{}",
           enable,
           path.to_unicode_string()
         )
@@ -59,14 +59,14 @@ impl FromStr for MenuEvent {
       ["show", "config", "folder"] => Ok(Self::ShowConfigFolder),
       ["reload", "configs"] => Ok(Self::ReloadConfigs),
       ["exit"] => Ok(Self::Exit),
-      ["toggle", "window", "config", enable @ ("true" | "false"), path @ ..] => {
-        Ok(Self::ToggleWindowConfig {
+      ["toggle", "widget", "config", enable @ ("true" | "false"), path @ ..] => {
+        Ok(Self::ToggleWidgetConfig {
           enable: *enable == "true",
           path: PathBuf::from(path.join("_")),
         })
       }
-      ["toggle", "startup", "window", "config", enable @ ("true" | "false"), path @ ..] => {
-        Ok(Self::ToggleStartupWindowConfig {
+      ["toggle", "startup", "widget", "config", enable @ ("true" | "false"), path @ ..] => {
+        Ok(Self::ToggleStartupWidgetConfig {
           enable: *enable == "true",
           path: PathBuf::from(path.join("_")),
         })
@@ -80,7 +80,7 @@ impl FromStr for MenuEvent {
 pub struct SysTray {
   app_handle: AppHandle,
   config: Arc<Config>,
-  window_factory: Arc<WindowFactory>,
+  widget_factory: Arc<WidgetFactory>,
   tray_icon: Option<TrayIcon>,
 }
 
@@ -89,12 +89,12 @@ impl SysTray {
   pub async fn new(
     app_handle: &AppHandle,
     config: Arc<Config>,
-    window_factory: Arc<WindowFactory>,
+    widget_factory: Arc<WidgetFactory>,
   ) -> anyhow::Result<Arc<SysTray>> {
     let mut sys_tray = Self {
       app_handle: app_handle.clone(),
       config,
-      window_factory,
+      widget_factory,
       tray_icon: None,
     };
 
@@ -105,7 +105,7 @@ impl SysTray {
 
   async fn create_tray_icon(&self) -> anyhow::Result<TrayIcon> {
     let config = self.config.clone();
-    let window_factory = self.window_factory.clone();
+    let widget_factory = self.widget_factory.clone();
     let tooltip = format!("Zebar v{}", env!("VERSION_NUMBER"));
 
     let tray_icon = TrayIconBuilder::with_id("tray")
@@ -115,7 +115,7 @@ impl SysTray {
       .on_menu_event(move |app, event| {
         let app_handle = app.clone();
         let config = config.clone();
-        let window_factory = window_factory.clone();
+        let widget_factory = widget_factory.clone();
 
         task::spawn(async move {
           let event = MenuEvent::from_str(event.id.as_ref());
@@ -127,7 +127,7 @@ impl SysTray {
               event,
               app_handle,
               config,
-              window_factory,
+              widget_factory,
             )
             .await;
 
@@ -164,18 +164,18 @@ impl SysTray {
 
   /// Creates and returns the main system tray menu.
   async fn create_tray_menu(&self) -> anyhow::Result<Menu<Wry>> {
-    let window_states = self.window_factory.states_by_config_path().await;
+    let widget_states = self.widget_factory.states_by_config_path().await;
 
     let startup_config_paths = self
       .config
-      .startup_window_configs()
+      .startup_widget_configs()
       .await?
       .into_iter()
       .map(|entry| entry.config_path)
       .collect();
 
     let configs_menu = self
-      .create_configs_menu(&window_states, &startup_config_paths)
+      .create_configs_menu(&widget_states, &startup_config_paths)
       .await?;
 
     let mut tray_menu = MenuBuilder::new(&self.app_handle)
@@ -184,9 +184,9 @@ impl SysTray {
       .text(MenuEvent::ReloadConfigs, "Reload configs")
       .separator();
 
-    // Add submenus for currently active windows.
-    if !window_states.is_empty() {
-      for (config_path, states) in window_states {
+    // Add submenus for currently active widget.
+    if !widget_states.is_empty() {
+      for (config_path, states) in widget_states {
         let label = format!(
           "({}) {}",
           states.len(),
@@ -214,7 +214,7 @@ impl SysTray {
     event: MenuEvent,
     app_handle: AppHandle,
     config: Arc<Config>,
-    window_factory: Arc<WindowFactory>,
+    widget_factory: Arc<WidgetFactory>,
   ) -> anyhow::Result<()> {
     match event {
       MenuEvent::ShowConfigFolder => {
@@ -236,28 +236,28 @@ impl SysTray {
 
         Ok(())
       }
-      MenuEvent::ToggleWindowConfig { enable, path } => {
+      MenuEvent::ToggleWidgetConfig { enable, path } => {
         info!(
-          "Window config '{}' to be enabled: {}",
+          "Widget config '{}' to be enabled: {}",
           path.display(),
           enable
         );
 
         match enable {
           true => {
-            let window_config = config
-              .window_config_by_path(&path)
+            let widget_config = config
+              .widget_config_by_path(&path)
               .await?
-              .context("Window config not found.")?;
+              .context("Widget config not found.")?;
 
-            window_factory.open(window_config).await
+            widget_factory.open(widget_config).await
           }
-          false => window_factory.close_by_path(&path).await,
+          false => widget_factory.stop_by_path(&path).await,
         }
       }
-      MenuEvent::ToggleStartupWindowConfig { enable, path } => {
+      MenuEvent::ToggleStartupWidgetConfig { enable, path } => {
         info!(
-          "Window config '{}' to be launched on startup: {}",
+          "Widget config '{}' to be launched on startup: {}",
           path.display(),
           enable
         );
@@ -270,25 +270,25 @@ impl SysTray {
     }
   }
 
-  /// Creates and returns a submenu for the window configs.
+  /// Creates and returns a submenu for the widget configs.
   async fn create_configs_menu(
     &self,
-    window_states: &HashMap<PathBuf, Vec<WindowState>>,
+    widget_states: &HashMap<PathBuf, Vec<WidgetState>>,
     startup_config_paths: &Vec<PathBuf>,
   ) -> anyhow::Result<Submenu<Wry>> {
     let mut configs_menu =
-      SubmenuBuilder::new(&self.app_handle, "Window configs");
+      SubmenuBuilder::new(&self.app_handle, "Widget configs");
 
-    // Add each window config to the menu.
-    for window_config in &self.config.window_configs().await {
+    // Add each widget config to the menu.
+    for widget_config in &self.config.widget_configs().await {
       let label =
-        Self::format_config_path(&self.config, &window_config.config_path);
+        Self::format_config_path(&self.config, &widget_config.config_path);
 
       let menu_item = self.create_config_menu(
-        &window_config.config_path,
+        &widget_config.config_path,
         &label,
-        window_states.contains_key(&window_config.config_path),
-        startup_config_paths.contains(&window_config.config_path),
+        widget_states.contains_key(&widget_config.config_path),
+        startup_config_paths.contains(&widget_config.config_path),
       )?;
 
       configs_menu = configs_menu.item(&menu_item);
@@ -297,7 +297,7 @@ impl SysTray {
     Ok(configs_menu.build()?)
   }
 
-  /// Creates and returns a submenu for the given window config.
+  /// Creates and returns a submenu for the given widget config.
   fn create_config_menu(
     &self,
     config_path: &PathBuf,
@@ -307,7 +307,7 @@ impl SysTray {
   ) -> anyhow::Result<Submenu<Wry>> {
     let enabled_item = CheckMenuItem::with_id(
       &self.app_handle,
-      MenuEvent::ToggleWindowConfig {
+      MenuEvent::ToggleWidgetConfig {
         enable: !is_enabled,
         path: config_path.clone(),
       },
@@ -319,7 +319,7 @@ impl SysTray {
 
     let startup_item = CheckMenuItem::with_id(
       &self.app_handle,
-      MenuEvent::ToggleStartupWindowConfig {
+      MenuEvent::ToggleStartupWidgetConfig {
         enable: !is_launched_on_startup,
         path: config_path.clone(),
       },
diff --git a/packages/desktop/src/window_factory.rs b/packages/desktop/src/widget_factory.rs
similarity index 59%
rename from packages/desktop/src/window_factory.rs
rename to packages/desktop/src/widget_factory.rs
index 649e2c65..930f4ab0 100644
--- a/packages/desktop/src/window_factory.rs
+++ b/packages/desktop/src/widget_factory.rs
@@ -21,60 +21,61 @@ use tracing::{error, info};
 
 use crate::{
   common::{PathExt, WindowExt},
-  config::{Config, WindowAnchor, WindowConfig, WindowConfigEntry},
+  config::{AnchorPoint, Config, WidgetConfig, WidgetConfigEntry},
   monitor_state::MonitorState,
 };
 
-/// Manages the creation of Zebar windows.
-pub struct WindowFactory {
+/// Manages the creation of Zebar widgets.
+pub struct WidgetFactory {
   /// Handle to the Tauri application.
   app_handle: AppHandle,
 
-  _close_rx: broadcast::Receiver<WindowState>,
+  _close_rx: broadcast::Receiver<WidgetState>,
 
-  pub close_tx: broadcast::Sender<WindowState>,
+  pub close_tx: broadcast::Sender<WidgetState>,
 
   /// Reference to `Config`.
   config: Arc<Config>,
 
-  _open_rx: broadcast::Receiver<WindowState>,
+  _open_rx: broadcast::Receiver<WidgetState>,
 
-  pub open_tx: broadcast::Sender<WindowState>,
+  pub open_tx: broadcast::Sender<WidgetState>,
 
   /// Reference to `MonitorState`.
   ///
-  /// Used for window positioning.
+  /// Used for widget positioning.
   monitor_state: Arc<MonitorState>,
 
-  /// Running total of windows created.
+  /// Running total of widgets created.
   ///
-  /// Used to generate unique window labels.
-  window_count: Arc<AtomicU32>,
+  /// Used to generate unique widget ID's which are used as Tauri window
+  /// labels.
+  widget_count: Arc<AtomicU32>,
 
-  /// Map of window labels to window states.
-  window_states: Arc<Mutex<HashMap<String, WindowState>>>,
+  /// Map of widget ID's to their states.
+  widget_states: Arc<Mutex<HashMap<String, WidgetState>>>,
 }
 
 #[derive(Serialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
-pub struct WindowState {
-  /// Unique identifier for the window.
+pub struct WidgetState {
+  /// Unique identifier for the widget.
   ///
-  /// Used as the window label.
-  pub window_id: String,
+  /// Used as the Tauri window label.
+  pub id: String,
 
-  /// User-defined config for the window.
-  pub config: WindowConfig,
+  /// User-defined config for the widget.
+  pub config: WidgetConfig,
 
-  /// Absolute path to the window's config file.
+  /// Absolute path to the widget's config file.
   pub config_path: PathBuf,
 
-  /// Absolute path to the window's HTML file.
+  /// Absolute path to the widget's HTML file.
   pub html_path: PathBuf,
 }
 
-impl WindowFactory {
-  /// Creates a new `WindowFactory` instance.
+impl WidgetFactory {
+  /// Creates a new `WidgetFactory` instance.
   pub fn new(
     app_handle: &AppHandle,
     config: Arc<Config>,
@@ -91,27 +92,27 @@ impl WindowFactory {
       _open_rx,
       open_tx,
       monitor_state,
-      window_count: Arc::new(AtomicU32::new(0)),
-      window_states: Arc::new(Mutex::new(HashMap::new())),
+      widget_count: Arc::new(AtomicU32::new(0)),
+      widget_states: Arc::new(Mutex::new(HashMap::new())),
     }
   }
 
-  /// Opens windows from a given config entry.
+  /// Opens widget from a given config entry.
   pub async fn open(
     &self,
-    config_entry: WindowConfigEntry,
+    config_entry: WidgetConfigEntry,
   ) -> anyhow::Result<()> {
-    let WindowConfigEntry {
+    let WidgetConfigEntry {
       config,
       config_path,
       html_path,
     } = &config_entry;
 
-    for (size, position) in self.window_placements(config).await {
-      // Use running window count as a unique ID for the window.
+    for (size, position) in self.widget_placements(config).await {
+      // Use running widget count as a unique label for the Tauri window.
       let new_count =
-        self.window_count.fetch_add(1, Ordering::Relaxed) + 1;
-      let window_id = new_count.to_string();
+        self.widget_count.fetch_add(1, Ordering::Relaxed) + 1;
+      let widget_id = new_count.to_string();
 
       if !html_path.exists() {
         bail!(
@@ -122,7 +123,7 @@ impl WindowFactory {
       }
 
       info!(
-        "Creating window #{} from {}",
+        "Creating window for widget #{} from {}",
         new_count,
         config_path.display()
       );
@@ -134,30 +135,30 @@ impl WindowFactory {
       // Note that window label needs to be globally unique.
       let window = WebviewWindowBuilder::new(
         &self.app_handle,
-        window_id.clone(),
+        widget_id.clone(),
         webview_url,
       )
       .title("Zebar")
       .inner_size(size.width, size.height)
       .position(position.x, position.y)
-      .focused(config.launch_options.focused)
-      .skip_taskbar(!config.launch_options.shown_in_taskbar)
+      .focused(config.focused)
+      .skip_taskbar(!config.shown_in_taskbar)
       .visible_on_all_workspaces(true)
-      .transparent(config.launch_options.transparent)
+      .transparent(config.transparent)
       .shadow(false)
       .decorations(false)
-      .resizable(config.launch_options.resizable)
+      .resizable(config.resizable)
       .build()?;
 
-      let state = WindowState {
-        window_id: window_id.clone(),
+      let state = WidgetState {
+        id: widget_id.clone(),
         config: config.clone(),
         config_path: config_path.clone(),
         html_path: html_path.clone(),
       };
 
       _ = window.eval(&format!(
-        "window.__ZEBAR_INITIAL_STATE={}",
+        "window.__ZEBAR_STATE={0}; sessionStorage.setItem('ZEBAR_STATE', JSON.stringify({0}))",
         serde_json::to_string(&state)?
       ));
 
@@ -167,7 +168,7 @@ impl WindowFactory {
       let _ = window
         .as_ref()
         .window()
-        .set_tool_window(!config.launch_options.shown_in_taskbar);
+        .set_tool_window(!config.shown_in_taskbar);
 
       // On Windows, there's an issue where the window size is constrained
       // when initially created. To work around this, apply the size and
@@ -178,10 +179,10 @@ impl WindowFactory {
         let _ = window.set_position(position);
       }
 
-      let mut window_states = self.window_states.lock().await;
-      window_states.insert(state.window_id.clone(), state.clone());
+      let mut widget_states = self.widget_states.lock().await;
+      widget_states.insert(state.id.clone(), state.clone());
 
-      self.register_window_events(&window, window_id);
+      self.register_window_events(&window, widget_id);
       self.open_tx.send(state)?;
     }
 
@@ -199,26 +200,26 @@ impl WindowFactory {
     }
   }
 
-  /// Registers window events for a given window.
+  /// Registers window events for a given widget.
   fn register_window_events(
     &self,
     window: &tauri::WebviewWindow,
-    window_id: String,
+    widget_id: String,
   ) {
-    let window_states = self.window_states.clone();
+    let widget_states = self.widget_states.clone();
     let close_tx = self.close_tx.clone();
 
     window.on_window_event(move |event| {
       if let WindowEvent::Destroyed = event {
-        let window_states = window_states.clone();
+        let widget_states = widget_states.clone();
         let close_tx = close_tx.clone();
-        let window_id = window_id.clone();
+        let widget_id = widget_id.clone();
 
         task::spawn(async move {
-          let mut window_states = window_states.lock().await;
+          let mut widget_states = widget_states.lock().await;
 
-          // Remove the window state and broadcast the close event.
-          if let Some(state) = window_states.remove(&window_id) {
+          // Remove the widget state and broadcast the close event.
+          if let Some(state) = widget_states.remove(&widget_id) {
             if let Err(err) = close_tx.send(state) {
               error!("Failed to send window close event: {:?}", err);
             }
@@ -229,13 +230,13 @@ impl WindowFactory {
   }
 
   /// Returns coordinates for window placement based on the given config.
-  async fn window_placements(
+  async fn widget_placements(
     &self,
-    config: &WindowConfig,
+    config: &WidgetConfig,
   ) -> Vec<(LogicalSize<f64>, LogicalPosition<f64>)> {
     let mut placements = vec![];
 
-    for placement in config.launch_options.placements.iter() {
+    for placement in config.default_placements.iter() {
       let monitors = self
         .monitor_state
         .monitors_by_selection(&placement.monitor_selection)
@@ -243,32 +244,32 @@ impl WindowFactory {
 
       for monitor in monitors {
         let (anchor_x, anchor_y) = match placement.anchor {
-          WindowAnchor::TopLeft => (monitor.x, monitor.y),
-          WindowAnchor::TopCenter => {
+          AnchorPoint::TopLeft => (monitor.x, monitor.y),
+          AnchorPoint::TopCenter => {
             (monitor.x + (monitor.width as i32 / 2), monitor.y)
           }
-          WindowAnchor::TopRight => {
+          AnchorPoint::TopRight => {
             (monitor.x + monitor.width as i32, monitor.y)
           }
-          WindowAnchor::CenterLeft => {
+          AnchorPoint::CenterLeft => {
             (monitor.x, monitor.y + (monitor.height as i32 / 2))
           }
-          WindowAnchor::Center => (
+          AnchorPoint::Center => (
             monitor.x + (monitor.width as i32 / 2),
             monitor.y + (monitor.height as i32 / 2),
           ),
-          WindowAnchor::CenterRight => (
+          AnchorPoint::CenterRight => (
             monitor.x + monitor.width as i32,
             monitor.y + (monitor.height as i32 / 2),
           ),
-          WindowAnchor::BottomLeft => {
+          AnchorPoint::BottomLeft => {
             (monitor.x, monitor.y + monitor.height as i32)
           }
-          WindowAnchor::BottomCenter => (
+          AnchorPoint::BottomCenter => (
             monitor.x + (monitor.width as i32 / 2),
             monitor.y + monitor.height as i32,
           ),
-          WindowAnchor::BottomRight => (
+          AnchorPoint::BottomRight => (
             monitor.x + monitor.width as i32,
             monitor.y + monitor.height as i32,
           ),
@@ -297,65 +298,65 @@ impl WindowFactory {
     placements
   }
 
-  /// Closes a single window by a given window ID.
-  pub fn close_by_id(&self, window_id: &str) -> anyhow::Result<()> {
+  /// Closes a single widget by a given widget ID.
+  pub fn stop_by_id(&self, widget_id: &str) -> anyhow::Result<()> {
     let window = self
       .app_handle
-      .get_webview_window(window_id)
-      .context("No window found with the given ID.")?;
+      .get_webview_window(widget_id)
+      .context("No Tauri window found for the given widget ID.")?;
 
     window.close()?;
 
     Ok(())
   }
 
-  /// Closes all windows with the given config path.
-  pub async fn close_by_path(
+  /// Closes all widgets with the given config path.
+  pub async fn stop_by_path(
     &self,
     config_path: &PathBuf,
   ) -> anyhow::Result<()> {
-    let window_states = self.states_by_config_path().await;
+    let widget_states = self.states_by_config_path().await;
 
-    let found_window_states = window_states
+    let found_widget_states = widget_states
       .get(config_path)
-      .context("No windows found with the given config path.")?;
+      .context("No widgets found with the given config path.")?;
 
-    for window_state in found_window_states {
-      self.close_by_id(&window_state.window_id)?;
+    for widget_state in found_widget_states {
+      self.stop_by_id(&widget_state.id)?;
     }
 
     Ok(())
   }
 
-  /// Relaunches all currently open windows.
+  /// Relaunches all currently open widgets.
   pub async fn relaunch_all(&self) -> anyhow::Result<()> {
-    let window_states = self.states_by_config_path().await;
+    let widget_states = self.states_by_config_path().await;
 
-    for (config_path, _) in window_states {
-      let _ = self.close_by_path(&config_path).await;
+    for (config_path, _) in widget_states {
+      let _ = self.stop_by_path(&config_path).await;
 
-      let window_config = self
+      let widget_config = self
         .config
-        .window_config_by_path(&config_path)
+        .widget_config_by_path(&config_path)
         .await?
-        .context("Window config not found.")?;
+        .context("Widget config not found.")?;
 
-      self.open(window_config).await?;
+      self.open(widget_config).await?;
     }
 
     Ok(())
   }
 
-  /// Returns window state by a given window ID.
-  pub async fn state_by_id(&self, window_id: &str) -> Option<WindowState> {
-    self.window_states.lock().await.get(window_id).cloned()
+  /// Returns widget state by a given widget ID.
+  pub async fn state_by_id(&self, widget_id: &str) -> Option<WidgetState> {
+    self.widget_states.lock().await.get(widget_id).cloned()
   }
 
-  /// Returns window states grouped by their config paths.
+  /// Returns widget states grouped by their config paths.
   pub async fn states_by_config_path(
     &self,
-  ) -> HashMap<PathBuf, Vec<WindowState>> {
-    self.window_states.lock().await.values().fold(
+  ) -> HashMap<PathBuf, Vec<WidgetState>> {
+    self.widget_states.lock().await.values().fold(
       HashMap::new(),
       |mut acc, state| {
         acc
diff --git a/resources/widget-schema.json b/resources/widget-schema.json
new file mode 100644
index 00000000..c60bbd92
--- /dev/null
+++ b/resources/widget-schema.json
@@ -0,0 +1,136 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Zebar Widget Schema",
+  "type": "object",
+  "properties": {
+    "htmlPath": {
+      "type": "string"
+    },
+    "zOrder": {
+      "type": "string",
+      "enum": ["top_most", "normal", "bottom_most"]
+    },
+    "shownInTaskbar": {
+      "type": "boolean"
+    },
+    "focused": {
+      "type": "boolean"
+    },
+    "resizable": {
+      "type": "boolean"
+    },
+    "transparent": {
+      "type": "boolean"
+    },
+    "defaultPlacements": {
+      "type": "array",
+      "items": [
+        {
+          "type": "object",
+          "properties": {
+            "anchor": {
+              "type": "string",
+              "enum": [
+                "top_left",
+                "top_center",
+                "top_right",
+                "center_left",
+                "center",
+                "center_right",
+                "bottom_left",
+                "bottom_center",
+                "bottom_right"
+              ]
+            },
+            "offsetX": {
+              "type": "string"
+            },
+            "offsetY": {
+              "type": "string"
+            },
+            "width": {
+              "type": "string"
+            },
+            "height": {
+              "type": "string"
+            },
+            "monitorSelection": {
+              "type": "object",
+              "oneOf": [
+                {
+                  "properties": {
+                    "type": {
+                      "const": "all"
+                    }
+                  },
+                  "required": ["type"],
+                  "additionalProperties": false
+                },
+                {
+                  "properties": {
+                    "type": {
+                      "const": "primary"
+                    }
+                  },
+                  "required": ["type"],
+                  "additionalProperties": false
+                },
+                {
+                  "properties": {
+                    "type": {
+                      "const": "secondary"
+                    }
+                  },
+                  "required": ["type"],
+                  "additionalProperties": false
+                },
+                {
+                  "properties": {
+                    "type": {
+                      "const": "index"
+                    },
+                    "match": {
+                      "type": "integer",
+                      "minimum": 0
+                    }
+                  },
+                  "required": ["type", "match"],
+                  "additionalProperties": false
+                },
+                {
+                  "properties": {
+                    "type": {
+                      "const": "name"
+                    },
+                    "match": {
+                      "type": "string"
+                    }
+                  },
+                  "required": ["type", "match"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          },
+          "required": [
+            "anchor",
+            "offsetX",
+            "offsetY",
+            "width",
+            "height",
+            "monitorSelection"
+          ]
+        }
+      ]
+    }
+  },
+  "required": [
+    "htmlPath",
+    "zOrder",
+    "shownInTaskbar",
+    "focused",
+    "resizable",
+    "transparent",
+    "defaultPlacements"
+  ]
+}