From 867b2a7d68c3220e1f764cd5e9b715dd2768551b Mon Sep 17 00:00:00 2001
From: Jas Singh <jaskiratpal.singh@outlook.com>
Date: Sat, 15 Feb 2025 21:12:14 -0800
Subject: [PATCH] Added tokyo night (moon variant) and added more variance to
 tokyo night themes. (#774)

---
 scripts/makeTheme.ts                  | 199 +++++++++++++
 scripts/replaceColors.ts              | 176 ++++++++++++
 themes/palettes/tokyo_night.json      |  37 +++
 themes/palettes/tokyo_night_moon.json |  37 +++
 themes/tokyo_night.json               | 337 +++++++++++-----------
 themes/tokyo_night_moon.json          | 388 +++++++++++++++++++++++++
 themes/tokyo_night_moon_split.json    | 389 ++++++++++++++++++++++++++
 themes/tokyo_night_moon_vivid.json    | 388 +++++++++++++++++++++++++
 themes/tokyo_night_split.json         | 325 +++++++++++----------
 themes/tokyo_night_vivid.json         | 333 ++++++++++++----------
 10 files changed, 2146 insertions(+), 463 deletions(-)
 create mode 100644 scripts/makeTheme.ts
 create mode 100644 scripts/replaceColors.ts
 create mode 100644 themes/palettes/tokyo_night.json
 create mode 100644 themes/palettes/tokyo_night_moon.json
 create mode 100644 themes/tokyo_night_moon.json
 create mode 100644 themes/tokyo_night_moon_split.json
 create mode 100644 themes/tokyo_night_moon_vivid.json

diff --git a/scripts/makeTheme.ts b/scripts/makeTheme.ts
new file mode 100644
index 0000000..193c9c9
--- /dev/null
+++ b/scripts/makeTheme.ts
@@ -0,0 +1,199 @@
+#!/usr/bin/env ts-node
+/// <reference types="node" />
+
+/**
+ * Provides two transformations on JSON theme data:
+ *   1) makeVividTheme:
+ *        Swaps .background with .text (or .total) under "theme.bar.buttons.<...>"
+ *        Sets .icon to the old .background.
+ *   2) makeBaseTheme:
+ *        Copies .text (or .total) into .icon under "theme.bar.buttons.<...>"
+ *        Leaves .background intact.
+ *
+ * This script now also handles additional segments between `buttons` and the
+ * actual property. For example, it covers cases like:
+ *   "theme.bar.buttons.modules.updates.text" (name = "modules.updates", prop = "text")
+ *
+ * Usage:
+ *   ts-node makeTheme.ts <input.json> <output.json> [--vivid | --base | --both]
+ *
+ * Example:
+ *   ts-node makeTheme.ts theme.json updatedTheme.json --vivid
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Prints the usage/help text.
+ */
+function printUsage(): void {
+    console.log(`
+Usage:
+  ts-node makeTheme.ts <input.json> <output.json> [--vivid | --base | --both]
+
+Options:
+  --help   Show this help message
+
+Transforms:
+  --vivid  Swap .background with .text (or .total), set .icon = old background
+  --base   Set .icon = .text (or .total), leave .background alone
+  --both   Apply makeVividTheme, then makeBaseTheme
+`);
+}
+
+/**
+ * Reads a file as UTF-8 and returns a parsed JSON object.
+ */
+async function readJson(filePath: string): Promise<Record<string, unknown>> {
+    const raw = await fs.promises.readFile(path.resolve(filePath), 'utf8');
+    return JSON.parse(raw) as Record<string, unknown>;
+}
+
+/**
+ * Executes the "vivid" transformation on the input data.
+ * For each key matching "theme.bar.buttons.*":
+ *   - If it has .background and .text (or .total), swap them.
+ *   - Set .icon to the old background.
+ */
+function makeVividTheme(data: Record<string, unknown>): void {
+    data['theme.bar.buttons.style'] = 'default';
+
+    const prefix = 'theme.bar.buttons.';
+    const grouped: Record<string, Record<string, unknown>> = {};
+
+    for (const key of Object.keys(data)) {
+        if (!key.startsWith(prefix)) continue;
+
+        // Split: ["theme", "bar", "buttons", ...theRest]
+        const parts = key.split('.');
+        const rest = parts.slice(3);
+        if (rest.length < 2) continue; // need at least <name> and <prop>
+
+        // Last segment is the property (e.g. "text", "background")
+        // The rest form the "name" (e.g. "modules.updates")
+        const prop = rest.pop()!;
+        const name = rest.join('.');
+
+        if (!grouped[name]) grouped[name] = {};
+        grouped[name][prop] = data[key];
+    }
+
+    for (const name of Object.keys(grouped)) {
+        const props = grouped[name];
+        const hasBg = Object.prototype.hasOwnProperty.call(props, 'background');
+        const hasTxt = Object.prototype.hasOwnProperty.call(props, 'text');
+        const hasTot = Object.prototype.hasOwnProperty.call(props, 'total');
+        if (!hasBg || (!hasTxt && !hasTot)) continue;
+
+        const oldBackground = props['background'];
+        let textKey: 'text' | 'total' | undefined;
+        if (hasTxt) textKey = 'text';
+        else if (hasTot) textKey = 'total';
+        if (!textKey) continue;
+
+        const oldText = props[textKey];
+        props[textKey] = oldBackground;
+        props['icon'] = oldBackground;
+        props['background'] = oldText;
+    }
+
+    // Write the changes back to the original data
+    for (const name of Object.keys(grouped)) {
+        for (const prop of Object.keys(grouped[name])) {
+            const fullKey = prefix + name + '.' + prop;
+            data[fullKey] = grouped[name][prop];
+        }
+    }
+}
+
+/**
+ * Executes the "base" transformation on the input data.
+ * For each key matching "theme.bar.buttons.*":
+ *   - If it has .text or .total, set .icon to that value.
+ *   - Leave .background alone.
+ */
+function makeBaseTheme(data: Record<string, unknown>): void {
+    data['theme.bar.buttons.style'] = 'default';
+
+    const prefix = 'theme.bar.buttons.';
+    const grouped: Record<string, Record<string, unknown>> = {};
+
+    for (const key of Object.keys(data)) {
+        if (!key.startsWith(prefix)) continue;
+
+        const parts = key.split('.');
+        const rest = parts.slice(3);
+        if (rest.length < 2) continue;
+
+        const prop = rest.pop()!;
+        const name = rest.join('.');
+        if (!grouped[name]) grouped[name] = {};
+        grouped[name][prop] = data[key];
+    }
+
+    for (const name of Object.keys(grouped)) {
+        const props = grouped[name];
+        const hasTxt = Object.prototype.hasOwnProperty.call(props, 'text');
+        const hasTot = Object.prototype.hasOwnProperty.call(props, 'total');
+        if (!hasTxt && !hasTot) continue;
+
+        const value = hasTxt ? props['text'] : props['total'];
+        props['icon'] = value;
+    }
+
+    for (const name of Object.keys(grouped)) {
+        for (const prop of Object.keys(grouped[name])) {
+            const fullKey = prefix + name + '.' + prop;
+            data[fullKey] = grouped[name][prop];
+        }
+    }
+}
+
+/**
+ * Main CLI entry point.
+ */
+async function main(): Promise<void> {
+    const [, , ...args] = process.argv;
+    if (args.includes('--help') || args.length < 2) {
+        printUsage();
+        process.exit(0);
+    }
+
+    const input = args[0];
+    const output = args[1];
+    const mode = args[2] || '--vivid';
+
+    let data: Record<string, unknown>;
+    try {
+        data = await readJson(input);
+    } catch (e) {
+        console.error(`Failed to read/parse: ${input}`, e);
+        process.exit(1);
+    }
+
+    if (mode === '--vivid') makeVividTheme(data);
+    else if (mode === '--base') makeBaseTheme(data);
+    else if (mode === '--both') {
+        makeVividTheme(data);
+        makeBaseTheme(data);
+    } else {
+        console.error(`Unknown mode: ${mode}`);
+        process.exit(1);
+    }
+
+    try {
+        fs.writeFileSync(path.resolve(output), JSON.stringify(data, null, 2), 'utf8');
+        console.log(`Wrote updated theme to: ${output}`);
+    } catch (e) {
+        console.error(`Failed to write file: ${output}`, e);
+        process.exit(1);
+    }
+}
+
+if (require.main === module) {
+    main().catch((e) => {
+        console.error(e);
+        process.exit(1);
+    });
+}
diff --git a/scripts/replaceColors.ts b/scripts/replaceColors.ts
new file mode 100644
index 0000000..cdbb752
--- /dev/null
+++ b/scripts/replaceColors.ts
@@ -0,0 +1,176 @@
+#!/usr/bin/env ts-node
+/// <reference types="node" />
+
+/**
+ * Prints usage/help information to the console.
+ * Called whenever the user passes `--help` or when arguments are missing/invalid.
+ */
+function printUsage(): void {
+    console.log(`
+Usage:
+  ts-node updateColors.ts <theme.json> <original_palette.json> <new_palette.json> <output.json>
+
+Options:
+  --help   Show this help message
+
+Description:
+  This script reads a theme JSON file containing old color codes, an "original" palette JSON
+  (which maps color name → old hex code), and a "new" palette JSON (mapping the same color name
+  → new hex code). It then replaces all old hex codes in the theme with the corresponding new hex codes,
+  and saves the result to the specified output JSON file.
+
+Examples:
+  ts-node updateColors.ts theme.json original_palette.json new_palette.json updated_theme.json
+
+  node updateColors.js theme.json original_palette.json new_palette.json updated_theme.json
+`);
+}
+
+/**
+ * Recursively walks a palette to build a map from old hex → new hex,
+ * keyed by the same property name in the new palette if it exists.
+ *
+ * Example:
+ *    originalPalette = { bg: "#24283b", git: { add: "#449dab" } }
+ *    newPalette      = { bg: "#222436", git: { add: "#b8db87" } }
+ *
+ * => colorMap = {
+ *      "#24283b": "#222436",
+ *      "#449dab": "#b8db87"
+ *    }
+ *
+ * @param original - The "old" palette.
+ * @param updated - The "new" palette containing updated hex codes.
+ * @returns A map of { oldHex.toLowerCase(): newHex }.
+ */
+function buildColorMap(original: Palette, updated: Palette): ColorMap {
+    const map: ColorMap = {};
+
+    for (const [key, oldVal] of Object.entries(original)) {
+        const newVal = updated[key];
+
+        if (typeof oldVal === 'string' && typeof newVal === 'string') {
+            map[oldVal.toLowerCase()] = newVal;
+        } else if (oldVal && typeof oldVal === 'object') {
+            const oldNested = oldVal as Record<string, string>;
+            const newNested = newVal && typeof newVal === 'object' ? (newVal as Record<string, string>) : {};
+
+            for (const [nestedKey, nestedOldHex] of Object.entries(oldNested)) {
+                const nestedNewHex = newNested[nestedKey];
+
+                if (typeof nestedOldHex === 'string' && typeof nestedNewHex === 'string') {
+                    map[nestedOldHex.toLowerCase()] = nestedNewHex;
+                }
+            }
+        }
+    }
+
+    return map;
+}
+
+/**
+ * Recursively replace all string values in a data structure (object, array, etc.)
+ * if they appear in colorMap.
+ *
+ * @param node - The current portion of JSON to transform (can be object, array, string, etc.).
+ * @param colorMap - An object with oldHex.toLowerCase() → newHex mappings.
+ * @returns The transformed data with replaced colors.
+ */
+function replaceColorsInTheme(node: unknown, colorMap: ColorMap): unknown {
+    if (Array.isArray(node)) {
+        return node.map((item) => replaceColorsInTheme(item, colorMap));
+    } else if (node && typeof node === 'object') {
+        const result: Record<string, unknown> = {};
+
+        for (const [key, val] of Object.entries(node)) {
+            result[key] = replaceColorsInTheme(val, colorMap);
+        }
+        return result;
+    } else if (typeof node === 'string') {
+        const lower = node.toLowerCase();
+        return colorMap[lower] ? colorMap[lower] : node;
+    } else {
+        return node;
+    }
+}
+
+/**
+ * A minimal utility wrapper to read a file asynchronously.
+ *
+ * @param filePath - The file path to read from.
+ * @param encoding - The file encoding (default 'utf8').
+ * @returns A Promise resolving to the file contents as a string.
+ */
+async function readFile(filePath: string, encoding: BufferEncoding = 'utf8'): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const fs = require('fs');
+        fs.readFile(filePath, encoding, (err: Error, data: string) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(data);
+            }
+        });
+    });
+}
+
+/**
+ * Main function that:
+ *   1. Checks for --help or missing arguments.
+ *   2. Reads and parses the theme, original palette, and new palette.
+ *   3. Builds the color map and applies color replacements.
+ *   4. Writes the result as JSON to a new file.
+ *
+ *   @example
+ *   ```bash
+ *   ts-node updateColors.ts theme.json original_palette.json new_palette.json output.json
+ *   ```
+ */
+async function main(): Promise<void> {
+    const [, , ...args] = process.argv;
+
+    if (args.length === 0) {
+        printUsage();
+        process.exit(0);
+    }
+
+    if (args.length < 4) {
+        console.error('Error: Not enough arguments provided.\n');
+        printUsage();
+        process.exit(1);
+    } else if (args.length > 4) {
+        console.error('Error: Too many arguments provided.\n');
+        printUsage();
+        process.exit(1);
+    }
+
+    const [themePath, originalPath, newPath, outputPath] = args;
+
+    try {
+        const themeData = JSON.parse(await readFile(themePath, 'utf8'));
+        const originalPalette: Palette = JSON.parse(await readFile(originalPath, 'utf8'));
+        const newPalette: Palette = JSON.parse(await readFile(newPath, 'utf8'));
+        const fs = require('fs');
+
+        const colorMap = buildColorMap(originalPalette, newPalette);
+        const updatedTheme = replaceColorsInTheme(themeData, colorMap);
+
+        fs.writeFileSync(outputPath, JSON.stringify(updatedTheme, null, 2), 'utf8');
+
+        console.log(`Successfully wrote updated theme to: ${outputPath}`);
+    } catch (err) {
+        console.error('Error:', err);
+        process.exit(1);
+    }
+}
+
+if (require.main === module) {
+    main().catch((err) => {
+        console.error(err);
+        process.exit(1);
+    });
+}
+
+type Palette = Record<string, string | Record<string, string>>;
+
+type ColorMap = Record<string, string>;
diff --git a/themes/palettes/tokyo_night.json b/themes/palettes/tokyo_night.json
new file mode 100644
index 0000000..f771fcb
--- /dev/null
+++ b/themes/palettes/tokyo_night.json
@@ -0,0 +1,37 @@
+{
+    "bg": "#1a1b26",
+    "bg_dark": "#16161e",
+    "bg_dark1": "#0C0E14",
+    "bg_highlight": "#292e42",
+    "blue": "#7aa2f7",
+    "blue0": "#3d59a1",
+    "blue1": "#2ac3de",
+    "blue2": "#0db9d7",
+    "blue5": "#89ddff",
+    "blue6": "#b4f9f8",
+    "blue7": "#394b70",
+    "comment": "#565f89",
+    "cyan": "#7dcfff",
+    "dark3": "#545c7e",
+    "dark5": "#737aa2",
+    "fg": "#c0caf5",
+    "fg_dark": "#a9b1d6",
+    "fg_gutter": "#3b4261",
+    "green": "#9ece6a",
+    "green1": "#73daca",
+    "green2": "#41a6b5",
+    "magenta": "#bb9af7",
+    "magenta2": "#ff007c",
+    "orange": "#ff9e64",
+    "purple": "#9d7cd8",
+    "red": "#f7768e",
+    "red1": "#db4b4b",
+    "teal": "#1abc9c",
+    "terminal_black": "#414868",
+    "yellow": "#e0af68",
+    "git": {
+        "add": "#449dab",
+        "change": "#6183bb",
+        "delete": "#914c54"
+    }
+}
diff --git a/themes/palettes/tokyo_night_moon.json b/themes/palettes/tokyo_night_moon.json
new file mode 100644
index 0000000..040392d
--- /dev/null
+++ b/themes/palettes/tokyo_night_moon.json
@@ -0,0 +1,37 @@
+{
+    "bg": "#222436",
+    "bg_dark": "#1e2030",
+    "bg_dark1": "#191B29",
+    "bg_highlight": "#2f334d",
+    "blue": "#82aaff",
+    "blue0": "#3e68d7",
+    "blue1": "#65bcff",
+    "blue2": "#0db9d7",
+    "blue5": "#89ddff",
+    "blue6": "#b4f9f8",
+    "blue7": "#394b70",
+    "comment": "#636da6",
+    "cyan": "#86e1fc",
+    "dark3": "#545c7e",
+    "dark5": "#737aa2",
+    "fg": "#c8d3f5",
+    "fg_dark": "#828bb8",
+    "fg_gutter": "#3b4261",
+    "green": "#c3e88d",
+    "green1": "#4fd6be",
+    "green2": "#41a6b5",
+    "magenta": "#c099ff",
+    "magenta2": "#ff007c",
+    "orange": "#ff966c",
+    "purple": "#fca7ea",
+    "red": "#ff757f",
+    "red1": "#c53b53",
+    "teal": "#4fd6be",
+    "terminal_black": "#444a73",
+    "yellow": "#ffc777",
+    "git": {
+        "add": "#b8db87",
+        "change": "#7ca1f2",
+        "delete": "#e26a75"
+    }
+}
diff --git a/themes/tokyo_night.json b/themes/tokyo_night.json
index de27839..568c36f 100644
--- a/themes/tokyo_night.json
+++ b/themes/tokyo_night.json
@@ -1,39 +1,36 @@
 {
-  "theme.bar.menus.background": "#1a1b26",
-  "theme.bar.background": "#1a1b26",
-  "theme.bar.buttons.media.icon": "#bb9af7",
-  "theme.bar.buttons.media.text": "#bb9af7",
-  "theme.bar.buttons.icon": "#bb9af7",
-  "theme.bar.buttons.text": "#bb9af7",
-  "theme.bar.buttons.hover": "#414868",
-  "theme.bar.buttons.background": "#272a3d",
-  "theme.bar.menus.text": "#c0caf5",
-  "theme.bar.menus.border.color": "#414868",
-  "theme.bar.buttons.media.background": "#272a3d",
-  "theme.bar.menus.menu.volume.text": "#c0caf5",
-  "theme.bar.menus.menu.volume.card.color": "#24283b",
-  "theme.bar.menus.menu.volume.label.color": "#f7768e",
-  "theme.bar.menus.popover.text": "#bb9af7",
-  "theme.bar.menus.popover.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
+  "theme.bar.menus.menu.notifications.pager.button": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
   "theme.bar.menus.menu.notifications.switch.puck": "#565f89",
   "theme.bar.menus.menu.notifications.switch.disabled": "#565f89",
-  "theme.bar.menus.menu.notifications.switch.enabled": "#bb9af7",
-  "theme.bar.menus.menu.notifications.clear": "#f7768e",
+  "theme.bar.menus.menu.notifications.switch.enabled": "#1abc9c",
+  "theme.bar.menus.menu.notifications.clear": "#1abc9c",
   "theme.bar.menus.menu.notifications.switch_divider": "#414868",
-  "theme.bar.menus.menu.notifications.border": "#414868",
+  "theme.bar.menus.menu.notifications.border": "#2f324d",
   "theme.bar.menus.menu.notifications.card": "#24283b",
-  "theme.bar.menus.menu.notifications.background": "#1a1b26",
+  "theme.bar.menus.menu.notifications.background": "#16161e",
   "theme.bar.menus.menu.notifications.no_notifications_label": "#414868",
-  "theme.bar.menus.menu.notifications.label": "#bb9af7",
+  "theme.bar.menus.menu.notifications.label": "#1abc9c",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+  "theme.bar.menus.menu.power.border.color": "#2f324d",
+  "theme.bar.menus.menu.power.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f7768e",
@@ -49,7 +46,7 @@
   "theme.bar.menus.menu.dashboard.monitors.bar_background": "#414868",
   "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#bb9af7",
   "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#73daca",
+  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#1abc9c",
   "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#f7768e",
   "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#e0af68",
   "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f7768e",
@@ -67,36 +64,45 @@
   "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ece6a",
   "theme.bar.menus.menu.dashboard.shortcuts.text": "#1a1b26",
   "theme.bar.menus.menu.dashboard.shortcuts.background": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
   "theme.bar.menus.menu.dashboard.powermenu.sleep": "#7dcfff",
   "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ece6a",
   "theme.bar.menus.menu.dashboard.powermenu.restart": "#e0af68",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
   "theme.bar.menus.menu.dashboard.profile.name": "#f7768e",
-  "theme.bar.menus.menu.dashboard.border.color": "#414868",
-  "theme.bar.menus.menu.dashboard.background.color": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+  "theme.bar.menus.menu.dashboard.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.card.color": "#24283b",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#7dcfff",
   "theme.bar.menus.menu.clock.weather.thermometer.cold": "#7aa2f7",
   "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#bb9af7",
   "theme.bar.menus.menu.clock.weather.thermometer.hot": "#e0af68",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.stats": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.status": "#73daca",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.stats": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.status": "#1abc9c",
   "theme.bar.menus.menu.clock.weather.temperature": "#c0caf5",
-  "theme.bar.menus.menu.clock.weather.icon": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.icon": "#9d7cd8",
   "theme.bar.menus.menu.clock.calendar.contextdays": "#414868",
   "theme.bar.menus.menu.clock.calendar.days": "#c0caf5",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#73daca",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#73daca",
-  "theme.bar.menus.menu.clock.time.time": "#f7768e",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.text": "#c0caf5",
-  "theme.bar.menus.menu.clock.border.color": "#414868",
-  "theme.bar.menus.menu.clock.background.color": "#1a1b26",
+  "theme.bar.menus.menu.clock.border.color": "#2f324d",
+  "theme.bar.menus.menu.clock.background.color": "#16161e",
   "theme.bar.menus.menu.clock.card.color": "#24283b",
   "theme.bar.menus.menu.battery.slider.puck": "#565f89",
   "theme.bar.menus.menu.battery.slider.backgroundhover": "#414868",
@@ -108,8 +114,8 @@
   "theme.bar.menus.menu.battery.listitems.passive": "#c0caf5",
   "theme.bar.menus.menu.battery.text": "#c0caf5",
   "theme.bar.menus.menu.battery.label.color": "#e0af68",
-  "theme.bar.menus.menu.battery.border.color": "#414868",
-  "theme.bar.menus.menu.battery.background.color": "#1a1b26",
+  "theme.bar.menus.menu.battery.border.color": "#2f324d",
+  "theme.bar.menus.menu.battery.background.color": "#16161e",
   "theme.bar.menus.menu.battery.card.color": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.text": "#c0caf5",
@@ -127,8 +133,8 @@
   "theme.bar.menus.menu.bluetooth.status": "#565f89",
   "theme.bar.menus.menu.bluetooth.text": "#c0caf5",
   "theme.bar.menus.menu.bluetooth.label.color": "#7dcfff",
-  "theme.bar.menus.menu.bluetooth.border.color": "#414868",
-  "theme.bar.menus.menu.bluetooth.background.color": "#1a1b26",
+  "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+  "theme.bar.menus.menu.bluetooth.background.color": "#16161e",
   "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
   "theme.bar.menus.menu.network.iconbuttons.active": "#bb9af7",
   "theme.bar.menus.menu.network.iconbuttons.passive": "#c0caf5",
@@ -139,8 +145,8 @@
   "theme.bar.menus.menu.network.status.color": "#565f89",
   "theme.bar.menus.menu.network.text": "#c0caf5",
   "theme.bar.menus.menu.network.label.color": "#bb9af7",
-  "theme.bar.menus.menu.network.border.color": "#414868",
-  "theme.bar.menus.menu.network.background.color": "#1a1b26",
+  "theme.bar.menus.menu.network.border.color": "#2f324d",
+  "theme.bar.menus.menu.network.background.color": "#16161e",
   "theme.bar.menus.menu.network.card.color": "#24283b",
   "theme.bar.menus.menu.volume.input_slider.puck": "#414868",
   "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#414868",
@@ -156,20 +162,24 @@
   "theme.bar.menus.menu.volume.iconbutton.passive": "#c0caf5",
   "theme.bar.menus.menu.volume.listitems.active": "#f7768e",
   "theme.bar.menus.menu.volume.listitems.passive": "#c0caf5",
-  "theme.bar.menus.menu.volume.border.color": "#414868",
-  "theme.bar.menus.menu.volume.background.color": "#1a1b26",
+  "theme.bar.menus.menu.volume.text": "#c0caf5",
+  "theme.bar.menus.menu.volume.label.color": "#f7768e",
+  "theme.bar.menus.menu.volume.border.color": "#2f324d",
+  "theme.bar.menus.menu.volume.background.color": "#16161e",
+  "theme.bar.menus.menu.volume.card.color": "#24283b",
   "theme.bar.menus.menu.media.slider.puck": "#565f89",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#414868",
   "theme.bar.menus.menu.media.slider.background": "#565f89",
   "theme.bar.menus.menu.media.slider.primary": "#f7768e",
   "theme.bar.menus.menu.media.buttons.text": "#1a1b26",
   "theme.bar.menus.menu.media.buttons.background": "#bb9af7",
-  "theme.bar.menus.menu.media.buttons.enabled": "#73daca",
+  "theme.bar.menus.menu.media.buttons.enabled": "#1abc9c",
   "theme.bar.menus.menu.media.buttons.inactive": "#414868",
-  "theme.bar.menus.menu.media.border.color": "#414868",
-  "theme.bar.menus.menu.media.background.color": "#1a1b26",
+  "theme.bar.menus.menu.media.border.color": "#2f324d",
+  "theme.bar.menus.menu.media.card.color": "#24283b",
+  "theme.bar.menus.menu.media.background.color": "#16161e",
   "theme.bar.menus.menu.media.album": "#f7768e",
-  "theme.bar.menus.menu.media.artist": "#73daca",
+  "theme.bar.menus.menu.media.artist": "#1abc9c",
   "theme.bar.menus.menu.media.song": "#bb9af7",
   "theme.bar.menus.tooltip.text": "#c0caf5",
   "theme.bar.menus.tooltip.background": "#1a1b26",
@@ -188,6 +198,8 @@
   "theme.bar.menus.buttons.disabled": "#565f89",
   "theme.bar.menus.buttons.active": "#f7768e",
   "theme.bar.menus.buttons.default": "#bb9af7",
+  "theme.bar.menus.check_radio_button.active": "#bb9af7",
+  "theme.bar.menus.check_radio_button.background": "#3b4261",
   "theme.bar.menus.switch.puck": "#565f89",
   "theme.bar.menus.switch.disabled": "#565f89",
   "theme.bar.menus.switch.enabled": "#bb9af7",
@@ -195,135 +207,123 @@
   "theme.bar.menus.icons.passive": "#414868",
   "theme.bar.menus.listitems.active": "#bb9af7",
   "theme.bar.menus.listitems.passive": "#c0caf5",
+  "theme.bar.menus.popover.border": "#1a1b26",
+  "theme.bar.menus.popover.background": "#1a1b26",
+  "theme.bar.menus.popover.text": "#bb9af7",
   "theme.bar.menus.label": "#bb9af7",
   "theme.bar.menus.feinttext": "#414868",
   "theme.bar.menus.dimtext": "#414868",
+  "theme.bar.menus.text": "#c0caf5",
+  "theme.bar.menus.border.color": "#414868",
   "theme.bar.menus.cards": "#24283b",
-  "theme.bar.buttons.notifications.total": "#bb9af7",
-  "theme.bar.buttons.notifications.icon": "#bb9af7",
+  "theme.bar.menus.background": "#1a1b26",
+  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.power.icon": "#181825",
+  "theme.bar.buttons.modules.power.background": "#272a3d",
+  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
+  "theme.bar.buttons.modules.weather.icon": "#bb9af7",
+  "theme.bar.buttons.modules.weather.text": "#bb9af7",
+  "theme.bar.buttons.modules.weather.background": "#272a3d",
+  "theme.bar.buttons.modules.updates.icon_background": "#ff9e64",
+  "theme.bar.buttons.modules.updates.icon": "#ff9e64",
+  "theme.bar.buttons.modules.updates.text": "#ff9e64",
+  "theme.bar.buttons.modules.updates.background": "#272a3d",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.icon": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
+  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.icon": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.text": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.background": "#272a3d",
+  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.storage.icon": "#f7768e",
+  "theme.bar.buttons.modules.storage.text": "#f7768e",
+  "theme.bar.buttons.modules.storage.background": "#272a3d",
+  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.cpu.icon": "#f7768e",
+  "theme.bar.buttons.modules.cpu.text": "#f7768e",
+  "theme.bar.buttons.modules.cpu.background": "#272a3d",
+  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
+  "theme.bar.buttons.modules.ram.icon": "#e0af68",
+  "theme.bar.buttons.modules.ram.text": "#e0af68",
+  "theme.bar.buttons.modules.ram.background": "#272a3d",
+  "theme.bar.buttons.notifications.total": "#1abc9c",
+  "theme.bar.buttons.notifications.icon_background": "#1abc9c",
+  "theme.bar.buttons.notifications.icon": "#1abc9c",
   "theme.bar.buttons.notifications.background": "#272a3d",
-  "theme.bar.buttons.clock.icon": "#f7768e",
-  "theme.bar.buttons.clock.text": "#f7768e",
+  "theme.bar.buttons.clock.icon_background": "#9d7cd8",
+  "theme.bar.buttons.clock.icon": "#9d7cd8",
+  "theme.bar.buttons.clock.text": "#9d7cd8",
   "theme.bar.buttons.clock.background": "#272a3d",
+  "theme.bar.buttons.battery.icon_background": "#e0af68",
   "theme.bar.buttons.battery.icon": "#e0af68",
   "theme.bar.buttons.battery.text": "#e0af68",
   "theme.bar.buttons.battery.background": "#272a3d",
   "theme.bar.buttons.systray.background": "#272a3d",
+  "theme.bar.buttons.bluetooth.icon_background": "#7dcfff",
   "theme.bar.buttons.bluetooth.icon": "#7dcfff",
   "theme.bar.buttons.bluetooth.text": "#7dcfff",
   "theme.bar.buttons.bluetooth.background": "#272a3d",
+  "theme.bar.buttons.network.icon_background": "#bb9af7",
   "theme.bar.buttons.network.icon": "#bb9af7",
   "theme.bar.buttons.network.text": "#bb9af7",
   "theme.bar.buttons.network.background": "#272a3d",
+  "theme.bar.buttons.volume.icon_background": "#f7768e",
   "theme.bar.buttons.volume.icon": "#f7768e",
   "theme.bar.buttons.volume.text": "#f7768e",
   "theme.bar.buttons.volume.background": "#272a3d",
+  "theme.bar.buttons.media.icon_background": "#bb9af7",
+  "theme.bar.buttons.media.icon": "#bb9af7",
+  "theme.bar.buttons.media.text": "#bb9af7",
+  "theme.bar.buttons.media.background": "#272a3d",
+  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
   "theme.bar.buttons.windowtitle.icon": "#f7768e",
   "theme.bar.buttons.windowtitle.text": "#f7768e",
   "theme.bar.buttons.windowtitle.background": "#272a3d",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
   "theme.bar.buttons.workspaces.active": "#f7768e",
   "theme.bar.buttons.workspaces.occupied": "#f7768e",
   "theme.bar.buttons.workspaces.available": "#7dcfff",
-  "theme.bar.buttons.workspaces.hover": "#414868",
+  "theme.bar.buttons.workspaces.hover": "#f7768e",
   "theme.bar.buttons.workspaces.background": "#272a3d",
-  "theme.bar.buttons.dashboard.icon": "#e0af68",
-  "theme.bar.buttons.dashboard.background": "#272a3d",
+  "theme.bar.buttons.dashboard.icon": "#272a3d",
+  "theme.bar.buttons.dashboard.background": "#e0af68",
+  "theme.bar.buttons.icon": "#242438",
+  "theme.bar.buttons.text": "#bb9af7",
+  "theme.bar.buttons.hover": "#414868",
+  "theme.bar.buttons.icon_background": "#bb9af7",
+  "theme.bar.buttons.background": "#272a3d",
+  "theme.bar.buttons.style": "default",
+  "theme.bar.background": "#1a1b26",
   "theme.osd.label": "#bb9af7",
   "theme.osd.icon": "#1a1b26",
   "theme.osd.bar_overflow_color": "#f7768e",
   "theme.osd.bar_empty_color": "#414868",
   "theme.osd.bar_color": "#bb9af7",
   "theme.osd.icon_container": "#bb9af7",
-  "theme.osd.bar_container": "#1a1b26",
+  "theme.osd.bar_container": "#16161e",
   "theme.notification.close_button.label": "#1a1b26",
-  "theme.notification.close_button.background": "#f7768e",
-  "theme.notification.labelicon": "#bb9af7",
+  "theme.notification.close_button.background": "#41a5b5",
+  "theme.notification.labelicon": "#41a5b5",
   "theme.notification.text": "#c0caf5",
   "theme.notification.time": "#9aa5ce",
-  "theme.notification.border": "#565f89",
-  "theme.notification.label": "#bb9af7",
+  "theme.notification.border": "#2f324d",
+  "theme.notification.label": "#41a5b5",
   "theme.notification.actions.text": "#24283b",
-  "theme.notification.actions.background": "#bb9af7",
+  "theme.notification.actions.background": "#41a5b5",
   "theme.notification.background": "#1a1b26",
-  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
-  "theme.bar.menus.menu.media.card.color": "#24283b",
-  "theme.bar.menus.check_radio_button.background": "#3b4261",
-  "theme.bar.menus.check_radio_button.active": "#bb9af7",
-  "theme.bar.buttons.style": "default",
-  "theme.bar.menus.menu.notifications.pager.button": "#bb9af7",
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#bb9af7",
-  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
-  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
-  "theme.bar.buttons.clock.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.ram.icon": "#e0af68",
-  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
-  "theme.bar.menus.popover.border": "#1a1b26",
-  "theme.bar.buttons.volume.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
-  "theme.bar.buttons.modules.updates.background": "#272a3d",
-  "theme.bar.buttons.modules.storage.icon": "#f7768e",
-  "theme.bar.buttons.modules.netstat.background": "#272a3d",
-  "theme.bar.buttons.modules.weather.icon": "#bb9af7",
-  "theme.bar.buttons.modules.netstat.text": "#9ece6a",
-  "theme.bar.buttons.modules.storage.background": "#272a3d",
-  "theme.bar.buttons.modules.power.icon": "#f7768e",
-  "theme.bar.buttons.modules.storage.text": "#f7768e",
-  "theme.bar.buttons.modules.cpu.background": "#272a3d",
-  "theme.bar.menus.menu.power.border.color": "#414868",
-  "theme.bar.buttons.network.icon_background": "#caa6f7",
-  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
-  "theme.bar.buttons.modules.cpu.icon": "#f7768e",
-  "theme.bar.buttons.battery.icon_background": "#e0af68",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
-  "theme.bar.buttons.modules.weather.text": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
-  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
-  "theme.bar.buttons.media.icon_background": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
-  "theme.bar.buttons.modules.kbLayout.icon": "#7dcfff",
-  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
-  "theme.bar.buttons.modules.ram.text": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
-  "theme.bar.buttons.modules.updates.icon_background": "#bb9af7",
-  "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
-  "theme.bar.buttons.modules.power.background": "#272a3d",
-  "theme.bar.buttons.modules.weather.background": "#272a3d",
-  "theme.bar.buttons.icon_background": "#272a3d",
-  "theme.bar.menus.menu.power.background.color": "#1a1b26",
-  "theme.bar.buttons.modules.ram.background": "#272a3d",
-  "theme.bar.buttons.modules.netstat.icon": "#9ece6a",
-  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.updates.text": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
-  "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
-  "theme.bar.buttons.modules.updates.icon": "#bb9af7",
-  "theme.bar.buttons.modules.cpu.text": "#f7768e",
-  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
-  "theme.bar.buttons.notifications.icon_background": "#bb9af7",
   "theme.bar.buttons.modules.power.border": "#f7768e",
   "theme.bar.buttons.modules.weather.border": "#bb9af7",
-  "theme.bar.buttons.modules.updates.border": "#bb9af7",
+  "theme.bar.buttons.modules.updates.border": "#ff9e64",
   "theme.bar.buttons.modules.kbLayout.border": "#7dcfff",
   "theme.bar.buttons.modules.netstat.border": "#9ece6a",
   "theme.bar.buttons.modules.storage.border": "#f7768e",
   "theme.bar.buttons.modules.cpu.border": "#f7768e",
   "theme.bar.buttons.modules.ram.border": "#e0af68",
-  "theme.bar.buttons.notifications.border": "#bb9af7",
-  "theme.bar.buttons.clock.border": "#f7768e",
+  "theme.bar.buttons.notifications.border": "#1abc9c",
+  "theme.bar.buttons.clock.border": "#9d7cd8",
   "theme.bar.buttons.battery.border": "#e0af68",
   "theme.bar.buttons.systray.border": "#414868",
   "theme.bar.buttons.bluetooth.border": "#7dcfff",
@@ -334,10 +334,10 @@
   "theme.bar.buttons.workspaces.border": "#f7768e",
   "theme.bar.buttons.dashboard.border": "#e0af68",
   "theme.bar.buttons.modules.submap.background": "#272a3d",
-  "theme.bar.buttons.modules.submap.text": "#73daca",
-  "theme.bar.buttons.modules.submap.border": "#73daca",
-  "theme.bar.buttons.modules.submap.icon": "#73daca",
-  "theme.bar.buttons.modules.submap.icon_background": "#272a3d",
+  "theme.bar.buttons.modules.submap.text": "#1abc9c",
+  "theme.bar.buttons.modules.submap.border": "#1abc9c",
+  "theme.bar.buttons.modules.submap.icon": "#1abc9c",
+  "theme.bar.buttons.modules.submap.icon_background": "#1abc9c",
   "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
   "theme.bar.menus.menu.network.switch.disabled": "#565f89",
   "theme.bar.menus.menu.network.switch.puck": "#565f89",
@@ -350,16 +350,39 @@
   "theme.bar.buttons.modules.hyprsunset.icon_background": "#e0af68",
   "theme.bar.buttons.modules.hyprsunset.text": "#e0af68",
   "theme.bar.buttons.modules.hyprsunset.border": "#e0af68",
-  "theme.bar.buttons.modules.hypridle.icon": "#f7768e",
+  "theme.bar.buttons.modules.hypridle.icon": "#0db8d7",
   "theme.bar.buttons.modules.hypridle.background": "#272a3d",
-  "theme.bar.buttons.modules.hypridle.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.hypridle.text": "#f7768e",
-  "theme.bar.buttons.modules.hypridle.border": "#f7768e",
+  "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
+  "theme.bar.buttons.modules.hypridle.text": "#0db8d7",
+  "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
   "theme.bar.menus.menu.network.scroller.color": "#bb9af7",
   "theme.bar.menus.menu.bluetooth.scroller.color": "#7dcfff",
-  "theme.bar.buttons.modules.cava.text": "#73daca",
+  "theme.bar.buttons.notifications.hover": "#504945",
+  "theme.bar.buttons.clock.hover": "#504945",
+  "theme.bar.buttons.battery.hover": "#504945",
+  "theme.bar.buttons.systray.hover": "#504945",
+  "theme.bar.buttons.bluetooth.hover": "#504945",
+  "theme.bar.buttons.network.hover": "#504945",
+  "theme.bar.buttons.volume.hover": "#504945",
+  "theme.bar.buttons.media.hover": "#504945",
+  "theme.bar.buttons.windowtitle.hover": "#504945",
+  "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+  "theme.bar.buttons.dashboard.hover": "#504945",
+  "theme.bar.menus.menu.power.card.color": "#2a283e",
+  "theme.bar.buttons.modules.cpu.hover": "#45475a",
+  "theme.bar.buttons.volume.output_icon": "#11111b",
+  "theme.bar.buttons.volume.output_text": "#eba0ac",
+  "theme.bar.buttons.volume.input_icon": "#11111b",
+  "theme.bar.buttons.volume.input_text": "#eba0ac",
+  "theme.bar.buttons.volume.separator": "#45475a",
+  "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.icon": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+  "theme.osd.border.color": "#8ff0a4",
+  "theme.bar.buttons.modules.cava.text": "#1abc9c",
   "theme.bar.buttons.modules.cava.background": "#272a3d",
-  "theme.bar.buttons.modules.cava.icon_background": "#272a3d",
-  "theme.bar.buttons.modules.cava.icon": "#73daca",
-  "theme.bar.buttons.modules.cava.border": "#73daca"
+  "theme.bar.buttons.modules.cava.icon_background": "#1abc9c",
+  "theme.bar.buttons.modules.cava.icon": "#1abc9c",
+  "theme.bar.buttons.modules.cava.border": "#1abc9c"
 }
