diff --git a/static/themes/pleroma-dark.json b/static/themes/pleroma-dark.json
index 48e28c74..2703fba1 100644
--- a/static/themes/pleroma-dark.json
+++ b/static/themes/pleroma-dark.json
@@ -1,358 +1,6 @@
 {
   "_pleroma_theme_version": 2,
   "name": "Pleroma Dark",
-  "theme": {
-    "themeEngineVersion": 3,
-    "shadows": {
-      "panel": [
-        {
-          "x": "0",
-          "y": "0",
-          "blur": "3",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.5"
-        },
-        {
-          "x": "0",
-          "y": "4",
-          "blur": "6",
-          "spread": "3",
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.3"
-        }
-      ],
-      "topBar": [
-        {
-          "x": 0,
-          "y": "1",
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.4"
-        },
-        {
-          "x": 0,
-          "y": "2",
-          "blur": "7",
-          "spread": 0,
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.3"
-        }
-      ],
-      "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": "1",
-          "blur": "3",
-          "spread": 0,
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.4"
-        },
-        {
-          "x": "0",
-          "y": "1",
-          "blur": "0",
-          "spread": 0,
-          "inset": true,
-          "color": "#ffffff",
-          "alpha": "0.1"
-        }
-      ],
-      "button": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 2,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 1
-        },
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        }
-      ],
-      "buttonHover": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "1",
-          "spread": "2",
-          "color": "#b9b9ba",
-          "alpha": "0.4",
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        }
-      ],
-      "buttonPressed": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 1,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "2",
-          "spread": 0,
-          "inset": false,
-          "color": "#000000",
-          "alpha": 1
-        }
-      ],
-      "input": [
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 2,
-          "inset": true,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 1
-        }
-      ]
-    },
-    "colors": {
-      "underlay": "#090e14",
-      "bg": "#0f161e",
-      "fg": "#151e2b",
-      "cRed": "#d31014",
-      "cOrange": "#ffc459",
-      "cGreen": "#5dc94a",
-      "cBlue": "#81beea",
-      "accent": "#e2b188",
-      "link": "#e2b188",
-      "text": "#b9b9ba",
-      "badgeNotification": "#e15932",
-      "badgeNotificationText": "#ffffff",
-      "panel": "#151e2b",
-      "panelText": "#b9b9ba",
-      "alertNeutral": "#b9b9ba",
-      "alertNeutralPanelText": "#ffffff",
-      "alertNeutralText": "#ffffff",
-      "alertWarning": "#ffc459",
-      "alertWarningPanelText": "#ffffff",
-      "alertWarningText": "#ffffff",
-      "alertError": "#d31014",
-      "alertErrorPanelText": "#b9b9ba",
-      "alertErrorText": "#f0f0f0",
-      "fgText": "#b9b9ba",
-      "topBar": "#151e2b",
-      "topBarText": "#a0a5aa",
-      "input": "#151e2b",
-      "inputTopbarText": "#a0a5aa",
-      "inputPanelText": "#b9b9ba",
-      "inputText": "#b9b9ba",
-      "btn": "#151e2b",
-      "btnText": "#b9b9ba",
-      "btnTopBarText": "#b9b9ba",
-      "btnDisabled": "#111822",
-      "btnDisabledTopBarText": "#3b4148",
-      "btnPanelText": "#b9b9ba",
-      "btnDisabledPanelText": "#3b4148",
-      "btnDisabledText": "#3b4148",
-      "btnToggled": "#c08f60",
-      "btnToggledTopBarText": "#000000",
-      "btnToggledPanelText": "#000000",
-      "btnToggledText": "#000000",
-      "btnPressed": "#151e2b",
-      "btnPressedTopBarText": "#b9b9ba",
-      "btnPressedTopBar": "#151e2b",
-      "btnPressedPanelText": "#b9b9ba",
-      "btnPressedPanel": "#151e2b",
-      "btnPressedText": "#b9b9ba",
-      "tabActiveText": "#b9b9ba",
-      "tabText": "#b9b9ba",
-      "tab": "#151e2b",
-      "fgLink": "#e2b188",
-      "topBarLink": "#a0a5aa",
-      "panelLink": "#e2b188",
-      "panelFaint": "#b9b9ba",
-      "icon": "#64686c",
-      "poll": "#645449",
-      "pollText": "#ffffff",
-      "border": "#1b232d",
-      "postLink": "#e2b188",
-      "lightText": "#ededed",
-      "popover": "#0f161e",
-      "selectedMenuPopover": "#18232f",
-      "highlight": "#18232f",
-      "highlightText": "#b9b9ba",
-      "selectedMenu": "#18232f",
-      "selectedMenuText": "#b9b9ba",
-      "selectedMenuPopoverIcon": "#696e75",
-      "highlightLink": "#e2b188",
-      "selectedMenuLink": "#e2b188",
-      "selectedMenuPopoverLink": "#e2b188",
-      "selectedMenuPopoverText": "#b9b9ba",
-      "faintLink": "#e2b188",
-      "highlightFaintLink": "#e2b188",
-      "selectedMenuFaintLink": "#e2b188",
-      "selectedMenuPopoverFaintLink": "#e2b188",
-      "faint": "#b9b9ba",
-      "highlightFaintText": "#b9b9ba",
-      "selectedMenuFaintText": "#b9b9ba",
-      "selectedMenuPopoverFaintText": "#b9b9ba",
-      "highlightLightText": "#ededed",
-      "selectedMenuLightText": "#ededed",
-      "selectedMenuPopoverLightText": "#ededed",
-      "selectedMenuIcon": "#696e75",
-      "selectedPost": "#18232f",
-      "selectedPostText": "#b9b9ba",
-      "selectedPostIcon": "#696e75",
-      "selectedPostLink": "#e2b188",
-      "selectedPostFaintLink": "#e2b188",
-      "highlightPostLink": "#e2b188",
-      "selectedPostPostLink": "#e2b188",
-      "selectedPostLightText": "#ededed",
-      "selectedPostFaintText": "#b9b9ba",
-      "popoverText": "#b9b9ba",
-      "popoverIcon": "#64686c",
-      "popoverLink": "#e2b188",
-      "postFaintLink": "#e2b188",
-      "popoverPostFaintLink": "#e2b188",
-      "popoverFaintLink": "#e2b188",
-      "popoverFaintText": "#b9b9ba",
-      "popoverPostLink": "#e2b188",
-      "popoverLightText": "#ededed",
-      "highlightIcon": "#696e75",
-      "highlightPostFaintLink": "#e2b188",
-      "profileTint": "#0f161e",
-      "profileBg": "#070c11"
-    },
-    "opacity": {
-      "underlay": 0.6,
-      "bg": 1,
-      "panel": 1,
-      "alert": 0.5,
-      "input": 0.5,
-      "btn": 1,
-      "faint": 0.5,
-      "border": 1,
-      "popover": 1,
-      "profileTint": 0.5
-    },
-    "radii": {
-      "btn": "3",
-      "input": "3",
-      "checkbox": 2,
-      "panel": "3",
-      "avatar": "3",
-      "avatarAlt": 50,
-      "tooltip": 2,
-      "attachment": "3"
-    },
-    "fonts": {
-      "interface": {
-        "family": "sans-serif"
-      },
-      "input": {
-        "family": "inherit"
-      },
-      "post": {
-        "family": "inherit"
-      },
-      "postCode": {
-        "family": "monospace"
-      }
-    }
-  },
   "source": {
     "themeEngineVersion": 3,
     "fonts": {},
diff --git a/static/themes/pleroma-light.json b/static/themes/pleroma-light.json
index 55cbe28a..05fc300a 100644
--- a/static/themes/pleroma-light.json
+++ b/static/themes/pleroma-light.json
@@ -1,357 +1,6 @@
 {
   "_pleroma_theme_version": 2,
   "name": "Pleroma Light",
-  "theme": {
-    "themeEngineVersion": 3,
-    "shadows": {
-      "panel": [
-        {
-          "x": "0",
-          "y": 1,
-          "blur": "3",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.5"
-        },
-        {
-          "x": "0",
-          "y": "3",
-          "blur": "6",
-          "spread": "1",
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.2"
-        }
-      ],
-      "topBar": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "popup": [
-        {
-          "x": "1",
-          "y": "2",
-          "blur": "2",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.2"
-        },
-        {
-          "x": "1",
-          "y": "3",
-          "blur": "7",
-          "spread": "0",
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.2"
-        }
-      ],
-      "avatar": [
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 8,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.7
-        }
-      ],
-      "avatarStatus": [
-        {
-          "x": 0,
-          "y": "1",
-          "blur": "4",
-          "spread": "0",
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.2"
-        }
-      ],
-      "panelHeader": [
-        {
-          "x": 0,
-          "y": "1",
-          "blur": 0,
-          "spread": 0,
-          "inset": true,
-          "color": "#ffffff",
-          "alpha": "0.5"
-        },
-        {
-          "x": 0,
-          "y": "1",
-          "blur": "3",
-          "spread": 0,
-          "inset": false,
-          "color": "#000000",
-          "alpha": "0.3"
-        }
-      ],
-      "button": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 2,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.2"
-        },
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": "0.5",
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        }
-      ],
-      "buttonHover": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "2",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.2"
-        },
-        {
-          "x": 0,
-          "y": "0",
-          "blur": "1",
-          "spread": "2",
-          "color": "#ffc39f",
-          "alpha": "1",
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        }
-      ],
-      "buttonPressed": [
-        {
-          "x": 0,
-          "y": 0,
-          "blur": 4,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.2"
-        },
-        {
-          "x": 0,
-          "y": 1,
-          "blur": "1",
-          "spread": "2",
-          "color": "#000000",
-          "alpha": "0.3",
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        }
-      ],
-      "input": [
-        {
-          "x": 0,
-          "y": 1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": -1,
-          "blur": 0,
-          "spread": 0,
-          "color": "#FFFFFF",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "x": 0,
-          "y": 0,
-          "blur": "2",
-          "inset": true,
-          "spread": 0,
-          "color": "#000000",
-          "alpha": "0.15"
-        }
-      ]
-    },
-    "colors": {
-      "underlay": "#5d6086",
-      "bg": "#f2f6f9",
-      "fg": "#d6dfed",
-      "cRed": "#d31014",
-      "cOrange": "#ffa500",
-      "cGreen": "#0fa00f",
-      "cBlue": "#0095ff",
-      "accent": "#f55b1b",
-      "link": "#f55b1b",
-      "text": "#304055",
-      "badgeNotification": "#e83802",
-      "badgeNotificationText": "#ffffff",
-      "panel": "#d6dfed",
-      "panelText": "#304055",
-      "alertNeutral": "#304055",
-      "alertNeutralPanelText": "#000000",
-      "alertNeutralText": "#000000",
-      "alertWarning": "#ffa500",
-      "alertWarningPanelText": "#304055",
-      "alertWarningText": "#304055",
-      "alertError": "#d31014",
-      "alertErrorPanelText": "#000000",
-      "alertErrorText": "#000000",
-      "fgText": "#304055",
-      "topBar": "#d6dfed",
-      "topBarText": "#304055",
-      "input": "#dee3ed",
-      "inputTopbarText": "#304055",
-      "inputPanelText": "#304055",
-      "inputText": "#304055",
-      "btn": "#d6dfed",
-      "btnText": "#304055",
-      "btnTopBarText": "#304055",
-      "btnDisabled": "#ebf1f6",
-      "btnDisabledTopBarText": "#bdc5ce",
-      "btnPanelText": "#304055",
-      "btnDisabledPanelText": "#bdc5ce",
-      "btnDisabledText": "#bdc5ce",
-      "btnToggled": "#db9d77",
-      "btnToggledTopBarText": "#304055",
-      "btnToggledPanelText": "#304055",
-      "btnToggledText": "#304055",
-      "btnPressed": "#d6dfed",
-      "btnPressedTopBarText": "#304055",
-      "btnPressedTopBar": "#d6dfed",
-      "btnPressedPanelText": "#304055",
-      "btnPressedPanel": "#d6dfed",
-      "btnPressedText": "#304055",
-      "tabActiveText": "#304055",
-      "tabText": "#304055",
-      "tab": "#d6dfed",
-      "fgLink": "#e44a0a",
-      "topBarLink": "#304055",
-      "panelLink": "#f55b1b",
-      "panelFaint": "#304055",
-      "icon": "#919ba7",
-      "poll": "#f4b8a1",
-      "pollText": "#304055",
-      "border": "#d8e6f9",
-      "postLink": "#e44a0a",
-      "lightText": "#0c0f14",
-      "popover": "#f2f6f9",
-      "selectedMenuPopover": "#e1eaf1",
-      "highlight": "#e1eaf1",
-      "highlightText": "#304055",
-      "selectedMenu": "#e1eaf1",
-      "selectedMenuText": "#304055",
-      "selectedMenuPopoverIcon": "#8995a3",
-      "highlightLink": "#e44a0a",
-      "selectedMenuLink": "#f55b1b",
-      "selectedMenuPopoverLink": "#e44a0a",
-      "selectedMenuPopoverText": "#304055",
-      "faintLink": "#f55b1b",
-      "highlightFaintLink": "#e44a0a",
-      "selectedMenuFaintLink": "#f55b1b",
-      "selectedMenuPopoverFaintLink": "#e44a0a",
-      "faint": "#304055",
-      "highlightFaintText": "#304055",
-      "selectedMenuFaintText": "#304055",
-      "selectedMenuPopoverFaintText": "#304055",
-      "highlightLightText": "#0c0f14",
-      "selectedMenuLightText": "#0c0f14",
-      "selectedMenuPopoverLightText": "#0c0f14",
-      "selectedMenuIcon": "#8995a3",
-      "selectedPost": "#e1eaf1",
-      "selectedPostText": "#304055",
-      "selectedPostIcon": "#8995a3",
-      "selectedPostLink": "#f55b1b",
-      "selectedPostFaintLink": "#f55b1b",
-      "highlightPostLink": "#f55b1b",
-      "selectedPostPostLink": "#e44a0a",
-      "selectedPostLightText": "#0c0f14",
-      "selectedPostFaintText": "#304055",
-      "popoverText": "#304055",
-      "popoverIcon": "#919ba7",
-      "popoverLink": "#e44a0a",
-      "postFaintLink": "#e44a0a",
-      "popoverPostFaintLink": "#f55b1b",
-      "popoverFaintLink": "#e44a0a",
-      "popoverFaintText": "#304055",
-      "popoverPostLink": "#f55b1b",
-      "popoverLightText": "#0c0f14",
-      "highlightIcon": "#8995a3",
-      "highlightPostFaintLink": "#f55b1b",
-      "profileTint": "#f2f6f9",
-      "profileBg": "#808992"
-    },
-    "opacity": {
-      "underlay": 0.4,
-      "bg": 1,
-      "panel": 1,
-      "alert": 0.5,
-      "input": 0.5,
-      "btn": 1,
-      "faint": 0.5,
-      "border": 1,
-      "popover": 1,
-      "profileTint": 0.5
-    },
-    "radii": {
-      "btn": "3",
-      "input": "3",
-      "checkbox": 2,
-      "panel": "3",
-      "avatar": "3",
-      "avatarAlt": 50,
-      "tooltip": 2,
-      "attachment": "3"
-    },
-    "fonts": {
-      "interface": {
-        "family": "sans-serif"
-      },
-      "input": {
-        "family": "inherit"
-      },
-      "post": {
-        "family": "inherit"
-      },
-      "postCode": {
-        "family": "monospace"
-      }
-    }
-  },
   "source": {
     "themeEngineVersion": 3,
     "fonts": {},