diff --git a/README.md b/README.md
index e7e3dee..371a79a 100644
--- a/README.md
+++ b/README.md
@@ -36,85 +36,52 @@
 
 ## Usage
 
-### COSMIC Desktop Appearance
-
-1. Clone this repository locally
+Clone this repository locally:
 
 ```bash
 git clone https://github.com/catppuccin/cosmic-desktop.git
 ```
 
-2. Open COSMIC Settings and navigate to `Desktop -> Appearance`
-3. Click `Import` and browse to where you cloned this repository
-4. Select the desired theme under `cosmic-settings`
+Follow the instructions below to apply the theme to your desktop and terminal.
 
-### COSMIC Terminal Color Scheme
+### COSMIC Desktop Appearance
 
-1. Clone this repository locally
-2. Open COSMIC Terminal and navigate to `View -> Color schemes...`
-3. Click `Import` and browse to where you cloned this repository
-4. Select the desired theme under `cosmic-term`
+1. Open COSMIC Settings and navigate to `Desktop -> Appearance`.
+2. Click `Import` and browse to where you cloned this repository.
+3. Select your desired theme from the [themes/cosmic-settings](./themes/cosmic-settings) directory.
 
-### Generating Custom Configs
+### COSMIC Terminal Color Scheme
 
-`generate.py` allows you to generate custom configs for COSMIC Desktop.
-You can use this script to generate a custom config with your preferred colors and other settings.
+1. Open COSMIC Terminal and navigate to `View -> Color schemes...`.
+2. Click `Import` and browse to where you cloned this repository.
+3. Select your desired theme from the [themes/cosmic-term](./themes/cosmic-term) directory.
 
-1. To use the script, you need to have `python` and `pip` installed on your system.
-2. Clone this repository locally and cd into it
+### Generating Custom Configurations
 