\ No newline at end of file
diff --git a/themes/tokyo_night_moon.json b/themes/tokyo_night_moon.json
new file mode 100644
index 0000000..a916a52
--- /dev/null
+++ b/themes/tokyo_night_moon.json
@@ -0,0 +1,388 @@
+{
+    "theme.bar.menus.menu.notifications.scrollbar.color": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.label": "#636da6",
+    "theme.bar.menus.menu.notifications.pager.button": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.background": "#222436",
+    "theme.bar.menus.menu.notifications.switch.puck": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.enabled": "#4fd6be",
+    "theme.bar.menus.menu.notifications.clear": "#4fd6be",
+    "theme.bar.menus.menu.notifications.switch_divider": "#444a73",
+    "theme.bar.menus.menu.notifications.border": "#2f324d",
+    "theme.bar.menus.menu.notifications.card": "#24283b",
+    "theme.bar.menus.menu.notifications.background": "#1e2030",
+    "theme.bar.menus.menu.notifications.no_notifications_label": "#444a73",
+    "theme.bar.menus.menu.notifications.label": "#4fd6be",
+    "theme.bar.menus.menu.power.buttons.sleep.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.sleep.text": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.logout.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.logout.text": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.restart.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.restart.text": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.shutdown.text": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+    "theme.bar.menus.menu.power.border.color": "#2f324d",
+    "theme.bar.menus.menu.power.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#444a73",
+    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#4fd6be",
+    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#ffc777",
+    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.input.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.input.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.volume.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.volume.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#ffc777",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.controls.disabled": "#444a73",
+    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.shortcuts.text": "#222436",
+    "theme.bar.menus.menu.dashboard.shortcuts.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#ff757f",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c8d3f5",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#444a73",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.powermenu.logout": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.restart": "#ffc777",
+    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#ff757f",
+    "theme.bar.menus.menu.dashboard.profile.name": "#ff757f",
+    "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+    "theme.bar.menus.menu.dashboard.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.card.color": "#24283b",
+    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#86e1fc",
+    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#82aaff",
+    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c099ff",
+    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#ffc777",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.stats": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.status": "#4fd6be",
+    "theme.bar.menus.menu.clock.weather.temperature": "#c8d3f5",
+    "theme.bar.menus.menu.clock.weather.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.contextdays": "#444a73",
+    "theme.bar.menus.menu.clock.calendar.days": "#c8d3f5",
+    "theme.bar.menus.menu.clock.calendar.currentday": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.paginator": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.weekdays": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.yearmonth": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.timeperiod": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.text": "#c8d3f5",
+    "theme.bar.menus.menu.clock.border.color": "#2f324d",
+    "theme.bar.menus.menu.clock.background.color": "#1e2030",
+    "theme.bar.menus.menu.clock.card.color": "#24283b",
+    "theme.bar.menus.menu.battery.slider.puck": "#636da6",
+    "theme.bar.menus.menu.battery.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.battery.slider.background": "#636da6",
+    "theme.bar.menus.menu.battery.slider.primary": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.active": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.passive": "#636da6",
+    "theme.bar.menus.menu.battery.listitems.active": "#ffc777",
+    "theme.bar.menus.menu.battery.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.battery.text": "#c8d3f5",
+    "theme.bar.menus.menu.battery.label.color": "#ffc777",
+    "theme.bar.menus.menu.battery.border.color": "#2f324d",
+    "theme.bar.menus.menu.battery.background.color": "#1e2030",
+    "theme.bar.menus.menu.battery.card.color": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.menu.systray.dropdownmenu.background": "#222436",
+    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.icons.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.icons.passive": "#636da6",
+    "theme.bar.menus.menu.bluetooth.listitems.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.switch.puck": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.enabled": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.switch_divider": "#444a73",
+    "theme.bar.menus.menu.bluetooth.status": "#636da6",
+    "theme.bar.menus.menu.bluetooth.text": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.label.color": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+    "theme.bar.menus.menu.bluetooth.background.color": "#1e2030",
+    "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
+    "theme.bar.menus.menu.network.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.menu.network.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.icons.active": "#c099ff",
+    "theme.bar.menus.menu.network.icons.passive": "#636da6",
+    "theme.bar.menus.menu.network.listitems.active": "#c099ff",
+    "theme.bar.menus.menu.network.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.status.color": "#636da6",
+    "theme.bar.menus.menu.network.text": "#c8d3f5",
+    "theme.bar.menus.menu.network.label.color": "#c099ff",
+    "theme.bar.menus.menu.network.border.color": "#2f324d",
+    "theme.bar.menus.menu.network.background.color": "#1e2030",
+    "theme.bar.menus.menu.network.card.color": "#24283b",
+    "theme.bar.menus.menu.volume.input_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.input_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.audio_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.audio_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.active": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.passive": "#636da6",
+    "theme.bar.menus.menu.volume.iconbutton.active": "#ff757f",
+    "theme.bar.menus.menu.volume.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.listitems.active": "#ff757f",
+    "theme.bar.menus.menu.volume.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.text": "#c8d3f5",
+    "theme.bar.menus.menu.volume.label.color": "#ff757f",
+    "theme.bar.menus.menu.volume.border.color": "#2f324d",
+    "theme.bar.menus.menu.volume.background.color": "#1e2030",
+    "theme.bar.menus.menu.volume.card.color": "#24283b",
+    "theme.bar.menus.menu.media.slider.puck": "#636da6",
+    "theme.bar.menus.menu.media.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.media.slider.background": "#636da6",
+    "theme.bar.menus.menu.media.slider.primary": "#ff757f",
+    "theme.bar.menus.menu.media.buttons.text": "#222436",
+    "theme.bar.menus.menu.media.buttons.background": "#c099ff",
+    "theme.bar.menus.menu.media.buttons.enabled": "#4fd6be",
+    "theme.bar.menus.menu.media.buttons.inactive": "#444a73",
+    "theme.bar.menus.menu.media.border.color": "#2f324d",
+    "theme.bar.menus.menu.media.card.color": "#24283b",
+    "theme.bar.menus.menu.media.background.color": "#1e2030",
+    "theme.bar.menus.menu.media.album": "#ff757f",
+    "theme.bar.menus.menu.media.artist": "#4fd6be",
+    "theme.bar.menus.menu.media.song": "#c099ff",
+    "theme.bar.menus.tooltip.text": "#c8d3f5",
+    "theme.bar.menus.tooltip.background": "#222436",
+    "theme.bar.menus.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.dropdownmenu.background": "#222436",
+    "theme.bar.menus.slider.puck": "#636da6",
+    "theme.bar.menus.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.slider.background": "#636da6",
+    "theme.bar.menus.slider.primary": "#c099ff",
+    "theme.bar.menus.progressbar.background": "#444a73",
+    "theme.bar.menus.progressbar.foreground": "#c099ff",
+    "theme.bar.menus.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.buttons.text": "#222436",
+    "theme.bar.menus.buttons.disabled": "#636da6",
+    "theme.bar.menus.buttons.active": "#ff757f",
+    "theme.bar.menus.buttons.default": "#c099ff",
+    "theme.bar.menus.check_radio_button.active": "#c099ff",
+    "theme.bar.menus.check_radio_button.background": "#3b4261",
+    "theme.bar.menus.switch.puck": "#636da6",
+    "theme.bar.menus.switch.disabled": "#636da6",
+    "theme.bar.menus.switch.enabled": "#c099ff",
+    "theme.bar.menus.icons.active": "#c099ff",
+    "theme.bar.menus.icons.passive": "#444a73",
+    "theme.bar.menus.listitems.active": "#c099ff",
+    "theme.bar.menus.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.popover.border": "#222436",
+    "theme.bar.menus.popover.background": "#222436",
+    "theme.bar.menus.popover.text": "#c099ff",
+    "theme.bar.menus.label": "#c099ff",
+    "theme.bar.menus.feinttext": "#444a73",
+    "theme.bar.menus.dimtext": "#444a73",
+    "theme.bar.menus.text": "#c8d3f5",
+    "theme.bar.menus.border.color": "#444a73",
+    "theme.bar.menus.cards": "#24283b",
+    "theme.bar.menus.background": "#222436",
+    "theme.bar.buttons.modules.power.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.power.icon": "#181825",
+    "theme.bar.buttons.modules.power.background": "#272a3d",
+    "theme.bar.buttons.modules.weather.icon_background": "#c099ff",
+    "theme.bar.buttons.modules.weather.icon": "#c099ff",
+    "theme.bar.buttons.modules.weather.text": "#c099ff",
+    "theme.bar.buttons.modules.weather.background": "#272a3d",
+    "theme.bar.buttons.modules.updates.icon_background": "#ff966c",
+    "theme.bar.buttons.modules.updates.icon": "#ff966c",
+    "theme.bar.buttons.modules.updates.text": "#ff966c",
+    "theme.bar.buttons.modules.updates.background": "#272a3d",
+    "theme.bar.buttons.modules.kbLayout.icon_background": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.icon": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.text": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
+    "theme.bar.buttons.modules.netstat.icon_background": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.icon": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.text": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.background": "#272a3d",
+    "theme.bar.buttons.modules.storage.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.storage.icon": "#ff757f",
+    "theme.bar.buttons.modules.storage.text": "#ff757f",
+    "theme.bar.buttons.modules.storage.background": "#272a3d",
+    "theme.bar.buttons.modules.cpu.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.cpu.icon": "#ff757f",
+    "theme.bar.buttons.modules.cpu.text": "#ff757f",
+    "theme.bar.buttons.modules.cpu.background": "#272a3d",
+    "theme.bar.buttons.modules.ram.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.ram.icon": "#ffc777",
+    "theme.bar.buttons.modules.ram.text": "#ffc777",
+    "theme.bar.buttons.modules.ram.background": "#272a3d",
+    "theme.bar.buttons.notifications.total": "#4fd6be",
+    "theme.bar.buttons.notifications.icon_background": "#4fd6be",
+    "theme.bar.buttons.notifications.icon": "#4fd6be",
+    "theme.bar.buttons.notifications.background": "#272a3d",
+    "theme.bar.buttons.clock.icon_background": "#fca7ea",
+    "theme.bar.buttons.clock.icon": "#fca7ea",
+    "theme.bar.buttons.clock.text": "#fca7ea",
+    "theme.bar.buttons.clock.background": "#272a3d",
+    "theme.bar.buttons.battery.icon_background": "#ffc777",
+    "theme.bar.buttons.battery.icon": "#ffc777",
+    "theme.bar.buttons.battery.text": "#ffc777",
+    "theme.bar.buttons.battery.background": "#272a3d",
+    "theme.bar.buttons.systray.background": "#272a3d",
+    "theme.bar.buttons.bluetooth.icon_background": "#86e1fc",
+    "theme.bar.buttons.bluetooth.icon": "#86e1fc",
+    "theme.bar.buttons.bluetooth.text": "#86e1fc",
+    "theme.bar.buttons.bluetooth.background": "#272a3d",
+    "theme.bar.buttons.network.icon_background": "#c099ff",
+    "theme.bar.buttons.network.icon": "#c099ff",
+    "theme.bar.buttons.network.text": "#c099ff",
+    "theme.bar.buttons.network.background": "#272a3d",
+    "theme.bar.buttons.volume.icon_background": "#ff757f",
+    "theme.bar.buttons.volume.icon": "#ff757f",
+    "theme.bar.buttons.volume.text": "#ff757f",
+    "theme.bar.buttons.volume.background": "#272a3d",
+    "theme.bar.buttons.media.icon_background": "#c099ff",
+    "theme.bar.buttons.media.icon": "#c099ff",
+    "theme.bar.buttons.media.text": "#c099ff",
+    "theme.bar.buttons.media.background": "#272a3d",
+    "theme.bar.buttons.windowtitle.icon_background": "#ff757f",
+    "theme.bar.buttons.windowtitle.icon": "#ff757f",
+    "theme.bar.buttons.windowtitle.text": "#ff757f",
+    "theme.bar.buttons.windowtitle.background": "#272a3d",
+    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+    "theme.bar.buttons.workspaces.active": "#ff757f",
+    "theme.bar.buttons.workspaces.occupied": "#ff757f",
+    "theme.bar.buttons.workspaces.available": "#86e1fc",
+    "theme.bar.buttons.workspaces.hover": "#ff757f",
+    "theme.bar.buttons.workspaces.background": "#272a3d",
+    "theme.bar.buttons.dashboard.icon": "#272a3d",
+    "theme.bar.buttons.dashboard.background": "#ffc777",
+    "theme.bar.buttons.icon": "#242438",
+    "theme.bar.buttons.text": "#c099ff",
+    "theme.bar.buttons.hover": "#444a73",
+    "theme.bar.buttons.icon_background": "#c099ff",
+    "theme.bar.buttons.background": "#272a3d",
+    "theme.bar.buttons.style": "default",
+    "theme.bar.background": "#222436",
+    "theme.osd.label": "#c099ff",
+    "theme.osd.icon": "#222436",
+    "theme.osd.bar_overflow_color": "#ff757f",
+    "theme.osd.bar_empty_color": "#444a73",
+    "theme.osd.bar_color": "#c099ff",
+    "theme.osd.icon_container": "#c099ff",
+    "theme.osd.bar_container": "#1e2030",
+    "theme.notification.close_button.label": "#222436",
+    "theme.notification.close_button.background": "#41a5b5",
+    "theme.notification.labelicon": "#41a5b5",
+    "theme.notification.text": "#c8d3f5",
+    "theme.notification.time": "#9aa5ce",
+    "theme.notification.border": "#2f324d",
+    "theme.notification.label": "#41a5b5",
+    "theme.notification.actions.text": "#24283b",
+    "theme.notification.actions.background": "#41a5b5",
+    "theme.notification.background": "#222436",
+    "theme.bar.buttons.modules.power.border": "#ff757f",
+    "theme.bar.buttons.modules.weather.border": "#c099ff",
+    "theme.bar.buttons.modules.updates.border": "#ff966c",
+    "theme.bar.buttons.modules.kbLayout.border": "#86e1fc",
+    "theme.bar.buttons.modules.netstat.border": "#c3e88d",
+    "theme.bar.buttons.modules.storage.border": "#ff757f",
+    "theme.bar.buttons.modules.cpu.border": "#ff757f",
+    "theme.bar.buttons.modules.ram.border": "#ffc777",
+    "theme.bar.buttons.notifications.border": "#4fd6be",
+    "theme.bar.buttons.clock.border": "#fca7ea",
+    "theme.bar.buttons.battery.border": "#ffc777",
+    "theme.bar.buttons.systray.border": "#444a73",
+    "theme.bar.buttons.bluetooth.border": "#86e1fc",
+    "theme.bar.buttons.network.border": "#c099ff",
+    "theme.bar.buttons.volume.border": "#ff757f",
+    "theme.bar.buttons.media.border": "#c099ff",
+    "theme.bar.buttons.windowtitle.border": "#ff757f",
+    "theme.bar.buttons.workspaces.border": "#ff757f",
+    "theme.bar.buttons.dashboard.border": "#ffc777",
+    "theme.bar.buttons.modules.submap.background": "#272a3d",
+    "theme.bar.buttons.modules.submap.text": "#4fd6be",
+    "theme.bar.buttons.modules.submap.border": "#4fd6be",
+    "theme.bar.buttons.modules.submap.icon": "#4fd6be",
+    "theme.bar.buttons.modules.submap.icon_background": "#4fd6be",
+    "theme.bar.menus.menu.network.switch.enabled": "#c099ff",
+    "theme.bar.menus.menu.network.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.network.switch.puck": "#636da6",
+    "theme.bar.buttons.systray.customIcon": "#c8d3f5",
+    "theme.bar.border.color": "#c099ff",
+    "theme.bar.menus.menu.media.timestamp": "#c8d3f5",
+    "theme.bar.buttons.borderColor": "#c099ff",
+    "theme.bar.buttons.modules.hyprsunset.icon": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.background": "#272a3d",
+    "theme.bar.buttons.modules.hyprsunset.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.text": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.border": "#ffc777",
+    "theme.bar.buttons.modules.hypridle.icon": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.background": "#272a3d",
+    "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.text": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
+    "theme.bar.menus.menu.network.scroller.color": "#c099ff",
+    "theme.bar.menus.menu.bluetooth.scroller.color": "#86e1fc",
+    "theme.bar.buttons.notifications.hover": "#504945",
+    "theme.bar.buttons.clock.hover": "#504945",
+    "theme.bar.buttons.battery.hover": "#504945",
+    "theme.bar.buttons.systray.hover": "#504945",
+    "theme.bar.buttons.bluetooth.hover": "#504945",
+    "theme.bar.buttons.network.hover": "#504945",
+    "theme.bar.buttons.volume.hover": "#504945",
+    "theme.bar.buttons.media.hover": "#504945",
+    "theme.bar.buttons.windowtitle.hover": "#504945",
+    "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+    "theme.bar.buttons.dashboard.hover": "#504945",
+    "theme.bar.menus.menu.power.card.color": "#2a283e",
+    "theme.bar.buttons.modules.cpu.hover": "#45475a",
+    "theme.bar.buttons.volume.output_icon": "#11111b",
+    "theme.bar.buttons.volume.output_text": "#eba0ac",
+    "theme.bar.buttons.volume.input_icon": "#11111b",
+    "theme.bar.buttons.volume.input_text": "#eba0ac",
+    "theme.bar.buttons.volume.separator": "#45475a",
+    "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.icon": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+    "theme.osd.border.color": "#8ff0a4",
+    "theme.bar.buttons.modules.cava.text": "#4fd6be",
+    "theme.bar.buttons.modules.cava.background": "#272a3d",
+    "theme.bar.buttons.modules.cava.icon_background": "#4fd6be",
+    "theme.bar.buttons.modules.cava.icon": "#4fd6be",
+    "theme.bar.buttons.modules.cava.border": "#4fd6be"
+}
diff --git a/themes/tokyo_night_moon_split.json b/themes/tokyo_night_moon_split.json
new file mode 100644
index 0000000..0d5043b
--- /dev/null
+++ b/themes/tokyo_night_moon_split.json
@@ -0,0 +1,389 @@
+{
+    "theme.bar.menus.menu.notifications.scrollbar.color": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.label": "#636da6",
+    "theme.bar.menus.menu.notifications.pager.button": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.background": "#222436",
+    "theme.bar.menus.menu.notifications.switch.puck": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.enabled": "#4fd6be",
+    "theme.bar.menus.menu.notifications.clear": "#4fd6be",
+    "theme.bar.menus.menu.notifications.switch_divider": "#444a73",
+    "theme.bar.menus.menu.notifications.border": "#2f324d",
+    "theme.bar.menus.menu.notifications.card": "#24283b",
+    "theme.bar.menus.menu.notifications.background": "#1e2030",
+    "theme.bar.menus.menu.notifications.no_notifications_label": "#444a73",
+    "theme.bar.menus.menu.notifications.label": "#4fd6be",
+    "theme.bar.menus.menu.power.buttons.sleep.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.sleep.text": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.logout.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.logout.text": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.restart.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.restart.text": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.shutdown.text": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+    "theme.bar.menus.menu.power.border.color": "#2f324d",
+    "theme.bar.menus.menu.power.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#444a73",
+    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#4fd6be",
+    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#ffc777",
+    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.input.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.input.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.volume.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.volume.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#ffc777",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.controls.disabled": "#444a73",
+    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.shortcuts.text": "#222436",
+    "theme.bar.menus.menu.dashboard.shortcuts.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#ff757f",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c8d3f5",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#444a73",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.powermenu.logout": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.restart": "#ffc777",
+    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#ff757f",
+    "theme.bar.menus.menu.dashboard.profile.name": "#ff757f",
+    "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+    "theme.bar.menus.menu.dashboard.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.card.color": "#24283b",
+    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#86e1fc",
+    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#82aaff",
+    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c099ff",
+    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#ffc777",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.stats": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.status": "#4fd6be",
+    "theme.bar.menus.menu.clock.weather.temperature": "#c8d3f5",
+    "theme.bar.menus.menu.clock.weather.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.contextdays": "#444a73",
+    "theme.bar.menus.menu.clock.calendar.days": "#c8d3f5",
+    "theme.bar.menus.menu.clock.calendar.currentday": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.paginator": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.weekdays": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.yearmonth": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.timeperiod": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.text": "#c8d3f5",
+    "theme.bar.menus.menu.clock.border.color": "#2f324d",
+    "theme.bar.menus.menu.clock.background.color": "#1e2030",
+    "theme.bar.menus.menu.clock.card.color": "#24283b",
+    "theme.bar.menus.menu.battery.slider.puck": "#636da6",
+    "theme.bar.menus.menu.battery.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.battery.slider.background": "#636da6",
+    "theme.bar.menus.menu.battery.slider.primary": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.active": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.passive": "#636da6",
+    "theme.bar.menus.menu.battery.listitems.active": "#ffc777",
+    "theme.bar.menus.menu.battery.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.battery.text": "#c8d3f5",
+    "theme.bar.menus.menu.battery.label.color": "#ffc777",
+    "theme.bar.menus.menu.battery.border.color": "#2f324d",
+    "theme.bar.menus.menu.battery.background.color": "#1e2030",
+    "theme.bar.menus.menu.battery.card.color": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.menu.systray.dropdownmenu.background": "#222436",
+    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.icons.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.icons.passive": "#636da6",
+    "theme.bar.menus.menu.bluetooth.listitems.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.switch.puck": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.enabled": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.switch_divider": "#444a73",
+    "theme.bar.menus.menu.bluetooth.status": "#636da6",
+    "theme.bar.menus.menu.bluetooth.text": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.label.color": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+    "theme.bar.menus.menu.bluetooth.background.color": "#1e2030",
+    "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
+    "theme.bar.menus.menu.network.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.menu.network.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.icons.active": "#c099ff",
+    "theme.bar.menus.menu.network.icons.passive": "#636da6",
+    "theme.bar.menus.menu.network.listitems.active": "#c099ff",
+    "theme.bar.menus.menu.network.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.status.color": "#636da6",
+    "theme.bar.menus.menu.network.text": "#c8d3f5",
+    "theme.bar.menus.menu.network.label.color": "#c099ff",
+    "theme.bar.menus.menu.network.border.color": "#2f324d",
+    "theme.bar.menus.menu.network.background.color": "#1e2030",
+    "theme.bar.menus.menu.network.card.color": "#24283b",
+    "theme.bar.menus.menu.volume.input_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.input_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.audio_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.audio_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.active": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.passive": "#636da6",
+    "theme.bar.menus.menu.volume.iconbutton.active": "#ff757f",
+    "theme.bar.menus.menu.volume.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.listitems.active": "#ff757f",
+    "theme.bar.menus.menu.volume.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.text": "#c8d3f5",
+    "theme.bar.menus.menu.volume.label.color": "#ff757f",
+    "theme.bar.menus.menu.volume.border.color": "#2f324d",
+    "theme.bar.menus.menu.volume.background.color": "#1e2030",
+    "theme.bar.menus.menu.volume.card.color": "#24283b",
+    "theme.bar.menus.menu.media.slider.puck": "#636da6",
+    "theme.bar.menus.menu.media.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.media.slider.background": "#636da6",
+    "theme.bar.menus.menu.media.slider.primary": "#ff757f",
+    "theme.bar.menus.menu.media.buttons.text": "#222436",
+    "theme.bar.menus.menu.media.buttons.background": "#c099ff",
+    "theme.bar.menus.menu.media.buttons.enabled": "#4fd6be",
+    "theme.bar.menus.menu.media.buttons.inactive": "#444a73",
+    "theme.bar.menus.menu.media.border.color": "#2f324d",
+    "theme.bar.menus.menu.media.card.color": "#24283b",
+    "theme.bar.menus.menu.media.background.color": "#1e2030",
+    "theme.bar.menus.menu.media.album": "#ff757f",
+    "theme.bar.menus.menu.media.artist": "#4fd6be",
+    "theme.bar.menus.menu.media.song": "#c099ff",
+    "theme.bar.menus.tooltip.text": "#c8d3f5",
+    "theme.bar.menus.tooltip.background": "#222436",
+    "theme.bar.menus.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.dropdownmenu.background": "#222436",
+    "theme.bar.menus.slider.puck": "#636da6",
+    "theme.bar.menus.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.slider.background": "#636da6",
+    "theme.bar.menus.slider.primary": "#c099ff",
+    "theme.bar.menus.progressbar.background": "#444a73",
+    "theme.bar.menus.progressbar.foreground": "#c099ff",
+    "theme.bar.menus.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.buttons.text": "#222436",
+    "theme.bar.menus.buttons.disabled": "#636da6",
+    "theme.bar.menus.buttons.active": "#ff757f",
+    "theme.bar.menus.buttons.default": "#c099ff",
+    "theme.bar.menus.check_radio_button.active": "#c099ff",
+    "theme.bar.menus.check_radio_button.background": "#3b4261",
+    "theme.bar.menus.switch.puck": "#636da6",
+    "theme.bar.menus.switch.disabled": "#636da6",
+    "theme.bar.menus.switch.enabled": "#c099ff",
+    "theme.bar.menus.icons.active": "#c099ff",
+    "theme.bar.menus.icons.passive": "#444a73",
+    "theme.bar.menus.listitems.active": "#c099ff",
+    "theme.bar.menus.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.popover.border": "#222436",
+    "theme.bar.menus.popover.background": "#222436",
+    "theme.bar.menus.popover.text": "#c099ff",
+    "theme.bar.menus.label": "#c099ff",
+    "theme.bar.menus.feinttext": "#444a73",
+    "theme.bar.menus.dimtext": "#444a73",
+    "theme.bar.menus.text": "#c8d3f5",
+    "theme.bar.menus.border.color": "#444a73",
+    "theme.bar.menus.cards": "#24283b",
+    "theme.bar.menus.background": "#222436",
+    "theme.bar.buttons.modules.power.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.power.icon": "#181825",
+    "theme.bar.buttons.modules.power.background": "#272a3d",
+    "theme.bar.buttons.modules.weather.icon_background": "#c099ff",
+    "theme.bar.buttons.modules.weather.icon": "#272a3d",
+    "theme.bar.buttons.modules.weather.text": "#c099ff",
+    "theme.bar.buttons.modules.weather.background": "#272a3d",
+    "theme.bar.buttons.modules.updates.icon_background": "#ff966c",
+    "theme.bar.buttons.modules.updates.icon": "#181825",
+    "theme.bar.buttons.modules.updates.text": "#ff966c",
+    "theme.bar.buttons.modules.updates.background": "#272a3d",
+    "theme.bar.buttons.modules.kbLayout.icon_background": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.icon": "#181825",
+    "theme.bar.buttons.modules.kbLayout.text": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
+    "theme.bar.buttons.modules.netstat.icon_background": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.icon": "#181825",
+    "theme.bar.buttons.modules.netstat.text": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.background": "#272a3d",
+    "theme.bar.buttons.modules.storage.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.storage.icon": "#181825",
+    "theme.bar.buttons.modules.storage.text": "#ff757f",
+    "theme.bar.buttons.modules.storage.background": "#272a3d",
+    "theme.bar.buttons.modules.cpu.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.cpu.icon": "#181825",
+    "theme.bar.buttons.modules.cpu.text": "#ff757f",
+    "theme.bar.buttons.modules.cpu.background": "#272a3d",
+    "theme.bar.buttons.modules.ram.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.ram.icon": "#181825",
+    "theme.bar.buttons.modules.ram.text": "#ffc777",
+    "theme.bar.buttons.modules.ram.background": "#272a3d",
+    "theme.bar.buttons.notifications.total": "#4fd6be",
+    "theme.bar.buttons.notifications.icon_background": "#4fd6be",
+    "theme.bar.buttons.notifications.icon": "#272a3d",
+    "theme.bar.buttons.notifications.background": "#272a3d",
+    "theme.bar.buttons.clock.icon_background": "#fca7ea",
+    "theme.bar.buttons.clock.icon": "#272a3d",
+    "theme.bar.buttons.clock.text": "#fca7ea",
+    "theme.bar.buttons.clock.background": "#272a3d",
+    "theme.bar.buttons.battery.icon_background": "#ffc777",
+    "theme.bar.buttons.battery.icon": "#272a3d",
+    "theme.bar.buttons.battery.text": "#ffc777",
+    "theme.bar.buttons.battery.background": "#272a3d",
+    "theme.bar.buttons.systray.background": "#272a3d",
+    "theme.bar.buttons.bluetooth.icon_background": "#86e1fc",
+    "theme.bar.buttons.bluetooth.icon": "#272a3d",
+    "theme.bar.buttons.bluetooth.text": "#86e1fc",
+    "theme.bar.buttons.bluetooth.background": "#272a3d",
+    "theme.bar.buttons.network.icon_background": "#c099ff",
+    "theme.bar.buttons.network.icon": "#272a3d",
+    "theme.bar.buttons.network.text": "#c099ff",
+    "theme.bar.buttons.network.background": "#272a3d",
+    "theme.bar.buttons.volume.icon_background": "#ff757f",
+    "theme.bar.buttons.volume.icon": "#272a3d",
+    "theme.bar.buttons.volume.text": "#ff757f",
+    "theme.bar.buttons.volume.background": "#272a3d",
+    "theme.bar.buttons.media.icon_background": "#c099ff",
+    "theme.bar.buttons.media.icon": "#272a3d",
+    "theme.bar.buttons.media.text": "#c099ff",
+    "theme.bar.buttons.media.background": "#272a3d",
+    "theme.bar.buttons.windowtitle.icon_background": "#ff757f",
+    "theme.bar.buttons.windowtitle.icon": "#272a3d",
+    "theme.bar.buttons.windowtitle.text": "#ff757f",
+    "theme.bar.buttons.windowtitle.background": "#272a3d",
+    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+    "theme.bar.buttons.workspaces.active": "#ff757f",
+    "theme.bar.buttons.workspaces.occupied": "#ff757f",
+    "theme.bar.buttons.workspaces.available": "#86e1fc",
+    "theme.bar.buttons.workspaces.hover": "#ff757f",
+    "theme.bar.buttons.workspaces.background": "#272a3d",
+    "theme.bar.buttons.dashboard.icon": "#272a3d",
+    "theme.bar.buttons.dashboard.background": "#ffc777",
+    "theme.bar.buttons.icon": "#242438",
+    "theme.bar.buttons.text": "#c099ff",
+    "theme.bar.buttons.hover": "#444a73",
+    "theme.bar.buttons.icon_background": "#c099ff",
+    "theme.bar.buttons.background": "#272a3d",
+    "theme.bar.buttons.style": "split",
+    "theme.bar.background": "#222436",
+    "theme.osd.label": "#c099ff",
+    "theme.osd.icon": "#222436",
+    "theme.osd.bar_overflow_color": "#ff757f",
+    "theme.osd.bar_empty_color": "#444a73",
+    "theme.osd.bar_color": "#c099ff",
+    "theme.osd.icon_container": "#c099ff",
+    "theme.osd.bar_container": "#1e2030",
+    "theme.notification.close_button.label": "#222436",
+    "theme.notification.close_button.background": "#41a5b5",
+    "theme.notification.labelicon": "#41a5b5",
+    "theme.notification.text": "#c8d3f5",
+    "theme.notification.time": "#9aa5ce",
+    "theme.notification.border": "#2f324d",
+    "theme.notification.label": "#41a5b5",
+    "theme.notification.actions.text": "#24283b",
+    "theme.notification.actions.background": "#41a5b5",
+    "theme.notification.background": "#222436",
+    "theme.bar.buttons.modules.power.border": "#ff757f",
+    "theme.bar.buttons.modules.weather.border": "#c099ff",
+    "theme.bar.buttons.modules.updates.border": "#ff966c",
+    "theme.bar.buttons.modules.kbLayout.border": "#86e1fc",
+    "theme.bar.buttons.modules.netstat.border": "#c3e88d",
+    "theme.bar.buttons.modules.storage.border": "#ff757f",
+    "theme.bar.buttons.modules.cpu.border": "#ff757f",
+    "theme.bar.buttons.modules.ram.border": "#ffc777",
+    "theme.bar.buttons.notifications.border": "#4fd6be",
+    "theme.bar.buttons.clock.border": "#fca7ea",
+    "theme.bar.buttons.battery.border": "#ffc777",
+    "theme.bar.buttons.systray.border": "#444a73",
+    "theme.bar.buttons.bluetooth.border": "#86e1fc",
+    "theme.bar.buttons.network.border": "#c099ff",
+    "theme.bar.buttons.volume.border": "#ff757f",
+    "theme.bar.buttons.media.border": "#c099ff",
+    "theme.bar.buttons.windowtitle.border": "#ff757f",
+    "theme.bar.buttons.workspaces.border": "#ff757f",
+    "theme.bar.buttons.dashboard.border": "#ffc777",
+    "theme.bar.buttons.modules.submap.background": "#272a3d",
+    "theme.bar.buttons.modules.submap.text": "#4fd6be",
+    "theme.bar.buttons.modules.submap.border": "#4fd6be",
+    "theme.bar.buttons.modules.submap.icon": "#181825",
+    "theme.bar.buttons.modules.submap.icon_background": "#4fd6be",
+    "theme.bar.menus.menu.network.switch.enabled": "#c099ff",
+    "theme.bar.menus.menu.network.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.network.switch.puck": "#636da6",
+    "theme.bar.buttons.systray.customIcon": "#c8d3f5",
+    "theme.bar.border.color": "#c099ff",
+    "theme.bar.menus.menu.media.timestamp": "#c8d3f5",
+    "theme.bar.buttons.borderColor": "#c099ff",
+    "theme.bar.buttons.modules.hyprsunset.icon": "#181825",
+    "theme.bar.buttons.modules.hyprsunset.background": "#272a3d",
+    "theme.bar.buttons.modules.hyprsunset.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.text": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.border": "#ffc777",
+    "theme.bar.buttons.modules.hypridle.icon": "#181825",
+    "theme.bar.buttons.modules.hypridle.background": "#272a3d",
+    "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.text": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
+    "theme.bar.menus.menu.network.scroller.color": "#c099ff",
+    "theme.bar.menus.menu.bluetooth.scroller.color": "#86e1fc",
+    "theme.bar.buttons.notifications.hover": "#504945",
+    "theme.bar.buttons.clock.hover": "#504945",
+    "theme.bar.buttons.battery.hover": "#504945",
+    "theme.bar.buttons.systray.hover": "#504945",
+    "theme.bar.buttons.bluetooth.hover": "#504945",
+    "theme.bar.buttons.network.hover": "#504945",
+    "theme.bar.buttons.volume.hover": "#504945",
+    "theme.bar.buttons.media.hover": "#504945",
+    "theme.bar.buttons.windowtitle.hover": "#504945",
+    "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+    "theme.bar.buttons.dashboard.hover": "#504945",
+    "theme.bar.menus.menu.power.card.color": "#2a283e",
+    "theme.bar.buttons.modules.cpu.hover": "#45475a",
+    "theme.bar.buttons.volume.output_icon": "#11111b",
+    "theme.bar.buttons.volume.output_text": "#eba0ac",
+    "theme.bar.buttons.volume.input_icon": "#11111b",
+    "theme.bar.buttons.volume.input_text": "#eba0ac",
+    "theme.bar.buttons.volume.separator": "#45475a",
+    "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.icon": "#181824",
+    "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+    "theme.osd.border.color": "#8ff0a4",
+    "theme.bar.buttons.modules.cava.text": "#4fd6be",
+    "theme.bar.buttons.modules.cava.background": "#272a3d",
+    "theme.bar.buttons.modules.cava.icon_background": "#4fd6be",
+    "theme.bar.buttons.modules.cava.icon": "#181825",
+    "theme.bar.buttons.modules.cava.border": "#4fd6be"
+}
+
diff --git a/themes/tokyo_night_moon_vivid.json b/themes/tokyo_night_moon_vivid.json
new file mode 100644
index 0000000..73bdd31
--- /dev/null
+++ b/themes/tokyo_night_moon_vivid.json
@@ -0,0 +1,388 @@
+{
+    "theme.bar.menus.menu.notifications.scrollbar.color": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.label": "#636da6",
+    "theme.bar.menus.menu.notifications.pager.button": "#4fd6be",
+    "theme.bar.menus.menu.notifications.pager.background": "#222436",
+    "theme.bar.menus.menu.notifications.switch.puck": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.notifications.switch.enabled": "#4fd6be",
+    "theme.bar.menus.menu.notifications.clear": "#4fd6be",
+    "theme.bar.menus.menu.notifications.switch_divider": "#444a73",
+    "theme.bar.menus.menu.notifications.border": "#2f324d",
+    "theme.bar.menus.menu.notifications.card": "#24283b",
+    "theme.bar.menus.menu.notifications.background": "#1e2030",
+    "theme.bar.menus.menu.notifications.no_notifications_label": "#444a73",
+    "theme.bar.menus.menu.notifications.label": "#4fd6be",
+    "theme.bar.menus.menu.power.buttons.sleep.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.sleep.text": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#86e1fc",
+    "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.logout.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.logout.text": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.icon_background": "#c3e88d",
+    "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.restart.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.restart.text": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.icon_background": "#ffc777",
+    "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon": "#222436",
+    "theme.bar.menus.menu.power.buttons.shutdown.text": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#ff757f",
+    "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+    "theme.bar.menus.menu.power.border.color": "#2f324d",
+    "theme.bar.menus.menu.power.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.monitors.disk.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.label": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.bar": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.gpu.icon": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.monitors.ram.label": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.bar": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.ram.icon": "#ffc777",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.label": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.bar": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.cpu.icon": "#ff757f",
+    "theme.bar.menus.menu.dashboard.monitors.bar_background": "#444a73",
+    "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#c099ff",
+    "theme.bar.menus.menu.dashboard.directories.right.top.color": "#4fd6be",
+    "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#ffc777",
+    "theme.bar.menus.menu.dashboard.directories.left.top.color": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.input.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.input.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.volume.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.volume.background": "#ff757f",
+    "theme.bar.menus.menu.dashboard.controls.notifications.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.notifications.background": "#ffc777",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.bluetooth.background": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.controls.wifi.text": "#222436",
+    "theme.bar.menus.menu.dashboard.controls.wifi.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.controls.disabled": "#444a73",
+    "theme.bar.menus.menu.dashboard.shortcuts.recording": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.shortcuts.text": "#222436",
+    "theme.bar.menus.menu.dashboard.shortcuts.background": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#ff757f",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c8d3f5",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#c099ff",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#444a73",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#222436",
+    "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+    "theme.bar.menus.menu.dashboard.powermenu.sleep": "#86e1fc",
+    "theme.bar.menus.menu.dashboard.powermenu.logout": "#c3e88d",
+    "theme.bar.menus.menu.dashboard.powermenu.restart": "#ffc777",
+    "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#ff757f",
+    "theme.bar.menus.menu.dashboard.profile.name": "#ff757f",
+    "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+    "theme.bar.menus.menu.dashboard.background.color": "#1e2030",
+    "theme.bar.menus.menu.dashboard.card.color": "#24283b",
+    "theme.bar.menus.menu.clock.weather.hourly.temperature": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.hourly.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#86e1fc",
+    "theme.bar.menus.menu.clock.weather.thermometer.cold": "#82aaff",
+    "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#c099ff",
+    "theme.bar.menus.menu.clock.weather.thermometer.hot": "#ffc777",
+    "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.stats": "#fca7ea",
+    "theme.bar.menus.menu.clock.weather.status": "#4fd6be",
+    "theme.bar.menus.menu.clock.weather.temperature": "#c8d3f5",
+    "theme.bar.menus.menu.clock.weather.icon": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.contextdays": "#444a73",
+    "theme.bar.menus.menu.clock.calendar.days": "#c8d3f5",
+    "theme.bar.menus.menu.clock.calendar.currentday": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.paginator": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.weekdays": "#fca7ea",
+    "theme.bar.menus.menu.clock.calendar.yearmonth": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.timeperiod": "#4fd6be",
+    "theme.bar.menus.menu.clock.time.time": "#fca7ea",
+    "theme.bar.menus.menu.clock.text": "#c8d3f5",
+    "theme.bar.menus.menu.clock.border.color": "#2f324d",
+    "theme.bar.menus.menu.clock.background.color": "#1e2030",
+    "theme.bar.menus.menu.clock.card.color": "#24283b",
+    "theme.bar.menus.menu.battery.slider.puck": "#636da6",
+    "theme.bar.menus.menu.battery.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.battery.slider.background": "#636da6",
+    "theme.bar.menus.menu.battery.slider.primary": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.active": "#ffc777",
+    "theme.bar.menus.menu.battery.icons.passive": "#636da6",
+    "theme.bar.menus.menu.battery.listitems.active": "#ffc777",
+    "theme.bar.menus.menu.battery.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.battery.text": "#c8d3f5",
+    "theme.bar.menus.menu.battery.label.color": "#ffc777",
+    "theme.bar.menus.menu.battery.border.color": "#2f324d",
+    "theme.bar.menus.menu.battery.background.color": "#1e2030",
+    "theme.bar.menus.menu.battery.card.color": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.menu.systray.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.menu.systray.dropdownmenu.background": "#222436",
+    "theme.bar.menus.menu.bluetooth.iconbutton.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.icons.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.icons.passive": "#636da6",
+    "theme.bar.menus.menu.bluetooth.listitems.active": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.switch.puck": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.bluetooth.switch.enabled": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.switch_divider": "#444a73",
+    "theme.bar.menus.menu.bluetooth.status": "#636da6",
+    "theme.bar.menus.menu.bluetooth.text": "#c8d3f5",
+    "theme.bar.menus.menu.bluetooth.label.color": "#86e1fc",
+    "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+    "theme.bar.menus.menu.bluetooth.background.color": "#1e2030",
+    "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
+    "theme.bar.menus.menu.network.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.menu.network.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.icons.active": "#c099ff",
+    "theme.bar.menus.menu.network.icons.passive": "#636da6",
+    "theme.bar.menus.menu.network.listitems.active": "#c099ff",
+    "theme.bar.menus.menu.network.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.network.status.color": "#636da6",
+    "theme.bar.menus.menu.network.text": "#c8d3f5",
+    "theme.bar.menus.menu.network.label.color": "#c099ff",
+    "theme.bar.menus.menu.network.border.color": "#2f324d",
+    "theme.bar.menus.menu.network.background.color": "#1e2030",
+    "theme.bar.menus.menu.network.card.color": "#24283b",
+    "theme.bar.menus.menu.volume.input_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.input_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.input_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.audio_slider.puck": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.volume.audio_slider.background": "#636da6",
+    "theme.bar.menus.menu.volume.audio_slider.primary": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.active": "#ff757f",
+    "theme.bar.menus.menu.volume.icons.passive": "#636da6",
+    "theme.bar.menus.menu.volume.iconbutton.active": "#ff757f",
+    "theme.bar.menus.menu.volume.iconbutton.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.listitems.active": "#ff757f",
+    "theme.bar.menus.menu.volume.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.menu.volume.text": "#c8d3f5",
+    "theme.bar.menus.menu.volume.label.color": "#ff757f",
+    "theme.bar.menus.menu.volume.border.color": "#2f324d",
+    "theme.bar.menus.menu.volume.background.color": "#1e2030",
+    "theme.bar.menus.menu.volume.card.color": "#24283b",
+    "theme.bar.menus.menu.media.slider.puck": "#636da6",
+    "theme.bar.menus.menu.media.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.menu.media.slider.background": "#636da6",
+    "theme.bar.menus.menu.media.slider.primary": "#ff757f",
+    "theme.bar.menus.menu.media.buttons.text": "#222436",
+    "theme.bar.menus.menu.media.buttons.background": "#c099ff",
+    "theme.bar.menus.menu.media.buttons.enabled": "#4fd6be",
+    "theme.bar.menus.menu.media.buttons.inactive": "#444a73",
+    "theme.bar.menus.menu.media.border.color": "#2f324d",
+    "theme.bar.menus.menu.media.card.color": "#24283b",
+    "theme.bar.menus.menu.media.background.color": "#1e2030",
+    "theme.bar.menus.menu.media.album": "#ff757f",
+    "theme.bar.menus.menu.media.artist": "#4fd6be",
+    "theme.bar.menus.menu.media.song": "#c099ff",
+    "theme.bar.menus.tooltip.text": "#c8d3f5",
+    "theme.bar.menus.tooltip.background": "#222436",
+    "theme.bar.menus.dropdownmenu.divider": "#24283b",
+    "theme.bar.menus.dropdownmenu.text": "#c8d3f5",
+    "theme.bar.menus.dropdownmenu.background": "#222436",
+    "theme.bar.menus.slider.puck": "#636da6",
+    "theme.bar.menus.slider.backgroundhover": "#444a73",
+    "theme.bar.menus.slider.background": "#636da6",
+    "theme.bar.menus.slider.primary": "#c099ff",
+    "theme.bar.menus.progressbar.background": "#444a73",
+    "theme.bar.menus.progressbar.foreground": "#c099ff",
+    "theme.bar.menus.iconbuttons.active": "#c099ff",
+    "theme.bar.menus.iconbuttons.passive": "#c8d3f5",
+    "theme.bar.menus.buttons.text": "#222436",
+    "theme.bar.menus.buttons.disabled": "#636da6",
+    "theme.bar.menus.buttons.active": "#ff757f",
+    "theme.bar.menus.buttons.default": "#c099ff",
+    "theme.bar.menus.check_radio_button.active": "#c099ff",
+    "theme.bar.menus.check_radio_button.background": "#3b4261",
+    "theme.bar.menus.switch.puck": "#636da6",
+    "theme.bar.menus.switch.disabled": "#636da6",
+    "theme.bar.menus.switch.enabled": "#c099ff",
+    "theme.bar.menus.icons.active": "#c099ff",
+    "theme.bar.menus.icons.passive": "#444a73",
+    "theme.bar.menus.listitems.active": "#c099ff",
+    "theme.bar.menus.listitems.passive": "#c8d3f5",
+    "theme.bar.menus.popover.border": "#222436",
+    "theme.bar.menus.popover.background": "#222436",
+    "theme.bar.menus.popover.text": "#c099ff",
+    "theme.bar.menus.label": "#c099ff",
+    "theme.bar.menus.feinttext": "#444a73",
+    "theme.bar.menus.dimtext": "#444a73",
+    "theme.bar.menus.text": "#c8d3f5",
+    "theme.bar.menus.border.color": "#444a73",
+    "theme.bar.menus.cards": "#24283b",
+    "theme.bar.menus.background": "#222436",
+    "theme.bar.buttons.modules.power.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.power.icon": "#181825",
+    "theme.bar.buttons.modules.power.background": "#272a3d",
+    "theme.bar.buttons.modules.weather.icon_background": "#c099ff",
+    "theme.bar.buttons.modules.weather.icon": "#272a3d",
+    "theme.bar.buttons.modules.weather.text": "#272a3d",
+    "theme.bar.buttons.modules.weather.background": "#c099ff",
+    "theme.bar.buttons.modules.updates.icon_background": "#ff966c",
+    "theme.bar.buttons.modules.updates.icon": "#272a3d",
+    "theme.bar.buttons.modules.updates.text": "#272a3d",
+    "theme.bar.buttons.modules.updates.background": "#ff966c",
+    "theme.bar.buttons.modules.kbLayout.icon_background": "#86e1fc",
+    "theme.bar.buttons.modules.kbLayout.icon": "#272a3d",
+    "theme.bar.buttons.modules.kbLayout.text": "#272a3d",
+    "theme.bar.buttons.modules.kbLayout.background": "#86e1fc",
+    "theme.bar.buttons.modules.netstat.icon_background": "#c3e88d",
+    "theme.bar.buttons.modules.netstat.icon": "#272a3d",
+    "theme.bar.buttons.modules.netstat.text": "#272a3d",
+    "theme.bar.buttons.modules.netstat.background": "#c3e88d",
+    "theme.bar.buttons.modules.storage.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.storage.icon": "#272a3d",
+    "theme.bar.buttons.modules.storage.text": "#272a3d",
+    "theme.bar.buttons.modules.storage.background": "#ff757f",
+    "theme.bar.buttons.modules.cpu.icon_background": "#ff757f",
+    "theme.bar.buttons.modules.cpu.icon": "#272a3d",
+    "theme.bar.buttons.modules.cpu.text": "#272a3d",
+    "theme.bar.buttons.modules.cpu.background": "#ff757f",
+    "theme.bar.buttons.modules.ram.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.ram.icon": "#272a3d",
+    "theme.bar.buttons.modules.ram.text": "#272a3d",
+    "theme.bar.buttons.modules.ram.background": "#ffc777",
+    "theme.bar.buttons.notifications.total": "#272a3d",
+    "theme.bar.buttons.notifications.icon_background": "#4fd6be",
+    "theme.bar.buttons.notifications.icon": "#272a3d",
+    "theme.bar.buttons.notifications.background": "#4fd6be",
+    "theme.bar.buttons.clock.icon_background": "#fca7ea",
+    "theme.bar.buttons.clock.icon": "#272a3d",
+    "theme.bar.buttons.clock.text": "#272a3d",
+    "theme.bar.buttons.clock.background": "#fca7ea",
+    "theme.bar.buttons.battery.icon_background": "#ffc777",
+    "theme.bar.buttons.battery.icon": "#272a3d",
+    "theme.bar.buttons.battery.text": "#272a3d",
+    "theme.bar.buttons.battery.background": "#ffc777",
+    "theme.bar.buttons.systray.background": "#272a3d",
+    "theme.bar.buttons.bluetooth.icon_background": "#86e1fc",
+    "theme.bar.buttons.bluetooth.icon": "#272a3d",
+    "theme.bar.buttons.bluetooth.text": "#272a3d",
+    "theme.bar.buttons.bluetooth.background": "#86e1fc",
+    "theme.bar.buttons.network.icon_background": "#c099ff",
+    "theme.bar.buttons.network.icon": "#272a3d",
+    "theme.bar.buttons.network.text": "#272a3d",
+    "theme.bar.buttons.network.background": "#c099ff",
+    "theme.bar.buttons.volume.icon_background": "#ff757f",
+    "theme.bar.buttons.volume.icon": "#272a3d",
+    "theme.bar.buttons.volume.text": "#272a3d",
+    "theme.bar.buttons.volume.background": "#ff757f",
+    "theme.bar.buttons.media.icon_background": "#c099ff",
+    "theme.bar.buttons.media.icon": "#272a3d",
+    "theme.bar.buttons.media.text": "#272a3d",
+    "theme.bar.buttons.media.background": "#c099ff",
+    "theme.bar.buttons.windowtitle.icon_background": "#ff757f",
+    "theme.bar.buttons.windowtitle.icon": "#272a3d",
+    "theme.bar.buttons.windowtitle.text": "#272a3d",
+    "theme.bar.buttons.windowtitle.background": "#ff757f",
+    "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+    "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
+    "theme.bar.buttons.workspaces.active": "#ff757f",
+    "theme.bar.buttons.workspaces.occupied": "#ff757f",
+    "theme.bar.buttons.workspaces.available": "#86e1fc",
+    "theme.bar.buttons.workspaces.hover": "#ff757f",
+    "theme.bar.buttons.workspaces.background": "#272a3d",
+    "theme.bar.buttons.dashboard.icon": "#272a3d",
+    "theme.bar.buttons.dashboard.background": "#ffc777",
+    "theme.bar.buttons.icon": "#242438",
+    "theme.bar.buttons.text": "#c099ff",
+    "theme.bar.buttons.hover": "#444a73",
+    "theme.bar.buttons.icon_background": "#c099ff",
+    "theme.bar.buttons.background": "#272a3d",
+    "theme.bar.buttons.style": "default",
+    "theme.bar.background": "#222436",
+    "theme.osd.label": "#c099ff",
+    "theme.osd.icon": "#222436",
+    "theme.osd.bar_overflow_color": "#ff757f",
+    "theme.osd.bar_empty_color": "#444a73",
+    "theme.osd.bar_color": "#c099ff",
+    "theme.osd.icon_container": "#c099ff",
+    "theme.osd.bar_container": "#1e2030",
+    "theme.notification.close_button.label": "#222436",
+    "theme.notification.close_button.background": "#41a5b5",
+    "theme.notification.labelicon": "#41a5b5",
+    "theme.notification.text": "#c8d3f5",
+    "theme.notification.time": "#9aa5ce",
+    "theme.notification.border": "#2f324d",
+    "theme.notification.label": "#41a5b5",
+    "theme.notification.actions.text": "#24283b",
+    "theme.notification.actions.background": "#41a5b5",
+    "theme.notification.background": "#222436",
+    "theme.bar.buttons.modules.power.border": "#ff757f",
+    "theme.bar.buttons.modules.weather.border": "#c099ff",
+    "theme.bar.buttons.modules.updates.border": "#ff966c",
+    "theme.bar.buttons.modules.kbLayout.border": "#86e1fc",
+    "theme.bar.buttons.modules.netstat.border": "#c3e88d",
+    "theme.bar.buttons.modules.storage.border": "#ff757f",
+    "theme.bar.buttons.modules.cpu.border": "#ff757f",
+    "theme.bar.buttons.modules.ram.border": "#ffc777",
+    "theme.bar.buttons.notifications.border": "#4fd6be",
+    "theme.bar.buttons.clock.border": "#fca7ea",
+    "theme.bar.buttons.battery.border": "#ffc777",
+    "theme.bar.buttons.systray.border": "#444a73",
+    "theme.bar.buttons.bluetooth.border": "#86e1fc",
+    "theme.bar.buttons.network.border": "#c099ff",
+    "theme.bar.buttons.volume.border": "#ff757f",
+    "theme.bar.buttons.media.border": "#c099ff",
+    "theme.bar.buttons.windowtitle.border": "#ff757f",
+    "theme.bar.buttons.workspaces.border": "#ff757f",
+    "theme.bar.buttons.dashboard.border": "#ffc777",
+    "theme.bar.buttons.modules.submap.background": "#4fd6be",
+    "theme.bar.buttons.modules.submap.text": "#272a3d",
+    "theme.bar.buttons.modules.submap.border": "#4fd6be",
+    "theme.bar.buttons.modules.submap.icon": "#272a3d",
+    "theme.bar.buttons.modules.submap.icon_background": "#4fd6be",
+    "theme.bar.menus.menu.network.switch.enabled": "#c099ff",
+    "theme.bar.menus.menu.network.switch.disabled": "#636da6",
+    "theme.bar.menus.menu.network.switch.puck": "#636da6",
+    "theme.bar.buttons.systray.customIcon": "#c8d3f5",
+    "theme.bar.border.color": "#c099ff",
+    "theme.bar.menus.menu.media.timestamp": "#c8d3f5",
+    "theme.bar.buttons.borderColor": "#c099ff",
+    "theme.bar.buttons.modules.hyprsunset.icon": "#272a3d",
+    "theme.bar.buttons.modules.hyprsunset.background": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.icon_background": "#ffc777",
+    "theme.bar.buttons.modules.hyprsunset.text": "#272a3d",
+    "theme.bar.buttons.modules.hyprsunset.border": "#ffc777",
+    "theme.bar.buttons.modules.hypridle.icon": "#272a3d",
+    "theme.bar.buttons.modules.hypridle.background": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
+    "theme.bar.buttons.modules.hypridle.text": "#272a3d",
+    "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
+    "theme.bar.menus.menu.network.scroller.color": "#c099ff",
+    "theme.bar.menus.menu.bluetooth.scroller.color": "#86e1fc",
+    "theme.bar.buttons.notifications.hover": "#504945",
+    "theme.bar.buttons.clock.hover": "#504945",
+    "theme.bar.buttons.battery.hover": "#504945",
+    "theme.bar.buttons.systray.hover": "#504945",
+    "theme.bar.buttons.bluetooth.hover": "#504945",
+    "theme.bar.buttons.network.hover": "#504945",
+    "theme.bar.buttons.volume.hover": "#504945",
+    "theme.bar.buttons.media.hover": "#504945",
+    "theme.bar.buttons.windowtitle.hover": "#504945",
+    "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+    "theme.bar.buttons.dashboard.hover": "#504945",
+    "theme.bar.menus.menu.power.card.color": "#2a283e",
+    "theme.bar.buttons.modules.cpu.hover": "#45475a",
+    "theme.bar.buttons.volume.output_icon": "#11111b",
+    "theme.bar.buttons.volume.output_text": "#eba0ac",
+    "theme.bar.buttons.volume.input_icon": "#11111b",
+    "theme.bar.buttons.volume.input_text": "#eba0ac",
+    "theme.bar.buttons.volume.separator": "#45475a",
+    "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.icon": "#181824",
+    "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+    "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+    "theme.osd.border.color": "#8ff0a4",
+    "theme.bar.buttons.modules.cava.text": "#272a3d",
+    "theme.bar.buttons.modules.cava.background": "#4fd6be",
+    "theme.bar.buttons.modules.cava.icon_background": "#4fd6be",
+    "theme.bar.buttons.modules.cava.icon": "#272a3d",
+    "theme.bar.buttons.modules.cava.border": "#4fd6be"
+}
diff --git a/themes/tokyo_night_split.json b/themes/tokyo_night_split.json
index 62df670..529a947 100644
--- a/themes/tokyo_night_split.json
+++ b/themes/tokyo_night_split.json
@@ -1,39 +1,36 @@
 {
-  "theme.bar.menus.background": "#1a1b26",
-  "theme.bar.background": "#1a1b26",
-  "theme.bar.buttons.media.icon": "#272a3d",
-  "theme.bar.buttons.media.text": "#bb9af7",
-  "theme.bar.buttons.icon": "#242438",
-  "theme.bar.buttons.text": "#bb9af7",
-  "theme.bar.buttons.hover": "#414868",
-  "theme.bar.buttons.background": "#272a3d",
-  "theme.bar.menus.text": "#c0caf5",
-  "theme.bar.menus.border.color": "#414868",
-  "theme.bar.buttons.media.background": "#272a3d",
-  "theme.bar.menus.menu.volume.text": "#c0caf5",
-  "theme.bar.menus.menu.volume.card.color": "#24283b",
-  "theme.bar.menus.menu.volume.label.color": "#f7768e",
-  "theme.bar.menus.popover.text": "#bb9af7",
-  "theme.bar.menus.popover.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
+  "theme.bar.menus.menu.notifications.pager.button": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
   "theme.bar.menus.menu.notifications.switch.puck": "#565f89",
   "theme.bar.menus.menu.notifications.switch.disabled": "#565f89",
-  "theme.bar.menus.menu.notifications.switch.enabled": "#bb9af7",
-  "theme.bar.menus.menu.notifications.clear": "#f7768e",
+  "theme.bar.menus.menu.notifications.switch.enabled": "#1abc9c",
+  "theme.bar.menus.menu.notifications.clear": "#1abc9c",
   "theme.bar.menus.menu.notifications.switch_divider": "#414868",
-  "theme.bar.menus.menu.notifications.border": "#414868",
+  "theme.bar.menus.menu.notifications.border": "#2f324d",
   "theme.bar.menus.menu.notifications.card": "#24283b",
-  "theme.bar.menus.menu.notifications.background": "#1a1b26",
+  "theme.bar.menus.menu.notifications.background": "#16161e",
   "theme.bar.menus.menu.notifications.no_notifications_label": "#414868",
-  "theme.bar.menus.menu.notifications.label": "#bb9af7",
+  "theme.bar.menus.menu.notifications.label": "#1abc9c",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+  "theme.bar.menus.menu.power.border.color": "#2f324d",
+  "theme.bar.menus.menu.power.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f7768e",
@@ -49,7 +46,7 @@
   "theme.bar.menus.menu.dashboard.monitors.bar_background": "#414868",
   "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#bb9af7",
   "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#73daca",
+  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#1abc9c",
   "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#f7768e",
   "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#e0af68",
   "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f7768e",
@@ -67,36 +64,45 @@
   "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ece6a",
   "theme.bar.menus.menu.dashboard.shortcuts.text": "#1a1b26",
   "theme.bar.menus.menu.dashboard.shortcuts.background": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
   "theme.bar.menus.menu.dashboard.powermenu.sleep": "#7dcfff",
   "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ece6a",
   "theme.bar.menus.menu.dashboard.powermenu.restart": "#e0af68",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
   "theme.bar.menus.menu.dashboard.profile.name": "#f7768e",
-  "theme.bar.menus.menu.dashboard.border.color": "#414868",
-  "theme.bar.menus.menu.dashboard.background.color": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+  "theme.bar.menus.menu.dashboard.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.card.color": "#24283b",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#7dcfff",
   "theme.bar.menus.menu.clock.weather.thermometer.cold": "#7aa2f7",
   "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#bb9af7",
   "theme.bar.menus.menu.clock.weather.thermometer.hot": "#e0af68",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.stats": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.status": "#73daca",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.stats": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.status": "#1abc9c",
   "theme.bar.menus.menu.clock.weather.temperature": "#c0caf5",
-  "theme.bar.menus.menu.clock.weather.icon": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.icon": "#9d7cd8",
   "theme.bar.menus.menu.clock.calendar.contextdays": "#414868",
   "theme.bar.menus.menu.clock.calendar.days": "#c0caf5",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#73daca",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#73daca",
-  "theme.bar.menus.menu.clock.time.time": "#f7768e",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.text": "#c0caf5",
-  "theme.bar.menus.menu.clock.border.color": "#414868",
-  "theme.bar.menus.menu.clock.background.color": "#1a1b26",
+  "theme.bar.menus.menu.clock.border.color": "#2f324d",
+  "theme.bar.menus.menu.clock.background.color": "#16161e",
   "theme.bar.menus.menu.clock.card.color": "#24283b",
   "theme.bar.menus.menu.battery.slider.puck": "#565f89",
   "theme.bar.menus.menu.battery.slider.backgroundhover": "#414868",
@@ -108,8 +114,8 @@
   "theme.bar.menus.menu.battery.listitems.passive": "#c0caf5",
   "theme.bar.menus.menu.battery.text": "#c0caf5",
   "theme.bar.menus.menu.battery.label.color": "#e0af68",
-  "theme.bar.menus.menu.battery.border.color": "#414868",
-  "theme.bar.menus.menu.battery.background.color": "#1a1b26",
+  "theme.bar.menus.menu.battery.border.color": "#2f324d",
+  "theme.bar.menus.menu.battery.background.color": "#16161e",
   "theme.bar.menus.menu.battery.card.color": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.text": "#c0caf5",
@@ -127,8 +133,8 @@
   "theme.bar.menus.menu.bluetooth.status": "#565f89",
   "theme.bar.menus.menu.bluetooth.text": "#c0caf5",
   "theme.bar.menus.menu.bluetooth.label.color": "#7dcfff",
-  "theme.bar.menus.menu.bluetooth.border.color": "#414868",
-  "theme.bar.menus.menu.bluetooth.background.color": "#1a1b26",
+  "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+  "theme.bar.menus.menu.bluetooth.background.color": "#16161e",
   "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
   "theme.bar.menus.menu.network.iconbuttons.active": "#bb9af7",
   "theme.bar.menus.menu.network.iconbuttons.passive": "#c0caf5",
@@ -139,8 +145,8 @@
   "theme.bar.menus.menu.network.status.color": "#565f89",
   "theme.bar.menus.menu.network.text": "#c0caf5",
   "theme.bar.menus.menu.network.label.color": "#bb9af7",
-  "theme.bar.menus.menu.network.border.color": "#414868",
-  "theme.bar.menus.menu.network.background.color": "#1a1b26",
+  "theme.bar.menus.menu.network.border.color": "#2f324d",
+  "theme.bar.menus.menu.network.background.color": "#16161e",
   "theme.bar.menus.menu.network.card.color": "#24283b",
   "theme.bar.menus.menu.volume.input_slider.puck": "#414868",
   "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#414868",
@@ -156,20 +162,24 @@
   "theme.bar.menus.menu.volume.iconbutton.passive": "#c0caf5",
   "theme.bar.menus.menu.volume.listitems.active": "#f7768e",
   "theme.bar.menus.menu.volume.listitems.passive": "#c0caf5",
-  "theme.bar.menus.menu.volume.border.color": "#414868",
-  "theme.bar.menus.menu.volume.background.color": "#1a1b26",
+  "theme.bar.menus.menu.volume.text": "#c0caf5",
+  "theme.bar.menus.menu.volume.label.color": "#f7768e",
+  "theme.bar.menus.menu.volume.border.color": "#2f324d",
+  "theme.bar.menus.menu.volume.background.color": "#16161e",
+  "theme.bar.menus.menu.volume.card.color": "#24283b",
   "theme.bar.menus.menu.media.slider.puck": "#565f89",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#414868",
   "theme.bar.menus.menu.media.slider.background": "#565f89",
   "theme.bar.menus.menu.media.slider.primary": "#f7768e",
   "theme.bar.menus.menu.media.buttons.text": "#1a1b26",
   "theme.bar.menus.menu.media.buttons.background": "#bb9af7",
-  "theme.bar.menus.menu.media.buttons.enabled": "#73daca",
+  "theme.bar.menus.menu.media.buttons.enabled": "#1abc9c",
   "theme.bar.menus.menu.media.buttons.inactive": "#414868",
-  "theme.bar.menus.menu.media.border.color": "#414868",
-  "theme.bar.menus.menu.media.background.color": "#1a1b26",
+  "theme.bar.menus.menu.media.border.color": "#2f324d",
+  "theme.bar.menus.menu.media.card.color": "#24283b",
+  "theme.bar.menus.menu.media.background.color": "#16161e",
   "theme.bar.menus.menu.media.album": "#f7768e",
-  "theme.bar.menus.menu.media.artist": "#73daca",
+  "theme.bar.menus.menu.media.artist": "#1abc9c",
   "theme.bar.menus.menu.media.song": "#bb9af7",
   "theme.bar.menus.tooltip.text": "#c0caf5",
   "theme.bar.menus.tooltip.background": "#1a1b26",
@@ -188,6 +198,8 @@
   "theme.bar.menus.buttons.disabled": "#565f89",
   "theme.bar.menus.buttons.active": "#f7768e",
   "theme.bar.menus.buttons.default": "#bb9af7",
+  "theme.bar.menus.check_radio_button.active": "#bb9af7",
+  "theme.bar.menus.check_radio_button.background": "#3b4261",
   "theme.bar.menus.switch.puck": "#565f89",
   "theme.bar.menus.switch.disabled": "#565f89",
   "theme.bar.menus.switch.enabled": "#bb9af7",
@@ -195,32 +207,82 @@
   "theme.bar.menus.icons.passive": "#414868",
   "theme.bar.menus.listitems.active": "#bb9af7",
   "theme.bar.menus.listitems.passive": "#c0caf5",
+  "theme.bar.menus.popover.border": "#1a1b26",
+  "theme.bar.menus.popover.background": "#1a1b26",
+  "theme.bar.menus.popover.text": "#bb9af7",
   "theme.bar.menus.label": "#bb9af7",
   "theme.bar.menus.feinttext": "#414868",
   "theme.bar.menus.dimtext": "#414868",
+  "theme.bar.menus.text": "#c0caf5",
+  "theme.bar.menus.border.color": "#414868",
   "theme.bar.menus.cards": "#24283b",
-  "theme.bar.buttons.notifications.total": "#bb9af7",
+  "theme.bar.menus.background": "#1a1b26",
+  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.power.icon": "#181825",
+  "theme.bar.buttons.modules.power.background": "#272a3d",
+  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
+  "theme.bar.buttons.modules.weather.icon": "#272a3d",
+  "theme.bar.buttons.modules.weather.text": "#bb9af7",
+  "theme.bar.buttons.modules.weather.background": "#272a3d",
+  "theme.bar.buttons.modules.updates.icon_background": "#ff9e64",
+  "theme.bar.buttons.modules.updates.icon": "#181825",
+  "theme.bar.buttons.modules.updates.text": "#ff9e64",
+  "theme.bar.buttons.modules.updates.background": "#272a3d",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
+  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
+  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.icon": "#181825",
+  "theme.bar.buttons.modules.netstat.text": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.background": "#272a3d",
+  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.storage.icon": "#181825",
+  "theme.bar.buttons.modules.storage.text": "#f7768e",
+  "theme.bar.buttons.modules.storage.background": "#272a3d",
+  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.cpu.icon": "#181825",
+  "theme.bar.buttons.modules.cpu.text": "#f7768e",
+  "theme.bar.buttons.modules.cpu.background": "#272a3d",
+  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
+  "theme.bar.buttons.modules.ram.icon": "#181825",
+  "theme.bar.buttons.modules.ram.text": "#e0af68",
+  "theme.bar.buttons.modules.ram.background": "#272a3d",
+  "theme.bar.buttons.notifications.total": "#1abc9c",
+  "theme.bar.buttons.notifications.icon_background": "#1abc9c",
   "theme.bar.buttons.notifications.icon": "#272a3d",
   "theme.bar.buttons.notifications.background": "#272a3d",
+  "theme.bar.buttons.clock.icon_background": "#9d7cd8",
   "theme.bar.buttons.clock.icon": "#272a3d",
-  "theme.bar.buttons.clock.text": "#f7768e",
+  "theme.bar.buttons.clock.text": "#9d7cd8",
   "theme.bar.buttons.clock.background": "#272a3d",
+  "theme.bar.buttons.battery.icon_background": "#e0af68",
   "theme.bar.buttons.battery.icon": "#272a3d",
   "theme.bar.buttons.battery.text": "#e0af68",
   "theme.bar.buttons.battery.background": "#272a3d",
   "theme.bar.buttons.systray.background": "#272a3d",
+  "theme.bar.buttons.bluetooth.icon_background": "#7dcfff",
   "theme.bar.buttons.bluetooth.icon": "#272a3d",
   "theme.bar.buttons.bluetooth.text": "#7dcfff",
   "theme.bar.buttons.bluetooth.background": "#272a3d",
+  "theme.bar.buttons.network.icon_background": "#bb9af7",
   "theme.bar.buttons.network.icon": "#272a3d",
   "theme.bar.buttons.network.text": "#bb9af7",
   "theme.bar.buttons.network.background": "#272a3d",
+  "theme.bar.buttons.volume.icon_background": "#f7768e",
   "theme.bar.buttons.volume.icon": "#272a3d",
   "theme.bar.buttons.volume.text": "#f7768e",
   "theme.bar.buttons.volume.background": "#272a3d",
+  "theme.bar.buttons.media.icon_background": "#bb9af7",
+  "theme.bar.buttons.media.icon": "#272a3d",
+  "theme.bar.buttons.media.text": "#bb9af7",
+  "theme.bar.buttons.media.background": "#272a3d",
+  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
   "theme.bar.buttons.windowtitle.icon": "#272a3d",
   "theme.bar.buttons.windowtitle.text": "#f7768e",
   "theme.bar.buttons.windowtitle.background": "#272a3d",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
   "theme.bar.buttons.workspaces.active": "#f7768e",
   "theme.bar.buttons.workspaces.occupied": "#f7768e",
   "theme.bar.buttons.workspaces.available": "#7dcfff",
@@ -228,102 +290,40 @@
   "theme.bar.buttons.workspaces.background": "#272a3d",
   "theme.bar.buttons.dashboard.icon": "#272a3d",
   "theme.bar.buttons.dashboard.background": "#e0af68",
+  "theme.bar.buttons.icon": "#242438",
+  "theme.bar.buttons.text": "#bb9af7",
+  "theme.bar.buttons.hover": "#414868",
+  "theme.bar.buttons.icon_background": "#bb9af7",
+  "theme.bar.buttons.background": "#272a3d",
+  "theme.bar.buttons.style": "split",
+  "theme.bar.background": "#1a1b26",
   "theme.osd.label": "#bb9af7",
   "theme.osd.icon": "#1a1b26",
   "theme.osd.bar_overflow_color": "#f7768e",
   "theme.osd.bar_empty_color": "#414868",
   "theme.osd.bar_color": "#bb9af7",
   "theme.osd.icon_container": "#bb9af7",
-  "theme.osd.bar_container": "#1a1b26",
+  "theme.osd.bar_container": "#16161e",
   "theme.notification.close_button.label": "#1a1b26",
-  "theme.notification.close_button.background": "#f7768e",
-  "theme.notification.labelicon": "#bb9af7",
+  "theme.notification.close_button.background": "#41a5b5",
+  "theme.notification.labelicon": "#41a5b5",
   "theme.notification.text": "#c0caf5",
   "theme.notification.time": "#9aa5ce",
-  "theme.notification.border": "#565f89",
-  "theme.notification.label": "#bb9af7",
+  "theme.notification.border": "#2f324d",
+  "theme.notification.label": "#41a5b5",
   "theme.notification.actions.text": "#24283b",
-  "theme.notification.actions.background": "#bb9af7",
+  "theme.notification.actions.background": "#41a5b5",
   "theme.notification.background": "#1a1b26",
-  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
-  "theme.bar.menus.menu.media.card.color": "#24283b",
-  "theme.bar.menus.check_radio_button.background": "#3b4261",
-  "theme.bar.menus.check_radio_button.active": "#bb9af7",
-  "theme.bar.buttons.style": "split",
-  "theme.bar.buttons.icon_background": "#bb9af7",
-  "theme.bar.buttons.volume.icon_background": "#f7768e",
-  "theme.bar.buttons.network.icon_background": "#bb9af7",
-  "theme.bar.buttons.bluetooth.icon_background": "#7dcfff",
-  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
-  "theme.bar.buttons.media.icon_background": "#bb9af7",
-  "theme.bar.buttons.notifications.icon_background": "#bb9af7",
-  "theme.bar.buttons.battery.icon_background": "#e0af68",
-  "theme.bar.buttons.clock.icon_background": "#f7768e",
-  "theme.bar.menus.menu.notifications.pager.button": "#bb9af7",
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#bb9af7",
-  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
-  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
-  "theme.bar.buttons.modules.ram.icon": "#181825",
-  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
-  "theme.bar.menus.popover.border": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
-  "theme.bar.buttons.modules.updates.background": "#272a3d",
-  "theme.bar.buttons.modules.storage.icon": "#181825",
-  "theme.bar.buttons.modules.netstat.background": "#272a3d",
-  "theme.bar.buttons.modules.weather.icon": "#272a3d",
-  "theme.bar.buttons.modules.netstat.text": "#9ece6a",
-  "theme.bar.buttons.modules.storage.background": "#272a3d",
-  "theme.bar.buttons.modules.power.icon": "#181825",
-  "theme.bar.buttons.modules.storage.text": "#f7768e",
-  "theme.bar.buttons.modules.cpu.background": "#272a3d",
-  "theme.bar.menus.menu.power.border.color": "#414868",
-  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
-  "theme.bar.buttons.modules.cpu.icon": "#181825",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
-  "theme.bar.buttons.modules.weather.text": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
-  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
-  "theme.bar.buttons.modules.kbLayout.icon": "#181825",
-  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
-  "theme.bar.buttons.modules.ram.text": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
-  "theme.bar.buttons.modules.updates.icon_background": "#bb9af7",
-  "theme.bar.buttons.modules.kbLayout.background": "#272a3d",
-  "theme.bar.buttons.modules.power.background": "#272a3d",
-  "theme.bar.buttons.modules.weather.background": "#272a3d",
-  "theme.bar.menus.menu.power.background.color": "#1a1b26",
-  "theme.bar.buttons.modules.ram.background": "#272a3d",
-  "theme.bar.buttons.modules.netstat.icon": "#181825",
-  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.updates.text": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
-  "theme.bar.buttons.modules.updates.icon": "#181825",
-  "theme.bar.buttons.modules.cpu.text": "#f7768e",
-  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.kbLayout.text": "#7dcfff",
   "theme.bar.buttons.modules.power.border": "#f7768e",
   "theme.bar.buttons.modules.weather.border": "#bb9af7",
-  "theme.bar.buttons.modules.updates.border": "#bb9af7",
+  "theme.bar.buttons.modules.updates.border": "#ff9e64",
   "theme.bar.buttons.modules.kbLayout.border": "#7dcfff",
   "theme.bar.buttons.modules.netstat.border": "#9ece6a",
   "theme.bar.buttons.modules.storage.border": "#f7768e",
   "theme.bar.buttons.modules.cpu.border": "#f7768e",
   "theme.bar.buttons.modules.ram.border": "#e0af68",
-  "theme.bar.buttons.notifications.border": "#bb9af7",
-  "theme.bar.buttons.clock.border": "#f7768e",
+  "theme.bar.buttons.notifications.border": "#1abc9c",
+  "theme.bar.buttons.clock.border": "#9d7cd8",
   "theme.bar.buttons.battery.border": "#e0af68",
   "theme.bar.buttons.systray.border": "#414868",
   "theme.bar.buttons.bluetooth.border": "#7dcfff",
@@ -334,10 +334,10 @@
   "theme.bar.buttons.workspaces.border": "#f7768e",
   "theme.bar.buttons.dashboard.border": "#e0af68",
   "theme.bar.buttons.modules.submap.background": "#272a3d",
-  "theme.bar.buttons.modules.submap.text": "#73daca",
-  "theme.bar.buttons.modules.submap.border": "#73daca",
+  "theme.bar.buttons.modules.submap.text": "#1abc9c",
+  "theme.bar.buttons.modules.submap.border": "#1abc9c",
   "theme.bar.buttons.modules.submap.icon": "#181825",
-  "theme.bar.buttons.modules.submap.icon_background": "#73daca",
+  "theme.bar.buttons.modules.submap.icon_background": "#1abc9c",
   "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
   "theme.bar.menus.menu.network.switch.disabled": "#565f89",
   "theme.bar.menus.menu.network.switch.puck": "#565f89",
@@ -345,21 +345,44 @@
   "theme.bar.border.color": "#bb9af7",
   "theme.bar.menus.menu.media.timestamp": "#c0caf5",
   "theme.bar.buttons.borderColor": "#bb9af7",
-  "theme.bar.buttons.modules.hyprsunset.icon_background": "#e0af68",
-  "theme.bar.buttons.modules.hyprsunset.background": "#272a3d",
   "theme.bar.buttons.modules.hyprsunset.icon": "#181825",
+  "theme.bar.buttons.modules.hyprsunset.background": "#272a3d",
+  "theme.bar.buttons.modules.hyprsunset.icon_background": "#e0af68",
   "theme.bar.buttons.modules.hyprsunset.text": "#e0af68",
   "theme.bar.buttons.modules.hyprsunset.border": "#e0af68",
   "theme.bar.buttons.modules.hypridle.icon": "#181825",
   "theme.bar.buttons.modules.hypridle.background": "#272a3d",
-  "theme.bar.buttons.modules.hypridle.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.hypridle.text": "#f7768e",
-  "theme.bar.buttons.modules.hypridle.border": "#f7768e",
+  "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
+  "theme.bar.buttons.modules.hypridle.text": "#0db8d7",
+  "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
   "theme.bar.menus.menu.network.scroller.color": "#bb9af7",
   "theme.bar.menus.menu.bluetooth.scroller.color": "#7dcfff",
-  "theme.bar.buttons.modules.cava.text": "#73daca",
+  "theme.bar.buttons.notifications.hover": "#504945",
+  "theme.bar.buttons.clock.hover": "#504945",
+  "theme.bar.buttons.battery.hover": "#504945",
+  "theme.bar.buttons.systray.hover": "#504945",
+  "theme.bar.buttons.bluetooth.hover": "#504945",
+  "theme.bar.buttons.network.hover": "#504945",
+  "theme.bar.buttons.volume.hover": "#504945",
+  "theme.bar.buttons.media.hover": "#504945",
+  "theme.bar.buttons.windowtitle.hover": "#504945",
+  "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+  "theme.bar.buttons.dashboard.hover": "#504945",
+  "theme.bar.menus.menu.power.card.color": "#2a283e",
+  "theme.bar.buttons.modules.cpu.hover": "#45475a",
+  "theme.bar.buttons.volume.output_icon": "#11111b",
+  "theme.bar.buttons.volume.output_text": "#eba0ac",
+  "theme.bar.buttons.volume.input_icon": "#11111b",
+  "theme.bar.buttons.volume.input_text": "#eba0ac",
+  "theme.bar.buttons.volume.separator": "#45475a",
+  "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.icon": "#181824",
+  "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+  "theme.osd.border.color": "#8ff0a4",
+  "theme.bar.buttons.modules.cava.text": "#1abc9c",
   "theme.bar.buttons.modules.cava.background": "#272a3d",
+  "theme.bar.buttons.modules.cava.icon_background": "#1abc9c",
   "theme.bar.buttons.modules.cava.icon": "#181825",
-  "theme.bar.buttons.modules.cava.icon_background": "#73daca",
-  "theme.bar.buttons.modules.cava.border": "#73daca"
+  "theme.bar.buttons.modules.cava.border": "#1abc9c"
 }
