diff --git a/static/themes/breezy-dark.json b/static/themes/breezy-dark.json
index d447005f..580ce82c 100644
--- a/static/themes/breezy-dark.json
+++ b/static/themes/breezy-dark.json
@@ -1,216 +1,6 @@
 {
   "_pleroma_theme_version": 2,
   "name": "Breezy Dark (beta)",
-  "theme": {
-    "shadows": {
-      "panel": [
-        {
-          "x": "1",
-          "y": "2",
-          "blur": "6",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "topBar": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "popup": [
-        {
-          "x": 2,
-          "y": 2,
-          "blur": 3,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.5
-        }
-      ],
-      "avatar": [
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 8,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.7
-        }
-      ],
-      "avatarStatus": [],
-      "panelHeader": [
-        {
-          "x": 0,
-          "y": "40",
-          "blur": "40",
-          "spread": "-40",
-          "inset": true,
-          "color": "#ffffff",
-          "alpha": "0.1"
-        }
-      ],
-      "button": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": "0",
-          "spread": "1",
-          "color": "#ffffff",
-          "alpha": "0.15",
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonHover": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "--accent",
-          "alpha": "0.3",
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonPressed": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "0",
-          "spread": "50",
-          "color": "--faint",
-          "alpha": 1,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "#ffffff",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "input": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "#FFFFFF",
-          "alpha": "0.2",
-          "inset": true
-        }
-      ]
-    },
-    "colors": {
-      "bg": "#31363b",
-      "underlay": "#000000",
-      "text": "#eff0f1",
-      "lightText": "#ffffff",
-      "accent": "#3daee9",
-      "link": "#3daee9",
-      "faint": "#eff0f1",
-      "lightBg": "#3d4349",
-      "fg": "#31363b",
-      "fgText": "#eff0f1",
-      "fgLink": "#3daee9",
-      "border": "#4c545b",
-      "btn": "#31363b",
-      "btnText": "#eff0f1",
-      "input": "#232629",
-      "inputText": "#ffffff",
-      "panel": "#ff00ff",
-      "panelText": "#eff0f1",
-      "panelLink": "#3daee9",
-      "panelFaint": "#eff0f1",
-      "topBar": "#31363b",
-      "topBarText": "#eff0f1",
-      "topBarLink": "#eff0f1",
-      "faintLink": "#3daee9",
-      "linkBg": "#366681",
-      "icon": "#909396",
-      "cBlue": "#3daee9",
-      "cRed": "#da4453",
-      "cGreen": "#27ae60",
-      "cOrange": "#f67400",
-      "alertError": "#da4453",
-      "alertErrorText": "#eff0f1",
-      "alertErrorPanelText": "#eff0f1",
-      "alertWarning": "#f67400",
-      "alertWarningText": "#eff0f1",
-      "alertWarningPanelText": "#eff0f1",
-      "badgeNotification": "#da4453",
-      "badgeNotificationText": "#ffffff"
-    },
-    "opacity": {
-      "panel": 0,
-      "btn": 1,
-      "border": 1,
-      "bg": 1,
-      "alert": 0.5,
-      "input": 0.5,
-      "faint": 0.5,
-      "underlay": 0.15
-    },
-    "radii": {
-      "btn": "2",
-      "input": "2",
-      "checkbox": "1",
-      "panel": "2",
-      "avatar": "2",
-      "avatarAlt": "2",
-      "tooltip": "2",
-      "attachment": "2"
-    },
-    "fonts": {
-      "interface": {
-        "family": "sans-serif"
-      },
-      "input": {
-        "family": "inherit"
-      },
-      "post": {
-        "family": "inherit"
-      },
-      "postCode": {
-        "family": "monospace"
-      }
-    }
-  },
   "source": {
     "themeEngineVersion": 3,
     "fonts": {},
diff --git a/static/themes/breezy-light.json b/static/themes/breezy-light.json
index 243b8593..0c85a3c9 100644
--- a/static/themes/breezy-light.json
+++ b/static/themes/breezy-light.json
@@ -1,216 +1,6 @@
 {
   "_pleroma_theme_version": 2,
   "name": "Breezy Light (beta)",
-  "theme": {
-    "shadows": {
-      "panel": [
-        {
-          "x": "1",
-          "y": "2",
-          "blur": "6",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "topBar": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "popup": [
-        {
-          "x": 2,
-          "y": 2,
-          "blur": 3,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.5
-        }
-      ],
-      "avatar": [
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 8,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.7
-        }
-      ],
-      "avatarStatus": [],
-      "panelHeader": [
-        {
-          "x": 0,
-          "y": "40",
-          "blur": "40",
-          "spread": "-40",
-          "inset": true,
-          "color": "#ffffff",
-          "alpha": "0.1"
-        }
-      ],
-      "button": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": "0",
-          "spread": "1",
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonHover": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "--accent",
-          "alpha": "0.3",
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonPressed": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "0",
-          "spread": "50",
-          "color": "--faint",
-          "alpha": 1,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "#ffffff",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": "1",
-          "y": "1",
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "input": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "#000000",
-          "alpha": "0.2",
-          "inset": true
-        }
-      ]
-    },
-    "colors": {
-      "bg": "#eff0f1",
-      "underlay": "#000000",
-      "text": "#232627",
-      "lightText": "#000000",
-      "accent": "#2980b9",
-      "link": "#2980b9",
-      "faint": "#232627",
-      "lightBg": "#e2e4e6",
-      "fg": "#bcc2c7",
-      "fgText": "#232627",
-      "fgLink": "#2980b9",
-      "border": "#b7bdc3",
-      "btn": "#eff0f1",
-      "btnText": "#232627",
-      "input": "#fcfcfc",
-      "inputText": "#000000",
-      "panel": "#475057",
-      "panelText": "#fcfcfc",
-      "panelLink": "#ffffff",
-      "panelFaint": "#d8dbdc",
-      "topBar": "#475057",
-      "topBarText": "#d8dbdc",
-      "topBarLink": "#eff0f1",
-      "faintLink": "#2980b9",
-      "linkBg": "#a0c4db",
-      "icon": "#898b8c",
-      "cBlue": "#2980b9",
-      "cRed": "#da4453",
-      "cGreen": "#27ae60",
-      "cOrange": "#f67400",
-      "alertError": "#da4453",
-      "alertErrorText": "#232627",
-      "alertErrorPanelText": "#fcfcfc",
-      "alertWarning": "#f67400",
-      "alertWarningText": "#232627",
-      "alertWarningPanelText": "#fcfcfc",
-      "badgeNotification": "#da4453",
-      "badgeNotificationText": "#ffffff"
-    },
-    "opacity": {
-      "panel": 1,
-      "btn": 1,
-      "border": 1,
-      "bg": 1,
-      "alert": 0.5,
-      "input": "1",
-      "faint": 0.5,
-      "underlay": 0.15
-    },
-    "radii": {
-      "btn": "2",
-      "input": "2",
-      "checkbox": "1",
-      "panel": "2",
-      "avatar": "2",
-      "avatarAlt": "2",
-      "tooltip": "2",
-      "attachment": "2"
-    },
-    "fonts": {
-      "interface": {
-        "family": "sans-serif"
-      },
-      "input": {
-        "family": "inherit"
-      },
-      "post": {
-        "family": "inherit"
-      },
-      "postCode": {
-        "family": "monospace"
-      }
-    }
-  },
   "source": {
     "themeEngineVersion": 3,
     "fonts": {},