-```bash
-git clone https://github.com/catppuccin/cosmic-desktop.git
-cd cosmic-desktop
-```
+The themes included in this repository are generated via [catppuccin/whiskers](https://github.com/catppuccin/whiskers). 
+To learn how to modify the generated themes, follow the instructions listed below:
 
-3. Create a virtual environment and install the required dependencies
+1. Install [catppuccin/whiskers](https://github.com/catppuccin/whiskers#installation).
+2. Navigate to the root of this respository.
+3. Run `whiskers` with `--overrides` set to a JSON object with your desired options, for example:
 
-```bash
-python -m venv .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-```
+    ```bash
+    whiskers templates/cosmic-settings.tera --overrides='{"roundness": "square", "window_hint_color": "peach", "bg_alpha": 0.8}'
+    ```
 
-4. Run the script with your desired options
+#### Available Settings
 
-```bash
-$ python generate.py --help
-usage: generate.py [-h] [--accent [accent color]]
-                   [--bg-alpha [background alpha]] [--frosted frosted effect]
-                   [--outer-gap [outer gap size]]
-                   [--inner-gap [inner gap size]]
-                   [--active-hint [active hint size]]
-                   [--roundness [roundness]]
-                   [--window-hint-color [window hint color]]
-                   [theme flavor]
-
-Generate a Catppuccin theme for Cosmic Desktop
-
-positional arguments:
-  theme flavor          The flavor of the theme to generate. Can be 'mocha',
-                        'frappe', 'macchiato', or 'latte'.
-
-options:
-  -h, --help            show this help message and exit
-  --accent [accent color], -a [accent color]
-                        The accent color to use for the theme.
-  --bg-alpha [background alpha], -b [background alpha]
-                        The alpha value of the background color.
-  --frosted frosted effect, -f frosted effect
-                        Whether to use frosted glass effect for the theme.
-  --outer-gap [outer gap size], -o [outer gap size]
-                        The size of the outer gap.
-  --inner-gap [inner gap size], -i [inner gap size]
-                        The size of the inner gap.
-  --active-hint [active hint size], -ah [active hint size]
-                        The size of the active hint.
-  --roundness [roundness], -r [roundness]
-                        The roundness of the corners. Can be 'round',
-                        'slightly round', or 'square'.
-  --window-hint-color [window hint color], -whc [window hint color]
-                        The color of the window hint.
-```
+- `accent`: The primary/accent color. May be any of the Catppuccin palette color names, or a list of color names. Defaults to rendering a version of the theme for every palette accent color.
+- `roundness`: The roundness of the corners. Can be `round`, `slightlyround`, or `square`. Defaults to `round`.
+- `window_hint_color`: The color of the window hint. May be any of the Catppuccin palette color names. Defaults to matching the accent color.
+- `bg_alpha`: The alpha value (opacity) of the window background color. Must be a float between `0.0` and `1.0`. Defaults to `1.0`.
+- `frosted`: Enables blurred transparency. Must be a boolean. Defaults to `false`.
+- `outer_gap_size`: Compositor outer gap size. Must be an integer. Defaults to `0`.
+- `inner_gap_size`: Compositor inner gap size. Must be an integer. Defaults to `8`.
+- `active_hint_size`: Compositor active window hint outline width. Must be an integer. Defaults to `3`.
+
+You can also use `whiskers` with `--flavor` to only render a single flavor (`latte`, `frappe`, `macchiato`, `mocha`).
+By default, a version of the theme for all 4 flavors will be rendered.
 
 ## 💝 Thanks to
 
diff --git a/cosmic-term.py b/cosmic-term.py
deleted file mode 100644
index f2d0991..0000000
--- a/cosmic-term.py
+++ /dev/null
@@ -1,87 +0,0 @@
-from catppuccin import PALETTE
-
-flavors = ["mocha", "frappe", "macchiato", "latte"]
-
-
-def generate_color_scheme(flavor):
-    color_map = {
-        "foreground": "text",
-        "cursor": "rosewater",
-        "bright_foreground": "text",
-        "dim_foreground": "overlay 0",
-        "black": "subtext 1" if flavor == "latte" else "surface 1",
-        "red": "red",
-        "green": "green",
-        "yellow": "yellow",
-        "blue": "blue",
-        "magenta": "pink",
-        "cyan": "teal",
-        "white": "surface 2" if flavor == "latte" else "subtext 1",
-        "bright-black": "subtext 0" if flavor == "latte" else "surface 2",
-        "bright-red": "red",
-        "bright-green": "green",
-        "bright-yellow": "yellow",
-        "bright-blue": "blue",
-        "bright-magenta": "pink",
-        "bright-cyan": "teal",
-        "bright-white": "surface 1" if flavor == "latte" else "subtext 0",
-        "dim-black": "subtext 1" if flavor == "latte" else "surface 1",
-        "dim-red": "red",
-        "dim-green": "green",
-        "dim-yellow": "yellow",
-        "dim-blue": "blue",
-        "dim-magenta": "pink",
-        "dim-cyan": "teal",
-        "dim-white": "surface 2" if flavor == "latte" else "subtext 1",
-    }
-
-    catppuccin_colors = {}
-    for color in eval(f"PALETTE.{flavor}.colors"):
-        catppuccin_colors[color.name.lower()] = color
-
-    def get_color(name):
-        return catppuccin_colors[color_map[name]].hex.upper()
-
-    color_scheme = f"""(
-        name: "Catppuccin {flavor.capitalize()}",
-        foreground: "{get_color('foreground')}",
-        cursor: "{get_color('cursor')}",
-        bright_foreground: "{get_color('bright_foreground')}",
-        dim_foreground: "{get_color('dim_foreground')}",
-        normal: (
-            black: "{get_color('black')}",
-            red: "{get_color('red')}",
-            green: "{get_color('green')}",
-            yellow: "{get_color('yellow')}",
-            blue: "{get_color('blue')}",
-            magenta: "{get_color('magenta')}",
-            cyan: "{get_color('cyan')}",
-            white: "{get_color('white')}",
-        ),
-        bright: (
-            black: "{get_color('bright-black')}",
-            red: "{get_color('bright-red')}",
-            green: "{get_color('bright-green')}",
-            yellow: "{get_color('bright-yellow')}",
-            blue: "{get_color('bright-blue')}",
-            magenta: "{get_color('bright-magenta')}",
-            cyan: "{get_color('bright-cyan')}",
-            white: "{get_color('bright-white')}",
-        ),
-        dim: (
-            black: "{get_color('dim-black')}",
-            red: "{get_color('dim-red')}",
-            green: "{get_color('dim-green')}",
-            yellow: "{get_color('dim-yellow')}",
-            blue: "{get_color('dim-blue')}",
-            magenta: "{get_color('dim-magenta')}",
-            cyan: "{get_color('dim-cyan')}",
-            white: "{get_color('dim-white')}",
-        ),
-    )"""
-    return color_scheme
-
-
-for flavor in flavors:
-    with open(f"./cosmic-term/Catppuccin-{flavor.capitalize()}.ron", "w") as f:
-        f.write(generate_color_scheme(flavor))
diff --git a/cosmic-term/Catppuccin-Frappe.ron b/cosmic-term/Catppuccin-Frappe.ron
deleted file mode 100644
index a93c431..0000000
--- a/cosmic-term/Catppuccin-Frappe.ron
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-        name: "Catppuccin Frappe",
-        foreground: "#C6D0F5",
-        cursor: "#F2D5CF",
-        bright_foreground: "#C6D0F5",
-        dim_foreground: "#737994",
-        normal: (
-            black: "#51576D",
-            red: "#E78284",
-            green: "#A6D189",
-            yellow: "#E5C890",
-            blue: "#8CAAEE",
-            magenta: "#F4B8E4",
-            cyan: "#81C8BE",
-            white: "#B5BFE2",
-        ),
-        bright: (
-            black: "#626880",
-            red: "#E78284",
-            green: "#A6D189",
-            yellow: "#E5C890",
-            blue: "#8CAAEE",
-            magenta: "#F4B8E4",
-            cyan: "#81C8BE",
-            white: "#A5ADCE",
-        ),
-        dim: (
-            black: "#51576D",
-            red: "#E78284",
-            green: "#A6D189",
-            yellow: "#E5C890",
-            blue: "#8CAAEE",
-            magenta: "#F4B8E4",
-            cyan: "#81C8BE",
-            white: "#B5BFE2",
-        ),
-    )
\ No newline at end of file
diff --git a/cosmic-term/Catppuccin-Latte.ron b/cosmic-term/Catppuccin-Latte.ron
deleted file mode 100644
index c7430da..0000000
--- a/cosmic-term/Catppuccin-Latte.ron
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-        name: "Catppuccin Latte",
-        foreground: "#4C4F69",
-        cursor: "#DC8A78",
-        bright_foreground: "#4C4F69",
-        dim_foreground: "#9CA0B0",
-        normal: (
-            black: "#5C5F77",
-            red: "#D20F39",
-            green: "#40A02B",
-            yellow: "#DF8E1D",
-            blue: "#1E66F5",
-            magenta: "#EA76CB",
-            cyan: "#179299",
-            white: "#ACB0BE",
-        ),
-        bright: (
-            black: "#6C6F85",
-            red: "#D20F39",
-            green: "#40A02B",
-            yellow: "#DF8E1D",
-            blue: "#1E66F5",
-            magenta: "#EA76CB",
-            cyan: "#179299",
-            white: "#BCC0CC",
-        ),
-        dim: (
-            black: "#5C5F77",
-            red: "#D20F39",
-            green: "#40A02B",
-            yellow: "#DF8E1D",
-            blue: "#1E66F5",
-            magenta: "#EA76CB",
-            cyan: "#179299",
-            white: "#ACB0BE",
-        ),
-    )
\ No newline at end of file
diff --git a/cosmic-term/Catppuccin-Macchiato.ron b/cosmic-term/Catppuccin-Macchiato.ron
deleted file mode 100644
index 598daf0..0000000
--- a/cosmic-term/Catppuccin-Macchiato.ron
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-        name: "Catppuccin Macchiato",
-        foreground: "#CAD3F5",
-        cursor: "#F4DBD6",
-        bright_foreground: "#CAD3F5",
-        dim_foreground: "#6E738D",
-        normal: (
-            black: "#494D64",
-            red: "#ED8796",
-            green: "#A6DA95",
-            yellow: "#EED49F",
-            blue: "#8AADF4",
-            magenta: "#F5BDE6",
-            cyan: "#8BD5CA",
-            white: "#B8C0E0",
-        ),
-        bright: (
-            black: "#5B6078",
-            red: "#ED8796",
-            green: "#A6DA95",
-            yellow: "#EED49F",
-            blue: "#8AADF4",
-            magenta: "#F5BDE6",
-            cyan: "#8BD5CA",
-            white: "#A5ADCB",
-        ),
-        dim: (
-            black: "#494D64",
-            red: "#ED8796",
-            green: "#A6DA95",
-            yellow: "#EED49F",
-            blue: "#8AADF4",
-            magenta: "#F5BDE6",
-            cyan: "#8BD5CA",
-            white: "#B8C0E0",
-        ),
-    )
\ No newline at end of file
diff --git a/cosmic-term/Catppuccin-Mocha.ron b/cosmic-term/Catppuccin-Mocha.ron
deleted file mode 100644
index 2264c20..0000000
--- a/cosmic-term/Catppuccin-Mocha.ron
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-        name: "Catppuccin Mocha",
-        foreground: "#CDD6F4",
-        cursor: "#F5E0DC",
-        bright_foreground: "#CDD6F4",
-        dim_foreground: "#6C7086",
-        normal: (
-            black: "#45475A",
-            red: "#F38BA8",
-            green: "#A6E3A1",
-            yellow: "#F9E2AF",
-            blue: "#89B4FA",
-            magenta: "#F5C2E7",
-            cyan: "#94E2D5",
-            white: "#BAC2DE",
-        ),
-        bright: (
-            black: "#585B70",
-            red: "#F38BA8",
-            green: "#A6E3A1",
-            yellow: "#F9E2AF",
-            blue: "#89B4FA",
-            magenta: "#F5C2E7",
-            cyan: "#94E2D5",
-            white: "#A6ADC8",
-        ),
-        dim: (
-            black: "#45475A",
-            red: "#F38BA8",
-            green: "#A6E3A1",
-            yellow: "#F9E2AF",
-            blue: "#89B4FA",
-            magenta: "#F5C2E7",
-            cyan: "#94E2D5",
-            white: "#BAC2DE",
-        ),
-    )
\ No newline at end of file
diff --git a/generate.py b/generate.py
deleted file mode 100644
index f7cd755..0000000
--- a/generate.py
+++ /dev/null
@@ -1,246 +0,0 @@
-from catppuccin import PALETTE
-import argparse
-
-parser = argparse.ArgumentParser(
-    description="Generate a Catppuccin theme for Cosmic Desktop"
-)
-parser.add_argument(
-    "flavor",
-    type=str,
-    metavar="theme flavor",
-    nargs="?",
-    default="mocha",
-    help="The flavor of the theme to generate. Can be 'mocha', 'frappe', 'macchiato', or 'latte'.",
-)
-parser.add_argument(
-    "--accent",
-    "-a",
-    type=str,
-    metavar="accent color",
-    nargs="?",
-    default="lavender",
-    dest="accent",
-    help="The accent color to use for the theme.",
-)
-parser.add_argument(
-    "--bg-alpha",
-    "-b",
-    type=float,
-    metavar="background alpha",
-    nargs="?",
-    default=1,
-    dest="bg_alpha",
-    help="The alpha value of the background color.",
-)
-parser.add_argument(
-    "--frosted",
-    "-f",
-    type=bool,
-    metavar="frosted effect",
-    dest="is_frosted",
-    default=False,
-    help="Whether to use frosted glass effect for the theme.",
-)
-parser.add_argument(
-    "--outer-gap",
-    "-o",
-    type=int,
-    metavar="outer gap size",
-    nargs="?",
-    default=0,
-    dest="outer_gap_size",
-    help="The size of the outer gap.",
-)
-parser.add_argument(
-    "--inner-gap",
-    "-i",
-    type=int,
-    metavar="inner gap size",
-    nargs="?",
-    default=8,
-    dest="inner_gap_size",
-    help="The size of the inner gap.",
-)
-parser.add_argument(
-    "--active-hint",
-    "-ah",
-    type=int,
-    metavar="active hint size",
-    nargs="?",
-    default=3,
-    dest="active_hint_size",
-    help="The size of the active hint.",
-)
-parser.add_argument(
-    "--roundness",
-    "-r",
-    type=str,
-    metavar="roundness",
-    nargs="?",
-    default="round",
-    choices=["round", "slightly round", "square"],
-    dest="roundness",
-    help="The roundness of the corners. Can be 'round', 'slightly round', or 'square'.",
-)
-parser.add_argument(
-    "--window-hint-color",
-    "-whc",
-    type=str,
-    metavar="window hint color",
-    nargs="?",
-    default=None,
-    dest="window_hint_color",
-    help="The color of the window hint.",
-)
-args = parser.parse_args()
-flavor = args.flavor
-accent = args.accent
-bg_alpha = args.bg_alpha
-is_frosted = args.is_frosted
-outer_gap_size = args.outer_gap_size
-inner_gap_size = args.inner_gap_size
-active_hint_size = args.active_hint_size
-roundness = args.roundness
-window_hint_color = accent if args.window_hint_color is None else args.window_hint_color
-
-palette_map = {
-    "blue": "blue",
-    "red": "red",
-    "green": "green",
-    "yellow": "yellow",
-    "gray_1": "mantle",
-    "gray_2": "base",
-    "gray_3": "surface 0",
-    "neutral_0": "crust",
-    "neutral_1": "mantle",
-    "neutral_2": "base",
-    "neutral_3": "surface 0",
-    "neutral_4": "surface 1",
-    "neutral_5": "surface 2",
-    "neutral_6": "overlay 0",
-    "neutral_7": "overlay 1",
-    "neutral_8": "overlay 2",
-    "neutral_9": "subtext 0",
-    "neutral_10": "subtext 1",
-    "bright_green": "green",
-    "bright_red": "red",
-    "bright_orange": "peach",
-    "ext_warm_grey": "overlay 2",
-    "ext_orange": "peach",
-    "ext_yellow": "yellow",
-    "ext_blue": "blue",
-    "ext_purple": "lavender",
-    "ext_pink": "pink",
-    "ext_indigo": "mauve",
-    "accent_blue": "blue",
-    "accent_red": "red",
-    "accent_green": "green",
-    "accent_warm_grey": "overlay 2",
-    "accent_orange": "peach",
-    "accent_yellow": "yellow",
-    "accent_purple": "lavender",
-    "accent_pink": "pink",
-    "accent_indigo": "mauve",
-}
-
-
-bg_color_map = "base"
-other_map = {
-    "text_tint": "text",
-    "accent": accent,
-    "success": "green",
-    "warning": "yellow",
-    "destructive": "red",
-    "window_hint": window_hint_color,
-}
-if flavor != "latte":
-    other_map["neutral_tint"] = "overlay 1"
-    other_map["primary_container_bg"] = "surface 0"
-    other_map["secondary_container_bg"] = "surface 1"
-
-roundness_map = {
-    "round": """    corner_radii: (
-        radius_0: (0.0, 0.0, 0.0, 0.0),
-        radius_xs: (4.0, 4.0, 4.0, 4.0),
-        radius_s: (8.0, 8.0, 8.0, 8.0),
-        radius_m: (16.0, 16.0, 16.0, 16.0),
-        radius_l: (32.0, 32.0, 32.0, 32.0),
-        radius_xl: (160.0, 160.0, 160.0, 160.0),
-    ),""",
-    "slightly round": """    corner_radii: (
-        radius_0: (0.0, 0.0, 0.0, 0.0),
-        radius_xs: (2.0, 2.0, 2.0, 2.0),
-        radius_s: (8.0, 8.0, 8.0, 8.0),
-        radius_m: (8.0, 8.0, 8.0, 8.0),
-        radius_l: (8.0, 8.0, 8.0, 8.0),
-        radius_xl: (8.0, 8.0, 8.0, 8.0),
-    ),""",
-    "square": """    corner_radii: (
-        radius_0: (0.0, 0.0, 0.0, 0.0),
-        radius_xs: (2.0, 2.0, 2.0, 2.0),
-        radius_s: (2.0, 2.0, 2.0, 2.0),
-        radius_m: (2.0, 2.0, 2.0, 2.0),
-        radius_l: (2.0, 2.0, 2.0, 2.0),
-        radius_xl: (2.0, 2.0, 2.0, 2.0),
-    ),""",
-}
-
-catppuccin_colors = {}
-for color in eval(f"PALETTE.{flavor}.colors"):
-    catppuccin_colors[color.name.lower()] = color
-
-print(
-    f"""(
-    palette: {"Light" if flavor == "latte" else "Dark"}((
-        name: "Catppuccin-{flavor.capitalize()}-{accent.capitalize()}","""
-)
-for color in palette_map:
-    catppuccin_color = catppuccin_colors[palette_map[color]]
-    print(
-        f"""        {color}: (
-            red: {catppuccin_color.rgb.r/255:.8f},
-            green: {catppuccin_color.rgb.g/255:.8f},
-            blue: {catppuccin_color.rgb.b/255:.8f},
-            alpha: 1.0,
-        ),"""
-    )
-print("    )),")
-print(
-    """    spacing: (
-        space_none: 0,
-        space_xxxs: 4,
-        space_xxs: 8,
-        space_xs: 12,
-        space_s: 16,
-        space_m: 24,
-        space_l: 32,
-        space_xl: 48,
-        space_xxl: 64,
-        space_xxxl: 128,
-    ),"""
-)
-print(roundness_map[roundness])
-print(
-    f"""    bg_color: Some((
-        red: {catppuccin_colors[bg_color_map].rgb.r/255:.8f},
-        green: {catppuccin_colors[bg_color_map].rgb.g/255:.8f},
-        blue: {catppuccin_colors[bg_color_map].rgb.b/255:.8f},
-        alpha: {bg_alpha},
-    )),"""
-)
-for color in other_map:
-    catppuccin_color = catppuccin_colors[other_map[color]]
-    print(
-        f"""    {color}: Some((
-        red: {catppuccin_color.rgb.r/255:.8f},
-        green: {catppuccin_color.rgb.g/255:.8f},
-        blue: {catppuccin_color.rgb.b/255:.8f},
-        alpha: 1.0,
-    )),"""
-    )
-print(
-    f"""    is_frosted: {"true" if is_frosted else "false"},
-    gaps: ({outer_gap_size}, {inner_gap_size}),
-    active_hint: {active_hint_size},
-)"""
-)
diff --git a/justfile b/justfile
new file mode 100644
index 0000000..ef6a575
--- /dev/null
+++ b/justfile
@@ -0,0 +1,9 @@
+_default:
+  @just --list
+
+clean:
+  rm -rf themes
+
+build: clean
+  whiskers templates/cosmic-settings.tera
+  whiskers templates/cosmic-term.tera
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 7f4fc0d..0000000
--- a/release.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-THEMES="mocha frappe macchiato latte"
-ACCENTS="blue red green peach yellow lavender pink mauve"
-
-for theme in $THEMES; do
-  for accent in $ACCENTS; do
-    python generate.py -a $accent $theme > "cosmic-settings/Catppuccin-${theme^}-${accent^}.ron"
-  done
-done
-
-python cosmic-term.py
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b6ea835..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-catppuccin==2.2.0
diff --git a/templates/cosmic-settings.tera b/templates/cosmic-settings.tera
new file mode 100644
index 0000000..6120f6d
--- /dev/null
+++ b/templates/cosmic-settings.tera
@@ -0,0 +1,134 @@
+---
+roundness: "round"
+window_hint_color: ""
+bg_alpha: 1.0
+frosted: false
+outer_gap_size: 0
+inner_gap_size: 8
+active_hint_size: 3
+whiskers:
+    version: 2.5.1
+    matrix:
+    - flavor
+    - accent
+    filename: "themes/cosmic-settings/catppuccin-{{ flavor.identifier }}-{{ accent }}+{{ roundness }}.ron"
+---
+{%- if roundness is not matching("round|slightlyround|square") -%}
+    {{ throw(message="roundness must be 'round', 'slightlyround', or 'square'") }}
+{%- endif -%}
+{%- if bg_alpha < 0 or bg_alpha > 1 -%}{{ throw(message="bg_alpha must be between 0.0 and 1.0") }}{%- endif -%}
+{%- set window_hint = if(cond=window_hint_color != "", t=window_hint_color, f=accent) -%}
+{%- macro palette_color(name, color) -%}
+        {{ name }}: (
+            red: {{ color.rgb.r / 255 | trunc(places=8) }},
+            green: {{ color.rgb.g / 255 | trunc(places=8) }},
+            blue: {{ color.rgb.b / 255 | trunc(places=8) }},
+            alpha: 1.0,
+        ),
+{%- endmacro palette_color -%}
+{%- macro optional_color(name, color, alpha=1.0) -%}
+    {{ name }}: Some((
+        red: {{ color.rgb.r / 255 | trunc(places=8) }},
+        green: {{ color.rgb.g / 255 | trunc(places=8) }},
+        blue: {{ color.rgb.b / 255 | trunc(places=8) }},
+        alpha: {{ alpha | trunc(places=8) }},
+    )),
+{%- endmacro optional_color -%}
+{%- set palette = flavor.colors -%}
+(
+    palette: {{ if(cond=flavor.dark, t="Dark", f="Light") }}((
+        name: "Catppuccin-{{ flavor.identifier | capitalize }}-{{ accent | capitalize }}",
+        {{ self::palette_color(name="blue", color=blue) }}
+        {{ self::palette_color(name="red", color=red) }}
+        {{ self::palette_color(name="green", color=green) }}
+        {{ self::palette_color(name="yellow", color=yellow) }}
+        {{ self::palette_color(name="gray_1", color=mantle) }}
+        {{ self::palette_color(name="gray_2", color=base) }}
+        {{ self::palette_color(name="gray_3", color=surface0) }}
+        {{ self::palette_color(name="neutral_0", color=crust) }}
+        {{ self::palette_color(name="neutral_1", color=mantle) }}
+        {{ self::palette_color(name="neutral_2", color=base) }}
+        {{ self::palette_color(name="neutral_3", color=surface0) }}
+        {{ self::palette_color(name="neutral_4", color=surface1) }}
+        {{ self::palette_color(name="neutral_5", color=surface2) }}
+        {{ self::palette_color(name="neutral_6", color=overlay0) }}
+        {{ self::palette_color(name="neutral_7", color=overlay1) }}
+        {{ self::palette_color(name="neutral_8", color=overlay2) }}
+        {{ self::palette_color(name="neutral_9", color=subtext0) }}
+        {{ self::palette_color(name="neutral_10", color=subtext1) }}
+        {{ self::palette_color(name="bright_green", color=green) }}
+        {{ self::palette_color(name="bright_red", color=red) }}
+        {{ self::palette_color(name="bright_orange", color=peach) }}
+        {{ self::palette_color(name="ext_warm_grey", color=overlay2) }}
+        {{ self::palette_color(name="ext_orange", color=peach) }}
+        {{ self::palette_color(name="ext_yellow", color=yellow) }}
+        {{ self::palette_color(name="ext_blue", color=blue) }}
+        {{ self::palette_color(name="ext_purple", color=lavender) }}
+        {{ self::palette_color(name="ext_pink", color=pink) }}
+        {{ self::palette_color(name="ext_indigo", color=mauve) }}
+        {{ self::palette_color(name="accent_blue", color=blue) }}
+        {{ self::palette_color(name="accent_red", color=red) }}
+        {{ self::palette_color(name="accent_green", color=green) }}
+        {{ self::palette_color(name="accent_warm_grey", color=overlay2) }}
+        {{ self::palette_color(name="accent_orange", color=peach) }}
+        {{ self::palette_color(name="accent_yellow", color=yellow) }}
+        {{ self::palette_color(name="accent_purple", color=lavender) }}
+        {{ self::palette_color(name="accent_pink", color=pink) }}
+        {{ self::palette_color(name="accent_indigo", color=mauve) }}
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        {% if roundness == "round" -%}
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+        {%- elif roundness == "slightlyround" -%}
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (2.0, 2.0, 2.0, 2.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (8.0, 8.0, 8.0, 8.0),
+        radius_l: (8.0, 8.0, 8.0, 8.0),
+        radius_xl: (8.0, 8.0, 8.0, 8.0),
+        {%- else -%}
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (2.0, 2.0, 2.0, 2.0),
+        radius_s: (2.0, 2.0, 2.0, 2.0),
+        radius_m: (2.0, 2.0, 2.0, 2.0),
+        radius_l: (2.0, 2.0, 2.0, 2.0),
+        radius_xl: (2.0, 2.0, 2.0, 2.0),
+        {%- endif %}
+    ),
+    {{ self::optional_color(name="bg_color", color=base, alpha=bg_alpha) }}
+    {{ self::optional_color(name="text_tint", color=text) }}
+    {{ self::optional_color(name="accent", color=palette[accent]) }}
+    {{ self::optional_color(name="success", color=green) }}
+    {{ self::optional_color(name="warning", color=yellow) }}
+    {{ self::optional_color(name="destructive", color=red) }}
+    {{ self::optional_color(name="window_hint", color=palette[window_hint]) }}
+    {% if flavor.dark -%}
+    {{ self::optional_color(name="neutral_tint", color=overlay1) }}
+    {{ self::optional_color(name="primary_container_bg", color=surface0) }}
+    {{ self::optional_color(name="secondary_container_bg", color=surface1) }}
+    {%- else -%}
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    {%- endif %}
+    is_frosted: {{ frosted }},
+    gaps: ({{ outer_gap_size }}, {{ inner_gap_size }}),
+    active_hint: {{ active_hint_size }},
+)
diff --git a/templates/cosmic-term.tera b/templates/cosmic-term.tera
new file mode 100644
index 0000000..4dfe027
--- /dev/null
+++ b/templates/cosmic-term.tera
@@ -0,0 +1,29 @@
+---
+whiskers:
+    version: 2.5.1
+    matrix:
+    - flavor
+    filename: "themes/cosmic-term/catppuccin-{{ flavor.identifier }}.ron"
+---
+{%- macro palette(name, black_light, black_dark, white_light, white_dark) -%}
+    {{ name }}: (
+        black: "#{{ if(cond=flavor.dark, t=black_dark.hex, f=black_light.hex) }}",
+        red: "#{{ red.hex }}",
+        green: "#{{ green.hex }}",
+        yellow: "#{{ yellow.hex }}",
+        blue: "#{{ blue.hex }}",
+        magenta: "#{{ pink.hex }}",
+        cyan: "#{{ teal.hex }}",
+        white: "#{{ if(cond=flavor.dark, t=white_dark.hex, f=white_light.hex) }}"
+    ),
+{%- endmacro palete -%}
+(
+    name: "Catppuccin {{ flavor.name }}",
+    foreground: "#{{ text.hex }}",
+    cursor: "#{{ rosewater.hex }}",
+    bright_foreground: "#{{ text.hex }}",
+    dim_foreground: "#{{ overlay0.hex }}",
+    {{ self::palette(name="normal", black_light=subtext1, black_dark=surface1, white_light=surface2, white_dark=subtext1) }}
+    {{ self::palette(name="bright", black_light=subtext0, black_dark=surface2, white_light=surface1, white_dark=subtext0) }}
+    {{ self::palette(name="dim", black_light=subtext1, black_dark=surface1, white_light=surface2, white_dark=subtext1) }}
+)
diff --git a/cosmic-settings/Catppuccin-Frappe-Blue.ron b/themes/cosmic-settings/catppuccin-frappe-blue+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Blue.ron
rename to themes/cosmic-settings/catppuccin-frappe-blue+round.ron
index 3825235..f26844d 100644
--- a/cosmic-settings/Catppuccin-Frappe-Blue.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-blue+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.54901961,
         green: 0.66666667,
         blue: 0.93333333,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.54901961,
         green: 0.66666667,
         blue: 0.93333333,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-frappe-flamingo+round.ron b/themes/cosmic-settings/catppuccin-frappe-flamingo+round.ron
new file mode 100644
index 0000000..029f1bd
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-flamingo+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Flamingo",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.93333333,
+        green: 0.74509804,
+        blue: 0.74509804,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.93333333,
+        green: 0.74509804,
+        blue: 0.74509804,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Frappe-Green.ron b/themes/cosmic-settings/catppuccin-frappe-green+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Green.ron
rename to themes/cosmic-settings/catppuccin-frappe-green+round.ron
index 71808e1..6a86a01 100644
--- a/cosmic-settings/Catppuccin-Frappe-Green.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-green+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Frappe-Lavender.ron b/themes/cosmic-settings/catppuccin-frappe-lavender+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Lavender.ron
rename to themes/cosmic-settings/catppuccin-frappe-lavender+round.ron
index 37c95fe..8d9bcee 100644
--- a/cosmic-settings/Catppuccin-Frappe-Lavender.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-lavender+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.72941176,
         green: 0.73333333,
         blue: 0.94509804,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.72941176,
         green: 0.73333333,
         blue: 0.94509804,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-frappe-maroon+round.ron b/themes/cosmic-settings/catppuccin-frappe-maroon+round.ron
new file mode 100644
index 0000000..b00b46f
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-maroon+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Maroon",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.91764706,
+        green: 0.60000000,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.91764706,
+        green: 0.60000000,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Frappe-Mauve.ron b/themes/cosmic-settings/catppuccin-frappe-mauve+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Mauve.ron
rename to themes/cosmic-settings/catppuccin-frappe-mauve+round.ron
index ed89f80..8617276 100644
--- a/cosmic-settings/Catppuccin-Frappe-Mauve.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-mauve+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.79215686,
         green: 0.61960784,
         blue: 0.90196078,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.79215686,
         green: 0.61960784,
         blue: 0.90196078,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Frappe-Peach.ron b/themes/cosmic-settings/catppuccin-frappe-peach+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Peach.ron
rename to themes/cosmic-settings/catppuccin-frappe-peach+round.ron
index 49a7c11..b6a3043 100644
--- a/cosmic-settings/Catppuccin-Frappe-Peach.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-peach+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.93725490,
         green: 0.62352941,
         blue: 0.46274510,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.93725490,
         green: 0.62352941,
         blue: 0.46274510,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Frappe-Pink.ron b/themes/cosmic-settings/catppuccin-frappe-pink+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Pink.ron
rename to themes/cosmic-settings/catppuccin-frappe-pink+round.ron
index bb281b5..af5e829 100644
--- a/cosmic-settings/Catppuccin-Frappe-Pink.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-pink+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.95686275,
         green: 0.72156863,
         blue: 0.89411765,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.95686275,
         green: 0.72156863,
         blue: 0.89411765,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Frappe-Red.ron b/themes/cosmic-settings/catppuccin-frappe-red+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Red.ron
rename to themes/cosmic-settings/catppuccin-frappe-red+round.ron
index a2e6838..a2c2214 100644
--- a/cosmic-settings/Catppuccin-Frappe-Red.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-red+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-frappe-rosewater+round.ron b/themes/cosmic-settings/catppuccin-frappe-rosewater+round.ron
new file mode 100644
index 0000000..f4478ed
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-rosewater+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Rosewater",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.94901961,
+        green: 0.83529412,
+        blue: 0.81176471,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.94901961,
+        green: 0.83529412,
+        blue: 0.81176471,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-frappe-sapphire+round.ron b/themes/cosmic-settings/catppuccin-frappe-sapphire+round.ron
new file mode 100644
index 0000000..f7ccacc
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-sapphire+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Sapphire",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.52156863,
+        green: 0.75686275,
+        blue: 0.86274510,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.52156863,
+        green: 0.75686275,
+        blue: 0.86274510,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-frappe-sky+round.ron b/themes/cosmic-settings/catppuccin-frappe-sky+round.ron
new file mode 100644
index 0000000..cd42d54
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-sky+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Sky",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.60000000,
+        green: 0.81960784,
+        blue: 0.85882353,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.60000000,
+        green: 0.81960784,
+        blue: 0.85882353,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-frappe-teal+round.ron b/themes/cosmic-settings/catppuccin-frappe-teal+round.ron
new file mode 100644
index 0000000..2ea593b
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-frappe-teal+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Frappe-Teal",
+        blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.13725490,
+            green: 0.14901961,
+            blue: 0.20392157,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.16078431,
+            green: 0.17254902,
+            blue: 0.23529412,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.18823529,
+            green: 0.20392157,
+            blue: 0.27450980,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.25490196,
+            green: 0.27058824,
+            blue: 0.34901961,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.31764706,
+            green: 0.34117647,
+            blue: 0.42745098,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.38431373,
+            green: 0.40784314,
+            blue: 0.50196078,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.45098039,
+            green: 0.47450980,
+            blue: 0.58039216,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.51372549,
+            green: 0.54509804,
+            blue: 0.65490196,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.80784314,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.70980392,
+            green: 0.74901961,
+            blue: 0.88627451,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54901961,
+            green: 0.66666667,
+            blue: 0.93333333,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.90588235,
+            green: 0.50980392,
+            blue: 0.51764706,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.81960784,
+            blue: 0.53725490,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.58039216,
+            green: 0.61176471,
+            blue: 0.73333333,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.93725490,
+            green: 0.62352941,
+            blue: 0.46274510,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.89803922,
+            green: 0.78431373,
+            blue: 0.56470588,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.72941176,
+            green: 0.73333333,
+            blue: 0.94509804,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.95686275,
+            green: 0.72156863,
+            blue: 0.89411765,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79215686,
+            green: 0.61960784,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.18823529,
+        green: 0.20392157,
+        blue: 0.27450980,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.77647059,
+        green: 0.81568627,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.50588235,
+        green: 0.78431373,
+        blue: 0.74509804,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.81960784,
+        blue: 0.53725490,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.89803922,
+        green: 0.78431373,
+        blue: 0.56470588,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.90588235,
+        green: 0.50980392,
+        blue: 0.51764706,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.50588235,
+        green: 0.78431373,
+        blue: 0.74509804,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.51372549,
+        green: 0.54509804,
+        blue: 0.65490196,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.25490196,
+        green: 0.27058824,
+        blue: 0.34901961,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.31764706,
+        green: 0.34117647,
+        blue: 0.42745098,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Frappe-Yellow.ron b/themes/cosmic-settings/catppuccin-frappe-yellow+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Frappe-Yellow.ron
rename to themes/cosmic-settings/catppuccin-frappe-yellow+round.ron
index 33ab549..f63b5a9 100644
--- a/cosmic-settings/Catppuccin-Frappe-Yellow.ron
+++ b/themes/cosmic-settings/catppuccin-frappe-yellow+round.ron
@@ -248,61 +248,61 @@
         red: 0.18823529,
         green: 0.20392157,
         blue: 0.27450980,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.77647059,
         green: 0.81568627,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.81960784,
         blue: 0.53725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.90588235,
         green: 0.50980392,
         blue: 0.51764706,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.89803922,
         green: 0.78431373,
         blue: 0.56470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.51372549,
         green: 0.54509804,
         blue: 0.65490196,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.25490196,
         green: 0.27058824,
         blue: 0.34901961,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.31764706,
         green: 0.34117647,
         blue: 0.42745098,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Latte-Blue.ron b/themes/cosmic-settings/catppuccin-latte-blue+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Blue.ron
rename to themes/cosmic-settings/catppuccin-latte-blue+round.ron
index 2e84da3..6e8fb5f 100644
--- a/cosmic-settings/Catppuccin-Latte-Blue.ron
+++ b/themes/cosmic-settings/catppuccin-latte-blue+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.11764706,
         green: 0.40000000,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.11764706,
         green: 0.40000000,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/themes/cosmic-settings/catppuccin-latte-flamingo+round.ron b/themes/cosmic-settings/catppuccin-latte-flamingo+round.ron
new file mode 100644
index 0000000..f8edf7a
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-flamingo+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Flamingo",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.86666667,
+        green: 0.47058824,
+        blue: 0.47058824,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.86666667,
+        green: 0.47058824,
+        blue: 0.47058824,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Latte-Green.ron b/themes/cosmic-settings/catppuccin-latte-green+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Green.ron
rename to themes/cosmic-settings/catppuccin-latte-green+round.ron
index 15d3399..78c85f2 100644
--- a/cosmic-settings/Catppuccin-Latte-Green.ron
+++ b/themes/cosmic-settings/catppuccin-latte-green+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/cosmic-settings/Catppuccin-Latte-Lavender.ron b/themes/cosmic-settings/catppuccin-latte-lavender+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Lavender.ron
rename to themes/cosmic-settings/catppuccin-latte-lavender+round.ron
index 895ae51..e892f1f 100644
--- a/cosmic-settings/Catppuccin-Latte-Lavender.ron
+++ b/themes/cosmic-settings/catppuccin-latte-lavender+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.44705882,
         green: 0.52941176,
         blue: 0.99215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.44705882,
         green: 0.52941176,
         blue: 0.99215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/themes/cosmic-settings/catppuccin-latte-maroon+round.ron b/themes/cosmic-settings/catppuccin-latte-maroon+round.ron
new file mode 100644
index 0000000..0a9d55d
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-maroon+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Maroon",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.90196078,
+        green: 0.27058824,
+        blue: 0.32549020,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.90196078,
+        green: 0.27058824,
+        blue: 0.32549020,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Latte-Mauve.ron b/themes/cosmic-settings/catppuccin-latte-mauve+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Mauve.ron
rename to themes/cosmic-settings/catppuccin-latte-mauve+round.ron
index bbfc900..6de35fc 100644
--- a/cosmic-settings/Catppuccin-Latte-Mauve.ron
+++ b/themes/cosmic-settings/catppuccin-latte-mauve+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.53333333,
         green: 0.22352941,
         blue: 0.93725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.53333333,
         green: 0.22352941,
         blue: 0.93725490,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/cosmic-settings/Catppuccin-Latte-Peach.ron b/themes/cosmic-settings/catppuccin-latte-peach+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Peach.ron
rename to themes/cosmic-settings/catppuccin-latte-peach+round.ron
index 965cda5..cb74f93 100644
--- a/cosmic-settings/Catppuccin-Latte-Peach.ron
+++ b/themes/cosmic-settings/catppuccin-latte-peach+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.99607843,
         green: 0.39215686,
         blue: 0.04313725,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.99607843,
         green: 0.39215686,
         blue: 0.04313725,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/cosmic-settings/Catppuccin-Latte-Pink.ron b/themes/cosmic-settings/catppuccin-latte-pink+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Pink.ron
rename to themes/cosmic-settings/catppuccin-latte-pink+round.ron
index ee723d4..4e58b41 100644
--- a/cosmic-settings/Catppuccin-Latte-Pink.ron
+++ b/themes/cosmic-settings/catppuccin-latte-pink+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.91764706,
         green: 0.46274510,
         blue: 0.79607843,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.91764706,
         green: 0.46274510,
         blue: 0.79607843,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/cosmic-settings/Catppuccin-Latte-Red.ron b/themes/cosmic-settings/catppuccin-latte-red+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Red.ron
rename to themes/cosmic-settings/catppuccin-latte-red+round.ron
index 6e6cb0d..7d12062 100644
--- a/cosmic-settings/Catppuccin-Latte-Red.ron
+++ b/themes/cosmic-settings/catppuccin-latte-red+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/themes/cosmic-settings/catppuccin-latte-rosewater+round.ron b/themes/cosmic-settings/catppuccin-latte-rosewater+round.ron
new file mode 100644
index 0000000..da823ff
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-rosewater+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Rosewater",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.86274510,
+        green: 0.54117647,
+        blue: 0.47058824,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.86274510,
+        green: 0.54117647,
+        blue: 0.47058824,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-latte-sapphire+round.ron b/themes/cosmic-settings/catppuccin-latte-sapphire+round.ron
new file mode 100644
index 0000000..b855652
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-sapphire+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Sapphire",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.12549020,
+        green: 0.62352941,
+        blue: 0.70980392,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.12549020,
+        green: 0.62352941,
+        blue: 0.70980392,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-latte-sky+round.ron b/themes/cosmic-settings/catppuccin-latte-sky+round.ron
new file mode 100644
index 0000000..aae7bdb
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-sky+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Sky",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.01568627,
+        green: 0.64705882,
+        blue: 0.89803922,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.01568627,
+        green: 0.64705882,
+        blue: 0.89803922,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-latte-teal+round.ron b/themes/cosmic-settings/catppuccin-latte-teal+round.ron
new file mode 100644
index 0000000..54bb14d
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-latte-teal+round.ron
@@ -0,0 +1,295 @@
+(
+    palette: Light((
+        name: "Catppuccin-Latte-Teal",
+        blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.86274510,
+            green: 0.87843137,
+            blue: 0.90980392,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.90196078,
+            green: 0.91372549,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.93725490,
+            green: 0.94509804,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.80000000,
+            green: 0.81568627,
+            blue: 0.85490196,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.73725490,
+            green: 0.75294118,
+            blue: 0.80000000,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.67450980,
+            green: 0.69019608,
+            blue: 0.74509804,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.61176471,
+            green: 0.62745098,
+            blue: 0.69019608,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.54901961,
+            green: 0.56078431,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.42352941,
+            green: 0.43529412,
+            blue: 0.52156863,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.36078431,
+            green: 0.37254902,
+            blue: 0.46666667,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.11764706,
+            green: 0.40000000,
+            blue: 0.96078431,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.82352941,
+            green: 0.05882353,
+            blue: 0.22352941,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.25098039,
+            green: 0.62745098,
+            blue: 0.16862745,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.48627451,
+            green: 0.49803922,
+            blue: 0.57647059,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.99607843,
+            green: 0.39215686,
+            blue: 0.04313725,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.87450980,
+            green: 0.55686275,
+            blue: 0.11372549,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.44705882,
+            green: 0.52941176,
+            blue: 0.99215686,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.91764706,
+            green: 0.46274510,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.53333333,
+            green: 0.22352941,
+            blue: 0.93725490,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.93725490,
+        green: 0.94509804,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.29803922,
+        green: 0.30980392,
+        blue: 0.41176471,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.09019608,
+        green: 0.57254902,
+        blue: 0.60000000,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.25098039,
+        green: 0.62745098,
+        blue: 0.16862745,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.87450980,
+        green: 0.55686275,
+        blue: 0.11372549,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.82352941,
+        green: 0.05882353,
+        blue: 0.22352941,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.09019608,
+        green: 0.57254902,
+        blue: 0.60000000,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Latte-Yellow.ron b/themes/cosmic-settings/catppuccin-latte-yellow+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Latte-Yellow.ron
rename to themes/cosmic-settings/catppuccin-latte-yellow+round.ron
index bde20e1..0242d52 100644
--- a/cosmic-settings/Catppuccin-Latte-Yellow.ron
+++ b/themes/cosmic-settings/catppuccin-latte-yellow+round.ron
@@ -248,44 +248,47 @@
         red: 0.93725490,
         green: 0.94509804,
         blue: 0.96078431,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.29803922,
         green: 0.30980392,
         blue: 0.41176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.25098039,
         green: 0.62745098,
         blue: 0.16862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.82352941,
         green: 0.05882353,
         blue: 0.22352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.87450980,
         green: 0.55686275,
         blue: 0.11372549,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
+    neutral_tint: None,
+    primary_container_bg: None,
+    secondary_container_bg: None,
     is_frosted: false,
     gaps: (0, 8),
     active_hint: 3,
diff --git a/cosmic-settings/Catppuccin-Macchiato-Blue.ron b/themes/cosmic-settings/catppuccin-macchiato-blue+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Blue.ron
rename to themes/cosmic-settings/catppuccin-macchiato-blue+round.ron
index 44a2cad..0d47382 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Blue.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-blue+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.54117647,
         green: 0.67843137,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.54117647,
         green: 0.67843137,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-macchiato-flamingo+round.ron b/themes/cosmic-settings/catppuccin-macchiato-flamingo+round.ron
new file mode 100644
index 0000000..e1e7c00
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-flamingo+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Flamingo",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.94117647,
+        green: 0.77647059,
+        blue: 0.77647059,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.94117647,
+        green: 0.77647059,
+        blue: 0.77647059,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Macchiato-Green.ron b/themes/cosmic-settings/catppuccin-macchiato-green+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Green.ron
rename to themes/cosmic-settings/catppuccin-macchiato-green+round.ron
index 6d3ce64..b7ac049 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Green.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-green+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Macchiato-Lavender.ron b/themes/cosmic-settings/catppuccin-macchiato-lavender+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Lavender.ron
rename to themes/cosmic-settings/catppuccin-macchiato-lavender+round.ron
index 55753f0..e9fa54a 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Lavender.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-lavender+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.71764706,
         green: 0.74117647,
         blue: 0.97254902,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.71764706,
         green: 0.74117647,
         blue: 0.97254902,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-macchiato-maroon+round.ron b/themes/cosmic-settings/catppuccin-macchiato-maroon+round.ron
new file mode 100644
index 0000000..a179e6f
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-maroon+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Maroon",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.93333333,
+        green: 0.60000000,
+        blue: 0.62745098,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.93333333,
+        green: 0.60000000,
+        blue: 0.62745098,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Macchiato-Mauve.ron b/themes/cosmic-settings/catppuccin-macchiato-mauve+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Mauve.ron
rename to themes/cosmic-settings/catppuccin-macchiato-mauve+round.ron
index ca64df1..92496ac 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Mauve.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-mauve+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.77647059,
         green: 0.62745098,
         blue: 0.96470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.77647059,
         green: 0.62745098,
         blue: 0.96470588,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Macchiato-Peach.ron b/themes/cosmic-settings/catppuccin-macchiato-peach+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Peach.ron
rename to themes/cosmic-settings/catppuccin-macchiato-peach+round.ron
index 8ef2a3d..c790fc2 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Peach.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-peach+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.96078431,
         green: 0.66274510,
         blue: 0.49803922,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.96078431,
         green: 0.66274510,
         blue: 0.49803922,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Macchiato-Pink.ron b/themes/cosmic-settings/catppuccin-macchiato-pink+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Pink.ron
rename to themes/cosmic-settings/catppuccin-macchiato-pink+round.ron
index decea8d..32cb645 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Pink.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-pink+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.96078431,
         green: 0.74117647,
         blue: 0.90196078,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.96078431,
         green: 0.74117647,
         blue: 0.90196078,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Macchiato-Red.ron b/themes/cosmic-settings/catppuccin-macchiato-red+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Red.ron
rename to themes/cosmic-settings/catppuccin-macchiato-red+round.ron
index da39790..3ac6ff5 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Red.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-red+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-macchiato-rosewater+round.ron b/themes/cosmic-settings/catppuccin-macchiato-rosewater+round.ron
new file mode 100644
index 0000000..ba16516
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-rosewater+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Rosewater",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.95686275,
+        green: 0.85882353,
+        blue: 0.83921569,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.95686275,
+        green: 0.85882353,
+        blue: 0.83921569,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-macchiato-sapphire+round.ron b/themes/cosmic-settings/catppuccin-macchiato-sapphire+round.ron
new file mode 100644
index 0000000..c8e0539
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-sapphire+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Sapphire",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.49019608,
+        green: 0.76862745,
+        blue: 0.89411765,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.49019608,
+        green: 0.76862745,
+        blue: 0.89411765,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-macchiato-sky+round.ron b/themes/cosmic-settings/catppuccin-macchiato-sky+round.ron
new file mode 100644
index 0000000..96286da
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-sky+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Sky",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.56862745,
+        green: 0.84313725,
+        blue: 0.89019608,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.56862745,
+        green: 0.84313725,
+        blue: 0.89019608,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-macchiato-teal+round.ron b/themes/cosmic-settings/catppuccin-macchiato-teal+round.ron
new file mode 100644
index 0000000..e822cdf
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-macchiato-teal+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Macchiato-Teal",
+        blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.09411765,
+            green: 0.09803922,
+            blue: 0.14901961,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.11764706,
+            green: 0.12549020,
+            blue: 0.18823529,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.14117647,
+            green: 0.15294118,
+            blue: 0.22745098,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.21176471,
+            green: 0.22745098,
+            blue: 0.30980392,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.28627451,
+            green: 0.30196078,
+            blue: 0.39215686,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.35686275,
+            green: 0.37647059,
+            blue: 0.47058824,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.43137255,
+            green: 0.45098039,
+            blue: 0.55294118,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.50196078,
+            green: 0.52941176,
+            blue: 0.63529412,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.64705882,
+            green: 0.67843137,
+            blue: 0.79607843,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72156863,
+            green: 0.75294118,
+            blue: 0.87843137,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.54117647,
+            green: 0.67843137,
+            blue: 0.95686275,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.92941176,
+            green: 0.52941176,
+            blue: 0.58823529,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.85490196,
+            blue: 0.58431373,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60392157,
+            blue: 0.71764706,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.96078431,
+            green: 0.66274510,
+            blue: 0.49803922,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.93333333,
+            green: 0.83137255,
+            blue: 0.62352941,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.71764706,
+            green: 0.74117647,
+            blue: 0.97254902,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.74117647,
+            blue: 0.90196078,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.77647059,
+            green: 0.62745098,
+            blue: 0.96470588,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.14117647,
+        green: 0.15294118,
+        blue: 0.22745098,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.79215686,
+        green: 0.82745098,
+        blue: 0.96078431,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.54509804,
+        green: 0.83529412,
+        blue: 0.79215686,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.85490196,
+        blue: 0.58431373,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.93333333,
+        green: 0.83137255,
+        blue: 0.62352941,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.92941176,
+        green: 0.52941176,
+        blue: 0.58823529,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.54509804,
+        green: 0.83529412,
+        blue: 0.79215686,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.50196078,
+        green: 0.52941176,
+        blue: 0.63529412,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.21176471,
+        green: 0.22745098,
+        blue: 0.30980392,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.28627451,
+        green: 0.30196078,
+        blue: 0.39215686,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Macchiato-Yellow.ron b/themes/cosmic-settings/catppuccin-macchiato-yellow+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Macchiato-Yellow.ron
rename to themes/cosmic-settings/catppuccin-macchiato-yellow+round.ron
index fae7778..a2a804c 100644
--- a/cosmic-settings/Catppuccin-Macchiato-Yellow.ron
+++ b/themes/cosmic-settings/catppuccin-macchiato-yellow+round.ron
@@ -248,61 +248,61 @@
         red: 0.14117647,
         green: 0.15294118,
         blue: 0.22745098,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.79215686,
         green: 0.82745098,
         blue: 0.96078431,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.85490196,
         blue: 0.58431373,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.92941176,
         green: 0.52941176,
         blue: 0.58823529,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.93333333,
         green: 0.83137255,
         blue: 0.62352941,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.50196078,
         green: 0.52941176,
         blue: 0.63529412,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.21176471,
         green: 0.22745098,
         blue: 0.30980392,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.28627451,
         green: 0.30196078,
         blue: 0.39215686,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Mocha-Blue.ron b/themes/cosmic-settings/catppuccin-mocha-blue+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Blue.ron
rename to themes/cosmic-settings/catppuccin-mocha-blue+round.ron
index f9d0607..7dc450a 100644
--- a/cosmic-settings/Catppuccin-Mocha-Blue.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-blue+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.53725490,
         green: 0.70588235,
         blue: 0.98039216,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.53725490,
         green: 0.70588235,
         blue: 0.98039216,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-mocha-flamingo+round.ron b/themes/cosmic-settings/catppuccin-mocha-flamingo+round.ron
new file mode 100644
index 0000000..b397719
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-flamingo+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Flamingo",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.94901961,
+        green: 0.80392157,
+        blue: 0.80392157,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.94901961,
+        green: 0.80392157,
+        blue: 0.80392157,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Mocha-Green.ron b/themes/cosmic-settings/catppuccin-mocha-green+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Green.ron
rename to themes/cosmic-settings/catppuccin-mocha-green+round.ron
index 0a1ade0..45b904f 100644
--- a/cosmic-settings/Catppuccin-Mocha-Green.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-green+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Mocha-Lavender.ron b/themes/cosmic-settings/catppuccin-mocha-lavender+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Lavender.ron
rename to themes/cosmic-settings/catppuccin-mocha-lavender+round.ron
index 11aa1a3..3a98c19 100644
--- a/cosmic-settings/Catppuccin-Mocha-Lavender.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-lavender+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.70588235,
         green: 0.74509804,
         blue: 0.99607843,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.70588235,
         green: 0.74509804,
         blue: 0.99607843,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-mocha-maroon+round.ron b/themes/cosmic-settings/catppuccin-mocha-maroon+round.ron
new file mode 100644
index 0000000..e0ae959
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-maroon+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Maroon",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.92156863,
+        green: 0.62745098,
+        blue: 0.67450980,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.92156863,
+        green: 0.62745098,
+        blue: 0.67450980,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Mocha-Mauve.ron b/themes/cosmic-settings/catppuccin-mocha-mauve+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Mauve.ron
rename to themes/cosmic-settings/catppuccin-mocha-mauve+round.ron
index da1ed17..622c9de 100644
--- a/cosmic-settings/Catppuccin-Mocha-Mauve.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-mauve+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.79607843,
         green: 0.65098039,
         blue: 0.96862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.79607843,
         green: 0.65098039,
         blue: 0.96862745,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Mocha-Peach.ron b/themes/cosmic-settings/catppuccin-mocha-peach+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Peach.ron
rename to themes/cosmic-settings/catppuccin-mocha-peach+round.ron
index 8f574ac..a8d20db 100644
--- a/cosmic-settings/Catppuccin-Mocha-Peach.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-peach+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.98039216,
         green: 0.70196078,
         blue: 0.52941176,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.98039216,
         green: 0.70196078,
         blue: 0.52941176,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Mocha-Pink.ron b/themes/cosmic-settings/catppuccin-mocha-pink+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Pink.ron
rename to themes/cosmic-settings/catppuccin-mocha-pink+round.ron
index 459ac84..1467f37 100644
--- a/cosmic-settings/Catppuccin-Mocha-Pink.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-pink+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.96078431,
         green: 0.76078431,
         blue: 0.90588235,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.96078431,
         green: 0.76078431,
         blue: 0.90588235,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/cosmic-settings/Catppuccin-Mocha-Red.ron b/themes/cosmic-settings/catppuccin-mocha-red+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Red.ron
rename to themes/cosmic-settings/catppuccin-mocha-red+round.ron
index 15a290c..30c1f09 100644
--- a/cosmic-settings/Catppuccin-Mocha-Red.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-red+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-settings/catppuccin-mocha-rosewater+round.ron b/themes/cosmic-settings/catppuccin-mocha-rosewater+round.ron
new file mode 100644
index 0000000..18060dc
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-rosewater+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Rosewater",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.96078431,
+        green: 0.87843137,
+        blue: 0.86274510,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.96078431,
+        green: 0.87843137,
+        blue: 0.86274510,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-mocha-sapphire+round.ron b/themes/cosmic-settings/catppuccin-mocha-sapphire+round.ron
new file mode 100644
index 0000000..f60e6af
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-sapphire+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Sapphire",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.45490196,
+        green: 0.78039216,
+        blue: 0.92549020,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.45490196,
+        green: 0.78039216,
+        blue: 0.92549020,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-mocha-sky+round.ron b/themes/cosmic-settings/catppuccin-mocha-sky+round.ron
new file mode 100644
index 0000000..c1e84dc
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-sky+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Sky",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.53725490,
+        green: 0.86274510,
+        blue: 0.92156863,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.53725490,
+        green: 0.86274510,
+        blue: 0.92156863,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/themes/cosmic-settings/catppuccin-mocha-teal+round.ron b/themes/cosmic-settings/catppuccin-mocha-teal+round.ron
new file mode 100644
index 0000000..cc7cb92
--- /dev/null
+++ b/themes/cosmic-settings/catppuccin-mocha-teal+round.ron
@@ -0,0 +1,310 @@
+(
+    palette: Dark((
+        name: "Catppuccin-Mocha-Teal",
+        blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        gray_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        gray_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        gray_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_0: (
+            red: 0.06666667,
+            green: 0.06666667,
+            blue: 0.10588235,
+            alpha: 1.0,
+        ),
+        neutral_1: (
+            red: 0.09411765,
+            green: 0.09411765,
+            blue: 0.14509804,
+            alpha: 1.0,
+        ),
+        neutral_2: (
+            red: 0.11764706,
+            green: 0.11764706,
+            blue: 0.18039216,
+            alpha: 1.0,
+        ),
+        neutral_3: (
+            red: 0.19215686,
+            green: 0.19607843,
+            blue: 0.26666667,
+            alpha: 1.0,
+        ),
+        neutral_4: (
+            red: 0.27058824,
+            green: 0.27843137,
+            blue: 0.35294118,
+            alpha: 1.0,
+        ),
+        neutral_5: (
+            red: 0.34509804,
+            green: 0.35686275,
+            blue: 0.43921569,
+            alpha: 1.0,
+        ),
+        neutral_6: (
+            red: 0.42352941,
+            green: 0.43921569,
+            blue: 0.52549020,
+            alpha: 1.0,
+        ),
+        neutral_7: (
+            red: 0.49803922,
+            green: 0.51764706,
+            blue: 0.61176471,
+            alpha: 1.0,
+        ),
+        neutral_8: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        neutral_9: (
+            red: 0.65098039,
+            green: 0.67843137,
+            blue: 0.78431373,
+            alpha: 1.0,
+        ),
+        neutral_10: (
+            red: 0.72941176,
+            green: 0.76078431,
+            blue: 0.87058824,
+            alpha: 1.0,
+        ),
+        bright_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        bright_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        bright_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        ext_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        ext_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        ext_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        ext_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        ext_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        ext_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+        accent_blue: (
+            red: 0.53725490,
+            green: 0.70588235,
+            blue: 0.98039216,
+            alpha: 1.0,
+        ),
+        accent_red: (
+            red: 0.95294118,
+            green: 0.54509804,
+            blue: 0.65882353,
+            alpha: 1.0,
+        ),
+        accent_green: (
+            red: 0.65098039,
+            green: 0.89019608,
+            blue: 0.63137255,
+            alpha: 1.0,
+        ),
+        accent_warm_grey: (
+            red: 0.57647059,
+            green: 0.60000000,
+            blue: 0.69803922,
+            alpha: 1.0,
+        ),
+        accent_orange: (
+            red: 0.98039216,
+            green: 0.70196078,
+            blue: 0.52941176,
+            alpha: 1.0,
+        ),
+        accent_yellow: (
+            red: 0.97647059,
+            green: 0.88627451,
+            blue: 0.68627451,
+            alpha: 1.0,
+        ),
+        accent_purple: (
+            red: 0.70588235,
+            green: 0.74509804,
+            blue: 0.99607843,
+            alpha: 1.0,
+        ),
+        accent_pink: (
+            red: 0.96078431,
+            green: 0.76078431,
+            blue: 0.90588235,
+            alpha: 1.0,
+        ),
+        accent_indigo: (
+            red: 0.79607843,
+            green: 0.65098039,
+            blue: 0.96862745,
+            alpha: 1.0,
+        ),
+    )),
+    spacing: (
+        space_none: 0,
+        space_xxxs: 4,
+        space_xxs: 8,
+        space_xs: 12,
+        space_s: 16,
+        space_m: 24,
+        space_l: 32,
+        space_xl: 48,
+        space_xxl: 64,
+        space_xxxl: 128,
+    ),
+    corner_radii: (
+        radius_0: (0.0, 0.0, 0.0, 0.0),
+        radius_xs: (4.0, 4.0, 4.0, 4.0),
+        radius_s: (8.0, 8.0, 8.0, 8.0),
+        radius_m: (16.0, 16.0, 16.0, 16.0),
+        radius_l: (32.0, 32.0, 32.0, 32.0),
+        radius_xl: (160.0, 160.0, 160.0, 160.0),
+    ),
+    bg_color: Some((
+        red: 0.11764706,
+        green: 0.11764706,
+        blue: 0.18039216,
+        alpha: 1.00000000,
+    )),
+    text_tint: Some((
+        red: 0.80392157,
+        green: 0.83921569,
+        blue: 0.95686275,
+        alpha: 1.00000000,
+    )),
+    accent: Some((
+        red: 0.58039216,
+        green: 0.88627451,
+        blue: 0.83529412,
+        alpha: 1.00000000,
+    )),
+    success: Some((
+        red: 0.65098039,
+        green: 0.89019608,
+        blue: 0.63137255,
+        alpha: 1.00000000,
+    )),
+    warning: Some((
+        red: 0.97647059,
+        green: 0.88627451,
+        blue: 0.68627451,
+        alpha: 1.00000000,
+    )),
+    destructive: Some((
+        red: 0.95294118,
+        green: 0.54509804,
+        blue: 0.65882353,
+        alpha: 1.00000000,
+    )),
+    window_hint: Some((
+        red: 0.58039216,
+        green: 0.88627451,
+        blue: 0.83529412,
+        alpha: 1.00000000,
+    )),
+    neutral_tint: Some((
+        red: 0.49803922,
+        green: 0.51764706,
+        blue: 0.61176471,
+        alpha: 1.00000000,
+    )),
+    primary_container_bg: Some((
+        red: 0.19215686,
+        green: 0.19607843,
+        blue: 0.26666667,
+        alpha: 1.00000000,
+    )),
+    secondary_container_bg: Some((
+        red: 0.27058824,
+        green: 0.27843137,
+        blue: 0.35294118,
+        alpha: 1.00000000,
+    )),
+    is_frosted: false,
+    gaps: (0, 8),
+    active_hint: 3,
+)
diff --git a/cosmic-settings/Catppuccin-Mocha-Yellow.ron b/themes/cosmic-settings/catppuccin-mocha-yellow+round.ron
similarity index 96%
rename from cosmic-settings/Catppuccin-Mocha-Yellow.ron
rename to themes/cosmic-settings/catppuccin-mocha-yellow+round.ron
index f79dd10..2f71afa 100644
--- a/cosmic-settings/Catppuccin-Mocha-Yellow.ron
+++ b/themes/cosmic-settings/catppuccin-mocha-yellow+round.ron
@@ -248,61 +248,61 @@
         red: 0.11764706,
         green: 0.11764706,
         blue: 0.18039216,
-        alpha: 1,
+        alpha: 1.00000000,
     )),
     text_tint: Some((
         red: 0.80392157,
         green: 0.83921569,
         blue: 0.95686275,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     accent: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     success: Some((
         red: 0.65098039,
         green: 0.89019608,
         blue: 0.63137255,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     warning: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     destructive: Some((
         red: 0.95294118,
         green: 0.54509804,
         blue: 0.65882353,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     window_hint: Some((
         red: 0.97647059,
         green: 0.88627451,
         blue: 0.68627451,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     neutral_tint: Some((
         red: 0.49803922,
         green: 0.51764706,
         blue: 0.61176471,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     primary_container_bg: Some((
         red: 0.19215686,
         green: 0.19607843,
         blue: 0.26666667,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     secondary_container_bg: Some((
         red: 0.27058824,
         green: 0.27843137,
         blue: 0.35294118,
-        alpha: 1.0,
+        alpha: 1.00000000,
     )),
     is_frosted: false,
     gaps: (0, 8),
diff --git a/themes/cosmic-term/catppuccin-frappe.ron b/themes/cosmic-term/catppuccin-frappe.ron
new file mode 100644
index 0000000..c31b285
--- /dev/null
+++ b/themes/cosmic-term/catppuccin-frappe.ron
@@ -0,0 +1,37 @@
+(
+    name: "Catppuccin Frappé",
+    foreground: "#c6d0f5",
+    cursor: "#f2d5cf",
+    bright_foreground: "#c6d0f5",
+    dim_foreground: "#737994",
+    normal: (
+        black: "#51576d",
+        red: "#e78284",
+        green: "#a6d189",
+        yellow: "#e5c890",
+        blue: "#8caaee",
+        magenta: "#f4b8e4",
+        cyan: "#81c8be",
+        white: "#b5bfe2"
+    ),
+    bright: (
+        black: "#626880",
+        red: "#e78284",
+        green: "#a6d189",
+        yellow: "#e5c890",
+        blue: "#8caaee",
+        magenta: "#f4b8e4",
+        cyan: "#81c8be",
+        white: "#a5adce"
+    ),
+    dim: (
+        black: "#51576d",
+        red: "#e78284",
+        green: "#a6d189",
+        yellow: "#e5c890",
+        blue: "#8caaee",
+        magenta: "#f4b8e4",
+        cyan: "#81c8be",
+        white: "#b5bfe2"
+    ),
+)
diff --git a/themes/cosmic-term/catppuccin-latte.ron b/themes/cosmic-term/catppuccin-latte.ron
new file mode 100644
index 0000000..ed68283
--- /dev/null
+++ b/themes/cosmic-term/catppuccin-latte.ron
@@ -0,0 +1,37 @@
+(
+    name: "Catppuccin Latte",
+    foreground: "#4c4f69",
+    cursor: "#dc8a78",
+    bright_foreground: "#4c4f69",
+    dim_foreground: "#9ca0b0",
+    normal: (
+        black: "#5c5f77",
+        red: "#d20f39",
+        green: "#40a02b",
+        yellow: "#df8e1d",
+        blue: "#1e66f5",
+        magenta: "#ea76cb",
+        cyan: "#179299",
+        white: "#acb0be"
+    ),
+    bright: (
+        black: "#6c6f85",
+        red: "#d20f39",
+        green: "#40a02b",
+        yellow: "#df8e1d",
+        blue: "#1e66f5",
+        magenta: "#ea76cb",
+        cyan: "#179299",
+        white: "#bcc0cc"
+    ),
+    dim: (
+        black: "#5c5f77",
+        red: "#d20f39",
+        green: "#40a02b",
+        yellow: "#df8e1d",
+        blue: "#1e66f5",
+        magenta: "#ea76cb",
+        cyan: "#179299",
+        white: "#acb0be"
+    ),
+)
diff --git a/themes/cosmic-term/catppuccin-macchiato.ron b/themes/cosmic-term/catppuccin-macchiato.ron
new file mode 100644
index 0000000..b2eb461
--- /dev/null
+++ b/themes/cosmic-term/catppuccin-macchiato.ron
@@ -0,0 +1,37 @@
+(
+    name: "Catppuccin Macchiato",
+    foreground: "#cad3f5",
+    cursor: "#f4dbd6",
+    bright_foreground: "#cad3f5",
+    dim_foreground: "#6e738d",
+    normal: (
+        black: "#494d64",
+        red: "#ed8796",
+        green: "#a6da95",
+        yellow: "#eed49f",
+        blue: "#8aadf4",
+        magenta: "#f5bde6",
+        cyan: "#8bd5ca",
+        white: "#b8c0e0"
+    ),
+    bright: (
+        black: "#5b6078",
+        red: "#ed8796",
+        green: "#a6da95",
+        yellow: "#eed49f",
+        blue: "#8aadf4",
+        magenta: "#f5bde6",
+        cyan: "#8bd5ca",
+        white: "#a5adcb"
+    ),
+    dim: (
+        black: "#494d64",
+        red: "#ed8796",
+        green: "#a6da95",
+        yellow: "#eed49f",
+        blue: "#8aadf4",
+        magenta: "#f5bde6",
+        cyan: "#8bd5ca",
+        white: "#b8c0e0"
+    ),
+)
diff --git a/themes/cosmic-term/catppuccin-mocha.ron b/themes/cosmic-term/catppuccin-mocha.ron
new file mode 100644
index 0000000..22b9702
--- /dev/null
+++ b/themes/cosmic-term/catppuccin-mocha.ron
@@ -0,0 +1,37 @@
+(
+    name: "Catppuccin Mocha",
+    foreground: "#cdd6f4",
+    cursor: "#f5e0dc",
+    bright_foreground: "#cdd6f4",
+    dim_foreground: "#6c7086",
+    normal: (
+        black: "#45475a",
+        red: "#f38ba8",
+        green: "#a6e3a1",
+        yellow: "#f9e2af",
+        blue: "#89b4fa",
+        magenta: "#f5c2e7",
+        cyan: "#94e2d5",
+        white: "#bac2de"
+    ),
+    bright: (
+        black: "#585b70",
+        red: "#f38ba8",
+        green: "#a6e3a1",
+        yellow: "#f9e2af",
+        blue: "#89b4fa",
+        magenta: "#f5c2e7",
+        cyan: "#94e2d5",
+        white: "#a6adc8"
+    ),
+    dim: (
+        black: "#45475a",
+        red: "#f38ba8",
+        green: "#a6e3a1",
+        yellow: "#f9e2af",
+        blue: "#89b4fa",
+        magenta: "#f5c2e7",
+        cyan: "#94e2d5",
+        white: "#bac2de"
+    ),
+)