\ No newline at end of file
diff --git a/themes/tokyo_night_vivid.json b/themes/tokyo_night_vivid.json
index 3a6a320..3fdcf76 100644
--- a/themes/tokyo_night_vivid.json
+++ b/themes/tokyo_night_vivid.json
@@ -1,39 +1,36 @@
 {
-  "theme.bar.menus.background": "#1a1b26",
-  "theme.bar.background": "#1a1b26",
-  "theme.bar.buttons.media.icon": "#272a3d",
-  "theme.bar.buttons.media.text": "#272a3d",
-  "theme.bar.buttons.icon": "#bb9af7",
-  "theme.bar.buttons.text": "#bb9af7",
-  "theme.bar.buttons.hover": "#414868",
-  "theme.bar.buttons.background": "#272a3d",
-  "theme.bar.menus.text": "#c0caf5",
-  "theme.bar.menus.border.color": "#414868",
-  "theme.bar.buttons.media.background": "#bb9af7",
-  "theme.bar.menus.menu.volume.text": "#c0caf5",
-  "theme.bar.menus.menu.volume.card.color": "#24283b",
-  "theme.bar.menus.menu.volume.label.color": "#f7768e",
-  "theme.bar.menus.popover.text": "#bb9af7",
-  "theme.bar.menus.popover.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
-  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
+  "theme.bar.menus.menu.notifications.scrollbar.color": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
+  "theme.bar.menus.menu.notifications.pager.button": "#1abc9c",
+  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
   "theme.bar.menus.menu.notifications.switch.puck": "#565f89",
   "theme.bar.menus.menu.notifications.switch.disabled": "#565f89",
-  "theme.bar.menus.menu.notifications.switch.enabled": "#bb9af7",
-  "theme.bar.menus.menu.notifications.clear": "#f7768e",
+  "theme.bar.menus.menu.notifications.switch.enabled": "#1abc9c",
+  "theme.bar.menus.menu.notifications.clear": "#1abc9c",
   "theme.bar.menus.menu.notifications.switch_divider": "#414868",
-  "theme.bar.menus.menu.notifications.border": "#414868",
+  "theme.bar.menus.menu.notifications.border": "#2f324d",
   "theme.bar.menus.menu.notifications.card": "#24283b",
-  "theme.bar.menus.menu.notifications.background": "#1a1b26",
+  "theme.bar.menus.menu.notifications.background": "#16161e",
   "theme.bar.menus.menu.notifications.no_notifications_label": "#414868",
-  "theme.bar.menus.menu.notifications.label": "#bb9af7",
+  "theme.bar.menus.menu.notifications.label": "#1abc9c",
+  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
+  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
+  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
+  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
+  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
+  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
+  "theme.bar.menus.menu.power.border.color": "#2f324d",
+  "theme.bar.menus.menu.power.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.monitors.disk.label": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.bar": "#f7768e",
   "theme.bar.menus.menu.dashboard.monitors.disk.icon": "#f7768e",
@@ -49,7 +46,7 @@
   "theme.bar.menus.menu.dashboard.monitors.bar_background": "#414868",
   "theme.bar.menus.menu.dashboard.directories.right.bottom.color": "#bb9af7",
   "theme.bar.menus.menu.dashboard.directories.right.middle.color": "#bb9af7",
-  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#73daca",
+  "theme.bar.menus.menu.dashboard.directories.right.top.color": "#1abc9c",
   "theme.bar.menus.menu.dashboard.directories.left.bottom.color": "#f7768e",
   "theme.bar.menus.menu.dashboard.directories.left.middle.color": "#e0af68",
   "theme.bar.menus.menu.dashboard.directories.left.top.color": "#f7768e",
@@ -67,36 +64,45 @@
   "theme.bar.menus.menu.dashboard.shortcuts.recording": "#9ece6a",
   "theme.bar.menus.menu.dashboard.shortcuts.text": "#1a1b26",
   "theme.bar.menus.menu.dashboard.shortcuts.background": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.button_text": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.deny": "#f7768e",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.confirm": "#9ece6a",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.body": "#c0caf5",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.label": "#bb9af7",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.border": "#414868",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.background": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.powermenu.confirmation.card": "#24283b",
   "theme.bar.menus.menu.dashboard.powermenu.sleep": "#7dcfff",
   "theme.bar.menus.menu.dashboard.powermenu.logout": "#9ece6a",
   "theme.bar.menus.menu.dashboard.powermenu.restart": "#e0af68",
+  "theme.bar.menus.menu.dashboard.powermenu.shutdown": "#f7768e",
   "theme.bar.menus.menu.dashboard.profile.name": "#f7768e",
-  "theme.bar.menus.menu.dashboard.border.color": "#414868",
-  "theme.bar.menus.menu.dashboard.background.color": "#1a1b26",
+  "theme.bar.menus.menu.dashboard.border.color": "#2f324d",
+  "theme.bar.menus.menu.dashboard.background.color": "#16161e",
   "theme.bar.menus.menu.dashboard.card.color": "#24283b",
-  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.icon": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.hourly.time": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.hourly.temperature": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.icon": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.hourly.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.weather.thermometer.extremelycold": "#7dcfff",
   "theme.bar.menus.menu.clock.weather.thermometer.cold": "#7aa2f7",
   "theme.bar.menus.menu.clock.weather.thermometer.moderate": "#bb9af7",
   "theme.bar.menus.menu.clock.weather.thermometer.hot": "#e0af68",
-  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.stats": "#f7768e",
-  "theme.bar.menus.menu.clock.weather.status": "#73daca",
+  "theme.bar.menus.menu.clock.weather.thermometer.extremelyhot": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.stats": "#9d7cd8",
+  "theme.bar.menus.menu.clock.weather.status": "#1abc9c",
   "theme.bar.menus.menu.clock.weather.temperature": "#c0caf5",
-  "theme.bar.menus.menu.clock.weather.icon": "#f7768e",
+  "theme.bar.menus.menu.clock.weather.icon": "#9d7cd8",
   "theme.bar.menus.menu.clock.calendar.contextdays": "#414868",
   "theme.bar.menus.menu.clock.calendar.days": "#c0caf5",
-  "theme.bar.menus.menu.clock.calendar.currentday": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.paginator": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.weekdays": "#f7768e",
-  "theme.bar.menus.menu.clock.calendar.yearmonth": "#73daca",
-  "theme.bar.menus.menu.clock.time.timeperiod": "#73daca",
-  "theme.bar.menus.menu.clock.time.time": "#f7768e",
+  "theme.bar.menus.menu.clock.calendar.currentday": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.paginator": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.weekdays": "#9d7cd8",
+  "theme.bar.menus.menu.clock.calendar.yearmonth": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.timeperiod": "#1abc9c",
+  "theme.bar.menus.menu.clock.time.time": "#9d7cd8",
   "theme.bar.menus.menu.clock.text": "#c0caf5",
-  "theme.bar.menus.menu.clock.border.color": "#414868",
-  "theme.bar.menus.menu.clock.background.color": "#1a1b26",
+  "theme.bar.menus.menu.clock.border.color": "#2f324d",
+  "theme.bar.menus.menu.clock.background.color": "#16161e",
   "theme.bar.menus.menu.clock.card.color": "#24283b",
   "theme.bar.menus.menu.battery.slider.puck": "#565f89",
   "theme.bar.menus.menu.battery.slider.backgroundhover": "#414868",
@@ -108,8 +114,8 @@
   "theme.bar.menus.menu.battery.listitems.passive": "#c0caf5",
   "theme.bar.menus.menu.battery.text": "#c0caf5",
   "theme.bar.menus.menu.battery.label.color": "#e0af68",
-  "theme.bar.menus.menu.battery.border.color": "#414868",
-  "theme.bar.menus.menu.battery.background.color": "#1a1b26",
+  "theme.bar.menus.menu.battery.border.color": "#2f324d",
+  "theme.bar.menus.menu.battery.background.color": "#16161e",
   "theme.bar.menus.menu.battery.card.color": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.divider": "#24283b",
   "theme.bar.menus.menu.systray.dropdownmenu.text": "#c0caf5",
@@ -127,8 +133,8 @@
   "theme.bar.menus.menu.bluetooth.status": "#565f89",
   "theme.bar.menus.menu.bluetooth.text": "#c0caf5",
   "theme.bar.menus.menu.bluetooth.label.color": "#7dcfff",
-  "theme.bar.menus.menu.bluetooth.border.color": "#414868",
-  "theme.bar.menus.menu.bluetooth.background.color": "#1a1b26",
+  "theme.bar.menus.menu.bluetooth.border.color": "#2f324d",
+  "theme.bar.menus.menu.bluetooth.background.color": "#16161e",
   "theme.bar.menus.menu.bluetooth.card.color": "#24283b",
   "theme.bar.menus.menu.network.iconbuttons.active": "#bb9af7",
   "theme.bar.menus.menu.network.iconbuttons.passive": "#c0caf5",
@@ -139,8 +145,8 @@
   "theme.bar.menus.menu.network.status.color": "#565f89",
   "theme.bar.menus.menu.network.text": "#c0caf5",
   "theme.bar.menus.menu.network.label.color": "#bb9af7",
-  "theme.bar.menus.menu.network.border.color": "#414868",
-  "theme.bar.menus.menu.network.background.color": "#1a1b26",
+  "theme.bar.menus.menu.network.border.color": "#2f324d",
+  "theme.bar.menus.menu.network.background.color": "#16161e",
   "theme.bar.menus.menu.network.card.color": "#24283b",
   "theme.bar.menus.menu.volume.input_slider.puck": "#414868",
   "theme.bar.menus.menu.volume.input_slider.backgroundhover": "#414868",
@@ -156,20 +162,24 @@
   "theme.bar.menus.menu.volume.iconbutton.passive": "#c0caf5",
   "theme.bar.menus.menu.volume.listitems.active": "#f7768e",
   "theme.bar.menus.menu.volume.listitems.passive": "#c0caf5",
-  "theme.bar.menus.menu.volume.border.color": "#414868",
-  "theme.bar.menus.menu.volume.background.color": "#1a1b26",
+  "theme.bar.menus.menu.volume.text": "#c0caf5",
+  "theme.bar.menus.menu.volume.label.color": "#f7768e",
+  "theme.bar.menus.menu.volume.border.color": "#2f324d",
+  "theme.bar.menus.menu.volume.background.color": "#16161e",
+  "theme.bar.menus.menu.volume.card.color": "#24283b",
   "theme.bar.menus.menu.media.slider.puck": "#565f89",
   "theme.bar.menus.menu.media.slider.backgroundhover": "#414868",
   "theme.bar.menus.menu.media.slider.background": "#565f89",
   "theme.bar.menus.menu.media.slider.primary": "#f7768e",
   "theme.bar.menus.menu.media.buttons.text": "#1a1b26",
   "theme.bar.menus.menu.media.buttons.background": "#bb9af7",
-  "theme.bar.menus.menu.media.buttons.enabled": "#73daca",
+  "theme.bar.menus.menu.media.buttons.enabled": "#1abc9c",
   "theme.bar.menus.menu.media.buttons.inactive": "#414868",
-  "theme.bar.menus.menu.media.border.color": "#414868",
-  "theme.bar.menus.menu.media.background.color": "#1a1b26",
+  "theme.bar.menus.menu.media.border.color": "#2f324d",
+  "theme.bar.menus.menu.media.card.color": "#24283b",
+  "theme.bar.menus.menu.media.background.color": "#16161e",
   "theme.bar.menus.menu.media.album": "#f7768e",
-  "theme.bar.menus.menu.media.artist": "#73daca",
+  "theme.bar.menus.menu.media.artist": "#1abc9c",
   "theme.bar.menus.menu.media.song": "#bb9af7",
   "theme.bar.menus.tooltip.text": "#c0caf5",
   "theme.bar.menus.tooltip.background": "#1a1b26",
@@ -188,6 +198,8 @@
   "theme.bar.menus.buttons.disabled": "#565f89",
   "theme.bar.menus.buttons.active": "#f7768e",
   "theme.bar.menus.buttons.default": "#bb9af7",
+  "theme.bar.menus.check_radio_button.active": "#bb9af7",
+  "theme.bar.menus.check_radio_button.background": "#3b4261",
   "theme.bar.menus.switch.puck": "#565f89",
   "theme.bar.menus.switch.disabled": "#565f89",
   "theme.bar.menus.switch.enabled": "#bb9af7",
@@ -195,135 +207,123 @@
   "theme.bar.menus.icons.passive": "#414868",
   "theme.bar.menus.listitems.active": "#bb9af7",
   "theme.bar.menus.listitems.passive": "#c0caf5",
+  "theme.bar.menus.popover.border": "#1a1b26",
+  "theme.bar.menus.popover.background": "#1a1b26",
+  "theme.bar.menus.popover.text": "#bb9af7",
   "theme.bar.menus.label": "#bb9af7",
   "theme.bar.menus.feinttext": "#414868",
   "theme.bar.menus.dimtext": "#414868",
+  "theme.bar.menus.text": "#c0caf5",
+  "theme.bar.menus.border.color": "#414868",
   "theme.bar.menus.cards": "#24283b",
+  "theme.bar.menus.background": "#1a1b26",
+  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.power.icon": "#181825",
+  "theme.bar.buttons.modules.power.background": "#272a3d",
+  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
+  "theme.bar.buttons.modules.weather.icon": "#272a3d",
+  "theme.bar.buttons.modules.weather.text": "#272a3d",
+  "theme.bar.buttons.modules.weather.background": "#bb9af7",
+  "theme.bar.buttons.modules.updates.icon_background": "#ff9e64",
+  "theme.bar.buttons.modules.updates.icon": "#272a3d",
+  "theme.bar.buttons.modules.updates.text": "#272a3d",
+  "theme.bar.buttons.modules.updates.background": "#ff9e64",
+  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
+  "theme.bar.buttons.modules.kbLayout.icon": "#272a3d",
+  "theme.bar.buttons.modules.kbLayout.text": "#272a3d",
+  "theme.bar.buttons.modules.kbLayout.background": "#7dcfff",
+  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
+  "theme.bar.buttons.modules.netstat.icon": "#272a3d",
+  "theme.bar.buttons.modules.netstat.text": "#272a3d",
+  "theme.bar.buttons.modules.netstat.background": "#9ece6a",
+  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.storage.icon": "#272a3d",
+  "theme.bar.buttons.modules.storage.text": "#272a3d",
+  "theme.bar.buttons.modules.storage.background": "#f7768e",
+  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.cpu.icon": "#272a3d",
+  "theme.bar.buttons.modules.cpu.text": "#272a3d",
+  "theme.bar.buttons.modules.cpu.background": "#f7768e",
+  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
+  "theme.bar.buttons.modules.ram.icon": "#272a3d",
+  "theme.bar.buttons.modules.ram.text": "#272a3d",
+  "theme.bar.buttons.modules.ram.background": "#e0af68",
   "theme.bar.buttons.notifications.total": "#272a3d",
+  "theme.bar.buttons.notifications.icon_background": "#1abc9c",
   "theme.bar.buttons.notifications.icon": "#272a3d",
-  "theme.bar.buttons.notifications.background": "#bb9af7",
+  "theme.bar.buttons.notifications.background": "#1abc9c",
+  "theme.bar.buttons.clock.icon_background": "#9d7cd8",
   "theme.bar.buttons.clock.icon": "#272a3d",
   "theme.bar.buttons.clock.text": "#272a3d",
-  "theme.bar.buttons.clock.background": "#f7768e",
+  "theme.bar.buttons.clock.background": "#9d7cd8",
+  "theme.bar.buttons.battery.icon_background": "#e0af68",
   "theme.bar.buttons.battery.icon": "#272a3d",
   "theme.bar.buttons.battery.text": "#272a3d",
   "theme.bar.buttons.battery.background": "#e0af68",
   "theme.bar.buttons.systray.background": "#272a3d",
+  "theme.bar.buttons.bluetooth.icon_background": "#7dcfff",
   "theme.bar.buttons.bluetooth.icon": "#272a3d",
   "theme.bar.buttons.bluetooth.text": "#272a3d",
   "theme.bar.buttons.bluetooth.background": "#7dcfff",
+  "theme.bar.buttons.network.icon_background": "#bb9af7",
   "theme.bar.buttons.network.icon": "#272a3d",
   "theme.bar.buttons.network.text": "#272a3d",
   "theme.bar.buttons.network.background": "#bb9af7",
+  "theme.bar.buttons.volume.icon_background": "#f7768e",
   "theme.bar.buttons.volume.icon": "#272a3d",
   "theme.bar.buttons.volume.text": "#272a3d",
   "theme.bar.buttons.volume.background": "#f7768e",
+  "theme.bar.buttons.media.icon_background": "#bb9af7",
+  "theme.bar.buttons.media.icon": "#272a3d",
+  "theme.bar.buttons.media.text": "#272a3d",
+  "theme.bar.buttons.media.background": "#bb9af7",
+  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
   "theme.bar.buttons.windowtitle.icon": "#272a3d",
   "theme.bar.buttons.windowtitle.text": "#272a3d",
   "theme.bar.buttons.windowtitle.background": "#f7768e",
+  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
+  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
   "theme.bar.buttons.workspaces.active": "#f7768e",
   "theme.bar.buttons.workspaces.occupied": "#f7768e",
   "theme.bar.buttons.workspaces.available": "#7dcfff",
-  "theme.bar.buttons.workspaces.hover": "#414868",
+  "theme.bar.buttons.workspaces.hover": "#f7768e",
   "theme.bar.buttons.workspaces.background": "#272a3d",
   "theme.bar.buttons.dashboard.icon": "#272a3d",
   "theme.bar.buttons.dashboard.background": "#e0af68",
+  "theme.bar.buttons.icon": "#242438",
+  "theme.bar.buttons.text": "#bb9af7",
+  "theme.bar.buttons.hover": "#414868",
+  "theme.bar.buttons.icon_background": "#bb9af7",
+  "theme.bar.buttons.background": "#272a3d",
+  "theme.bar.buttons.style": "default",
+  "theme.bar.background": "#1a1b26",
   "theme.osd.label": "#bb9af7",
   "theme.osd.icon": "#1a1b26",
   "theme.osd.bar_overflow_color": "#f7768e",
   "theme.osd.bar_empty_color": "#414868",
   "theme.osd.bar_color": "#bb9af7",
   "theme.osd.icon_container": "#bb9af7",
-  "theme.osd.bar_container": "#1a1b26",
+  "theme.osd.bar_container": "#16161e",
   "theme.notification.close_button.label": "#1a1b26",
-  "theme.notification.close_button.background": "#f7768e",
-  "theme.notification.labelicon": "#bb9af7",
+  "theme.notification.close_button.background": "#41a5b5",
+  "theme.notification.labelicon": "#41a5b5",
   "theme.notification.text": "#c0caf5",
   "theme.notification.time": "#9aa5ce",
-  "theme.notification.border": "#565f89",
-  "theme.notification.label": "#bb9af7",
+  "theme.notification.border": "#2f324d",
+  "theme.notification.label": "#41a5b5",
   "theme.notification.actions.text": "#24283b",
-  "theme.notification.actions.background": "#bb9af7",
+  "theme.notification.actions.background": "#41a5b5",
   "theme.notification.background": "#1a1b26",
-  "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color": "#181825",
-  "theme.bar.buttons.workspaces.numbered_active_underline_color": "#c678dd",
-  "theme.bar.menus.menu.media.card.color": "#24283b",
-  "theme.bar.menus.check_radio_button.background": "#3b4261",
-  "theme.bar.menus.check_radio_button.active": "#bb9af7",
-  "theme.bar.buttons.style": "default",
-  "theme.bar.menus.menu.notifications.pager.button": "#bb9af7",
-  "theme.bar.menus.menu.notifications.scrollbar.color": "#bb9af7",
-  "theme.bar.menus.menu.notifications.pager.label": "#565f89",
-  "theme.bar.menus.menu.notifications.pager.background": "#1a1b26",
-  "theme.bar.buttons.clock.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.ram.icon": "#272a3d",
-  "theme.bar.buttons.modules.storage.icon_background": "#f7768e",
-  "theme.bar.menus.popover.border": "#1a1b26",
-  "theme.bar.buttons.volume.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.sleep.icon_background": "#7dcfff",
-  "theme.bar.menus.menu.power.buttons.restart.text": "#e0af68",
-  "theme.bar.buttons.modules.updates.background": "#bb9af7",
-  "theme.bar.buttons.modules.storage.icon": "#272a3d",
-  "theme.bar.buttons.modules.netstat.background": "#9ece6a",
-  "theme.bar.buttons.modules.weather.icon": "#272a3d",
-  "theme.bar.buttons.modules.netstat.text": "#272a3d",
-  "theme.bar.buttons.modules.storage.background": "#f7768e",
-  "theme.bar.buttons.modules.power.icon": "#272a3d",
-  "theme.bar.buttons.modules.storage.text": "#272a3d",
-  "theme.bar.buttons.modules.cpu.background": "#f7768e",
-  "theme.bar.menus.menu.power.border.color": "#414868",
-  "theme.bar.buttons.network.icon_background": "#caa6f7",
-  "theme.bar.buttons.modules.power.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.restart.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.restart.icon": "#1a1b26",
-  "theme.bar.buttons.modules.cpu.icon": "#272a3d",
-  "theme.bar.buttons.battery.icon_background": "#e0af68",
-  "theme.bar.buttons.modules.kbLayout.icon_background": "#7dcfff",
-  "theme.bar.buttons.modules.weather.text": "#272a3d",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon": "#1a1b26",
-  "theme.bar.menus.menu.power.buttons.sleep.text": "#7dcfff",
-  "theme.bar.buttons.modules.weather.icon_background": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.shutdown.background": "#24283b",
-  "theme.bar.buttons.media.icon_background": "#bb9af7",
-  "theme.bar.menus.menu.power.buttons.logout.background": "#24283b",
-  "theme.bar.buttons.modules.kbLayout.icon": "#272a3d",
-  "theme.bar.buttons.modules.ram.icon_background": "#e0af68",
-  "theme.bar.menus.menu.power.buttons.shutdown.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.shutdown.text": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.sleep.background": "#24283b",
-  "theme.bar.buttons.modules.ram.text": "#272a3d",
-  "theme.bar.menus.menu.power.buttons.logout.text": "#9ece6a",
-  "theme.bar.buttons.modules.updates.icon_background": "#bb9af7",
-  "theme.bar.buttons.modules.kbLayout.background": "#7dcfff",
-  "theme.bar.buttons.modules.power.background": "#f7768e",
-  "theme.bar.buttons.modules.weather.background": "#bb9af7",
-  "theme.bar.buttons.icon_background": "#272a3d",
-  "theme.bar.menus.menu.power.background.color": "#1a1b26",
-  "theme.bar.buttons.modules.ram.background": "#e0af68",
-  "theme.bar.buttons.modules.netstat.icon": "#272a3d",
-  "theme.bar.buttons.windowtitle.icon_background": "#f7768e",
-  "theme.bar.buttons.modules.cpu.icon_background": "#f7768e",
-  "theme.bar.menus.menu.power.buttons.logout.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.updates.text": "#272a3d",
-  "theme.bar.menus.menu.power.buttons.sleep.icon": "#1a1b26",
-  "theme.bar.buttons.bluetooth.icon_background": "#89dbeb",
-  "theme.bar.menus.menu.power.buttons.restart.background": "#24283b",
-  "theme.bar.buttons.modules.updates.icon": "#272a3d",
-  "theme.bar.buttons.modules.cpu.text": "#272a3d",
-  "theme.bar.buttons.modules.netstat.icon_background": "#9ece6a",
-  "theme.bar.buttons.modules.kbLayout.text": "#272a3d",
-  "theme.bar.buttons.notifications.icon_background": "#bb9af7",
   "theme.bar.buttons.modules.power.border": "#f7768e",
   "theme.bar.buttons.modules.weather.border": "#bb9af7",
-  "theme.bar.buttons.modules.updates.border": "#bb9af7",
+  "theme.bar.buttons.modules.updates.border": "#ff9e64",
   "theme.bar.buttons.modules.kbLayout.border": "#7dcfff",
   "theme.bar.buttons.modules.netstat.border": "#9ece6a",
   "theme.bar.buttons.modules.storage.border": "#f7768e",
   "theme.bar.buttons.modules.cpu.border": "#f7768e",
   "theme.bar.buttons.modules.ram.border": "#e0af68",
-  "theme.bar.buttons.notifications.border": "#bb9af7",
-  "theme.bar.buttons.clock.border": "#f7768e",
+  "theme.bar.buttons.notifications.border": "#1abc9c",
+  "theme.bar.buttons.clock.border": "#9d7cd8",
   "theme.bar.buttons.battery.border": "#e0af68",
   "theme.bar.buttons.systray.border": "#414868",
   "theme.bar.buttons.bluetooth.border": "#7dcfff",
@@ -333,33 +333,56 @@
   "theme.bar.buttons.windowtitle.border": "#f7768e",
   "theme.bar.buttons.workspaces.border": "#f7768e",
   "theme.bar.buttons.dashboard.border": "#e0af68",
-  "theme.bar.buttons.modules.submap.background": "#73daca",
+  "theme.bar.buttons.modules.submap.background": "#1abc9c",
   "theme.bar.buttons.modules.submap.text": "#272a3d",
-  "theme.bar.buttons.modules.submap.border": "#73daca",
+  "theme.bar.buttons.modules.submap.border": "#1abc9c",
   "theme.bar.buttons.modules.submap.icon": "#272a3d",
-  "theme.bar.buttons.modules.submap.icon_background": "#272a3d",
-  "theme.bar.menus.menu.network.switch.puck": "#565f89",
-  "theme.bar.menus.menu.network.switch.disabled": "#565f89",
+  "theme.bar.buttons.modules.submap.icon_background": "#1abc9c",
   "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
+  "theme.bar.menus.menu.network.switch.disabled": "#565f89",
+  "theme.bar.menus.menu.network.switch.puck": "#565f89",
   "theme.bar.buttons.systray.customIcon": "#c0caf5",
   "theme.bar.border.color": "#bb9af7",
   "theme.bar.menus.menu.media.timestamp": "#c0caf5",
   "theme.bar.buttons.borderColor": "#bb9af7",
   "theme.bar.buttons.modules.hyprsunset.icon": "#272a3d",
-  "theme.bar.buttons.modules.hyprsunset.background": "#f7768e",
-  "theme.bar.buttons.modules.hyprsunset.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.hyprsunset.background": "#e0af68",
+  "theme.bar.buttons.modules.hyprsunset.icon_background": "#e0af68",
   "theme.bar.buttons.modules.hyprsunset.text": "#272a3d",
-  "theme.bar.buttons.modules.hyprsunset.border": "#f7768e",
+  "theme.bar.buttons.modules.hyprsunset.border": "#e0af68",
   "theme.bar.buttons.modules.hypridle.icon": "#272a3d",
-  "theme.bar.buttons.modules.hypridle.background": "#f7768e",
-  "theme.bar.buttons.modules.hypridle.icon_background": "#f7768e",
+  "theme.bar.buttons.modules.hypridle.background": "#0db8d7",
+  "theme.bar.buttons.modules.hypridle.icon_background": "#0db8d7",
   "theme.bar.buttons.modules.hypridle.text": "#272a3d",
-  "theme.bar.buttons.modules.hypridle.border": "#f7768e",
+  "theme.bar.buttons.modules.hypridle.border": "#0db8d7",
   "theme.bar.menus.menu.network.scroller.color": "#bb9af7",
   "theme.bar.menus.menu.bluetooth.scroller.color": "#7dcfff",
-  "theme.bar.buttons.modules.cava.background": "#73daca",
+  "theme.bar.buttons.notifications.hover": "#504945",
+  "theme.bar.buttons.clock.hover": "#504945",
+  "theme.bar.buttons.battery.hover": "#504945",
+  "theme.bar.buttons.systray.hover": "#504945",
+  "theme.bar.buttons.bluetooth.hover": "#504945",
+  "theme.bar.buttons.network.hover": "#504945",
+  "theme.bar.buttons.volume.hover": "#504945",
+  "theme.bar.buttons.media.hover": "#504945",
+  "theme.bar.buttons.windowtitle.hover": "#504945",
+  "theme.bar.buttons.workspaces.numbered_active_text_color": "#24283b",
+  "theme.bar.buttons.dashboard.hover": "#504945",
+  "theme.bar.menus.menu.power.card.color": "#2a283e",
+  "theme.bar.buttons.modules.cpu.hover": "#45475a",
+  "theme.bar.buttons.volume.output_icon": "#11111b",
+  "theme.bar.buttons.volume.output_text": "#eba0ac",
+  "theme.bar.buttons.volume.input_icon": "#11111b",
+  "theme.bar.buttons.volume.input_text": "#eba0ac",
+  "theme.bar.buttons.volume.separator": "#45475a",
+  "theme.bar.buttons.modules.cpuTemp.icon_background": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.icon": "#181824",
+  "theme.bar.buttons.modules.cpuTemp.text": "#fab387",
+  "theme.bar.buttons.modules.cpuTemp.border": "#fab387",
+  "theme.osd.border.color": "#8ff0a4",
   "theme.bar.buttons.modules.cava.text": "#272a3d",
+  "theme.bar.buttons.modules.cava.background": "#1abc9c",
+  "theme.bar.buttons.modules.cava.icon_background": "#1abc9c",
   "theme.bar.buttons.modules.cava.icon": "#272a3d",
-  "theme.bar.buttons.modules.cava.icon_background": "#272a3d",
-  "theme.bar.buttons.modules.cava.border": "#73daca"
+  "theme.bar.buttons.modules.cava.border": "#1abc9c"
 }
\ No newline at end of file