Use akkoma maybe

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-11-30 16:52:16 +01:00 · 2022-11-30 16:52:16 +01:00 · b343a88d77
commit b343a88d77
parent 93585ed1a4
93 changed files with 2524 additions and 1441 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,41 @@
+kind: pipeline
+type: docker
+name: Deploy
+
+clone:
+  disable: true
+
+steps:
+  - name: Clone
+    image: woodpeckerci/plugin-git
+    settings:
+      recursive: true
+
+  - name: Build
+    depends_on:
+      - Clone
+    image: node:16
+    commands:
+      - yarn
+      - yarn build
+    when:
+      event:
+        - push
+
+  - name: Execute deploy script
+    depends_on:
+      - Build
+    image: ubuntu:latest
+    environment:
+      SSH_KEY:
+        from_secret: SSH_KEY
+    commands:
+      - apt update && apt install -y openssh-client rsync
+      - ./ci/add-key.sh
+      - ./ci/deploy.sh
+    when:
+      event:
+        - push
+      branch:
+        - froth
+        - froth-akkoma
--- a/.gitignore
+++ b/.gitignore
@ -9,4 +9,6 @@ selenium-debug.log
 config/local.json
 config/local.*.json
 docs/site/
-.vscode/
+.vscode/
+
+.dccache
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,9 @@
+[submodule "instance/pleroma-mods/pleroma-mod-syntax"]
+	path = instance/pleroma-mods/pleroma-mod-syntax
+	url = https://git.pleroma.social/absturztaube/pleroma-mod-syntax.git
+[submodule "instance/pleroma-mods/pleroma-mod-imgsearch"]
+	path = instance/pleroma-mods/pleroma-mod-imgsearch
+	url = https://gitlab.com/SamTherapy/pleroma-mod-imgsearch
+[submodule "instance/pleroma-mods/pleroma-mod-math"]
+	path = instance/pleroma-mods/pleroma-mod-math
+	url = https://git.pleroma.social/absturztaube/pleroma-mod-math
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,81 +0,0 @@
-pipeline:
-  lint:
-    when:
-      event:
-      - pull_request
-    image: node:18
-    commands:
-    - yarn
-    - yarn lint
-    #- yarn stylelint
-
-  test:
-    when:
-      event:
-      - pull_request
-    image: node:18
-    commands:
-    - apt update
-    - apt install firefox-esr -y --no-install-recommends
-    - yarn 
-    - yarn unit
-
-  build:
-    when:
-      event:
-      - push
-      branch:
-      - develop
-      - stable
-    image: node:18
-    commands:
-    - yarn
-    - yarn build
-
-  release:
-    when:
-      event:
-      - push
-      branch:
-      - develop
-      - stable
-    image: node:18
-    secrets:
-    - SCW_ACCESS_KEY
-    - SCW_SECRET_KEY
-    - SCW_DEFAULT_ORGANIZATION_ID
-    commands:
-      - apt-get update && apt-get install -y rclone wget zip
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
-      - chmod +x scaleway-cli
-      - ./scaleway-cli object config install type=rclone
-      - zip akkoma-fe.zip -r dist
-      - rclone copyto akkoma-fe.zip scaleway:akkoma-updates/frontend/$CI_COMMIT_BRANCH/akkoma-fe.zip
-
-  docs:
-    when:
-      event:
-      - push
-      branch:
-      - develop
-      - stable
-    environment:
-      CI: "true"
-    image: python:3.10-slim
-    secrets:
-    - SCW_ACCESS_KEY
-    - SCW_SECRET_KEY
-    - SCW_DEFAULT_ORGANIZATION_ID
-    commands:
-    - apt-get update && apt-get install -y rclone wget git zip
-    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-    - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
-    - chmod +x scaleway-cli
-    - ./scaleway-cli object config install type=rclone
-    - cd docs
-    - pip install -r requirements.txt
-    - mkdocs build
-    - zip -r docs.zip site/*
-    - cd site
-    - rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,24 +0,0 @@
-# Akkoma Code of Conduct
-
-The Akkoma project aims to be **enjoyable** for anyone to participate in, regardless of their identity or level of expertise. To achieve this, the community must create an environment which is **safe** and **equitable**; the following guidelines have been created with these goals in mind.
-
-1. **Treat individuals with respect.** Differing experiences and viewpoints deserve to be respected, and bigotry and harassment are not tolerated under any circumstances.
-    - Individuals should at all times be treated as equals, regardless of their age, gender, sexuality, race, ethnicity, _or any other characteristic_, intrinsic or otherwise.
-    - Behaviour that is harmful in nature should be addressed and corrected *regardless of intent*.
-    - Respect personal boundaries and ask for clarification whenever they are unclear.
-    - (Obviously, hate does not count as merely a "differing viewpoint", because it is harmful in nature.)
-
-2. **Be understanding of differences in communication.** Not everyone is aware of unspoken social cues, and speech that is not intended to be offensive should not be treated as such simply due to an atypical manner of communication.
-    - Somebody who speaks bluntly is not necessarily rude, and somebody who swears a lot is not necessarily volatile.
-    - Try to confirm your interpretation of their intent rather than assuming bad faith.
-    - Someone may not communicate as, or come across as a picture of "professionalism", but this should not be seen as a reason to dismiss them. This is a **casual** space, and communication styles can reflect that.
-
-3. **"Uncomfortable" does not mean "unsafe".** In an ideal world, the community would be safe, equitable, enjoyable, *and* comfortable for all members at all times. Unfortunately, this is not always possible in reality.
-    - Safety and equity will be prioritized over comfort whenever it is necessary to do so.
-    - Weaponizing one's own discomfort to deflect accountability or censor an individual (e.g. "white fragility") is a form of discriminatory conduct.
-
-4. **Let people grow from their mistakes.** Nobody is perfect; even the most well-meaning individual can do something hurtful. Everyone should be given a fair opportunity to explain themselves and correct their behaviour. Portraying someone as inherently malicious prevents improvement and shifts focus away from the *action* that was problematic.
-    - Avoid bringing up past events that do not accurately reflect an individual's current actions or beliefs. (This is, of course, different from providing evidence of a recurring pattern of behaviour.)
-
---
-This document was adapted from one created by ~keith as part of punks default repository template, and is licensed under CC-BY-SA 4.0. The original template is here: <https://bytes.keithhacks.cyou/keith/default-template>
--- a/COFE_OF_CONDUCT.md
+++ b/COFE_OF_CONDUCT.md
@ -0,0 +1,49 @@
+```
+                                    o$$$$$$oo
+                                 o$"        "$oo
+                                 $   o""""$o  "$o
+                                "$  o  "o  "o   $
+                                "$   $o $   $   o$
+                                 "$       o$"$  o$
+                                  "$ooooo$$  $  o$
+                        o$ """ $     " $$$   "  $
+                      o$        $o    $$"   "   "
+                     $$  $ " $   $$$o"$    o  o$"
+                     $"  o "" $   $" "   o"  $$
+                     $o  " "  $  o$"   o"  o$"
+                      "$o    $$  $   o"  o$$"
+                       ""o$o"$"  $oo"  o$"
+                        o$$ $   $$$  o$$
+                        o" o oo""  "" "$o
+                       o$o" ""          $
+                      $" " o"   " " "   "o
+                     $$ "  "  o$ o$o "   $
+                    o$ $  $  o$$ "  "   ""
+                    o  $ $"  " "o      o$
+                    $ o         $o$oo$""
+                   $o $   o  o  o"$$
+                   $o  o  $  $    "$o
+                   $o  $   o  $  $ "o
+                    $  $   "o  $  "o"$o
+                    $   "   o   $   o $$
+            $o$o$o$o$$o$$$o$$o$o$$o$$o$$$o$o$o$o$o$o$o$o$o$ooo
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$   " $$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$      "$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$     o$$$$"
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ooooo$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"""""
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+"$o$o$o$o$o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+  "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+    "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"""
+       """""""""""""""""""""""""""""""""""""""""""""""""""""
+```
--- a/ci/add-key.sh
+++ b/ci/add-key.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+# only execute this script as part of the pipeline.
+[ -z "$CI" ] && echo "missing ci environment variable" && exit 2
+
+# only execute the script when github token exists.
+[ -z "$SSH_KEY" ] && echo "missing ssh key" && exit 3
+
+# write the ssh key.
+mkdir /root/.ssh
+echo -n "${SSH_KEY}" > /root/.ssh/id_ed25519
+chmod 600 /root/.ssh/id_ed25519
+
+# add froth.zone to our known hosts.
+touch /root/.ssh/known_hosts
+chmod 600 /root/.ssh/known_hosts
+ssh-keyscan -H froth.zone > /etc/ssh/ssh_known_hosts 2> /dev/null
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+TARGET="pleroma@froth.zone:/opt/pleroma"
+
+#rsync -ra public/ "${TARGET}/instance/static"
+#cp dist/index.html  "${TARGET}/instance/static/index.html"
+rsync --update -Pr dist/ "${TARGET}/instance/static/"
+rsync --update -ra dist/static/ "${TARGET}/instance/static/static"
+#rsync --delete -ra images/ "${TARGET}/instance/static/images"
+#rsync --delete -ra sounds/ "${TARGET}/instance/static/sounds"
+rsync -ra instance/ "${TARGET}/instance/static/instance"
+#rsync --delete -ra pages/ "${TARGET}/instance/static/pages"
--- a/index.html
+++ b/index.html
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
-    <title>Akkoma</title>
+    <title>The Froth Zone</title>
    <link rel="stylesheet" href="/static/font/css/fontello.css">
    <link rel="stylesheet" href="/static/font/css/animation.css">
    <link rel="stylesheet" href="/static/font/tiresias.css">
@ -14,7 +14,7 @@
    <link rel="manifest" href="/manifest.json">
  </head>
  <body class="hidden">
-    <noscript>To use Akkoma, please enable JavaScript.</noscript>
+    <noscript>To use The Froth Zone, please enable JavaScript.</noscript>
    <div id="app"></div>
    <div id="modal"></div>
    <!-- built files will be auto injected -->
--- a/instance/favicon.png
+++ b/instance/favicon.png
--- a/instance/panel.html
+++ b/instance/panel.html
@ -0,0 +1,33 @@
+<div style="margin-left: 12px; margin-right: 12px">
+  <p style="text-align: center">
+    Welcome to the Froth Zone!
+    <br />
+    <br />
+    Now available on
+    <a href="https://froth.oz" rel="noopener noreferrer nofollow">OpenNIC</a>!
+    (Functionality not guaranteed)
+    <br />
+    <br />
+    <a href="https://bloat.froth.zone" rel="noopener noreferrer nofollow">Bloat FE</a>
+    |
+    <a href="https://glitch.froth.zone" rel="noopener noreferrer nofollow">Masto FE</a>
+    |
+    <a href="/main/all" rel="noopener noreferrer nofollow">Pleroma FE</a>
+    |
+    <a href="https://soap.froth.zone" rel="noopener noreferrer nofollow">Soapbox FE</a>
+    |
+    <a href="https://treebird.froth.zone" rel="noopener noreferrer nofollow">Treebird FE</a>
+    <br />
+    <br />
+    <a href="https://git.froth.zone" rel="noopener noreferrer nofollow">Gitea</a>
+    |
+    <a href="https://funkwhale.samtherapy.net" rel="noopener noreferrer nofollow">Funkwhale</a>
+    |
+    <a href="https://mk.froth.zone" rel="noopener noreferrer nofollow">Misskey</a>
+    |
+    <a href="https://tube.froth.zone" rel="noopener noreferrer nofollow">PeerTube</a>
+    <br />
+    <br />
+    <a href="https://status.froth.zone/status" rel="noopener noreferrer nofollow">Everything else I host</a>
+  </p>
+</div>
--- a/instance/pleroma-mod-config.json
+++ b/instance/pleroma-mod-config.json
@ -0,0 +1,7 @@
+{
+    "modDirectory": "/instance/pleroma-mods/",
+    "mods": [
+	    "math",
+        "syntax"
+    ]
+}
--- a/instance/pleroma-mod-loader.js
+++ b/instance/pleroma-mod-loader.js
@ -0,0 +1,479 @@
+class PleromaModLoader {
+  constructor () {
+    this.config = {
+      modDirectory: '/instance/pleroma-mods/',
+      mods: []
+    }
+    this.loadConfig()
+    this.loadedMods = {}
+    this.classes = {}
+  }
+
+  loadMods () {
+    this.config.mods.forEach((mod) => {
+      this.loadMod(mod)
+    })
+  }
+
+  loadMod (modName) {
+    return PleromaModLoader.includeScript(
+      this.config.modDirectory + 'pleroma-mod-' + modName + '/mod.js'
+    ).then(() => {
+      this.loadedMods[modName] = new this.classes[PleromaModLoader.getClassName(modName)]()
+    })
+  }
+
+  loadConfig () {
+    window.fetch('/instance/pleroma-mod-config.json').then((response) => {
+      return response.json()
+    }).then((json) => {
+      Object.keys(json).forEach((key) => {
+        this.config[key] = json[key]
+      })
+      this.loadMods()
+    }).catch((error) => {
+      console.error("can't load loader config")
+      console.error(error)
+    })
+  }
+
+  registerClass (className, object) {
+    this.classes[className] = object
+  }
+
+  waitUntilReady () {
+    const postPanel = document.querySelector('.status-container')
+    const loginPanel = document.querySelector('.login-form')
+    if (postPanel || loginPanel) {
+      Object.keys(this.loadedMods).forEach((modName) => {
+        const settings = document.querySelector('.settings-modal div[label]:first-child')
+        if (settings) {
+          if (!settings.querySelector('.mod-settings')) {
+            this.appendModSettings(settings)
+          }
+        }
+
+        const mod = this.loadedMods[modName]
+        if (mod.isEnabled) {
+          mod.ready()
+        }
+      })
+
+      this.createObserver()
+    } else {
+      console.warn('not ready, trying again in 1s')
+      window.setTimeout(() => { this.waitUntilReady() }, 1000)
+    }
+  }
+
+  createCheckbox (label, mod) {
+    const labelElement = document.createElement('label')
+    labelElement.classList.add('checkbox')
+
+    const input = document.createElement('input')
+    input.setAttribute('type', 'checkbox')
+    input.checked = mod.isEnabled
+    input.addEventListener('change', (event) => {
+      if (event.target.checked) {
+        mod.enable()
+      } else {
+        mod.disable()
+      }
+    })
+    labelElement.appendChild(input)
+
+    const fakeCheckbox = document.createElement('i')
+    fakeCheckbox.classList.add('checkbox-indicator')
+    labelElement.appendChild(fakeCheckbox)
+
+    const text = document.createElement('span')
+    text.classList.add('label')
+    text.innerText = label
+    labelElement.appendChild(text)
+
+    return labelElement
+  }
+
+  appendModSettings (element) {
+    const container = document.createElement('div')
+    container.classList.add('setting-item')
+    container.classList.add('mod-settings')
+
+    const title = document.createElement('h2')
+    title.innerText = 'Pleroma Mods'
+    container.appendChild(title)
+
+    const optionList = document.createElement('ul')
+    optionList.classList.add('setting-list')
+
+    Object.keys(this.loadedMods).sort().forEach((modName) => {
+      const li = document.createElement('li')
+
+      const enable = this.createCheckbox('enable ' + modName, this.loadedMods[modName])
+      li.appendChild(enable)
+
+      const ulConfig = document.createElement('ul')
+      ulConfig.classList.add('setting-list')
+
+      Object.keys(this.loadedMods[modName].config).forEach((key) => {
+        if (key === 'includes' || key === 'filter') {
+          return
+        }
+
+        this.loadedMods[modName].onSettingInit(key, ulConfig, document.createElement('li'))
+      })
+
+      li.appendChild(ulConfig)
+
+      optionList.appendChild(li)
+    })
+
+    container.appendChild(optionList)
+
+    element.appendChild(container)
+  }
+
+  createObserver () {
+    this.containers = {
+      main: document.querySelector('.main'),
+      notifications: document.querySelector('.notifications'),
+      userPanel: document.querySelector('.user-panel'),
+      settingsModal: document.querySelector('.settings-modal')
+    }
+
+    const observerConfig = {
+      subtree: true,
+      childList: true
+    }
+
+    this.observer = new MutationObserver((mutations, observer) => {
+      const modal = document.querySelector('.settings-modal div[label]:first-child')
+      if (modal && !modal.querySelector('.mod-settings')) {
+        this.appendModSettings(modal)
+      }
+
+      Object.values(this.loadedMods).forEach((mod) => {
+        if (mod.isEnabled) {
+          mutations.forEach((mutation) => {
+            mod.mutate(mutation, observer)
+          })
+        }
+      })
+    })
+
+    this.observer.observe(this.containers.main, observerConfig)
+    if (this.containers.notifications) {
+      this.observer.observe(this.containers.notifications, observerConfig)
+    }
+    if (this.containers.userPanel) {
+      this.observer.observe(this.containers.userPanel, observerConfig)
+    }
+    if (this.containers.settingsModal) {
+      this.observer.observe(this.containers.settingsModal, observerConfig)
+    }
+  }
+
+  static registerMod (mod) {
+    window.__pleromaModLoader.registerClass(mod.name, mod)
+  }
+
+  static includeScript (src) {
+    console.log('include ' + src)
+    return new Promise((resolve) => {
+      const script = document.createElement('script')
+      script.setAttribute('src', src)
+      script.setAttribute('type', 'text/javascript')
+      script.onload = () => {
+        resolve()
+      }
+      document.querySelector('body').appendChild(script)
+    })
+  }
+
+  static includeCss (src) {
+    console.log('include ' + src)
+    return new Promise((resolve) => {
+      const link = document.createElement('link')
+      link.setAttribute('href', src)
+      link.setAttribute('rel', 'stylesheet')
+      link.setAttribute('type', 'text/css')
+      link.onload = () => {
+        resolve()
+      }
+      document.querySelector('head').appendChild(link)
+    })
+  }
+
+  static excludeScript (src) {
+    return new Promise((resolve) => {
+      const script = document.querySelector('script[src="' + src + '"]')
+      if (script) {
+        script.remove()
+      }
+      resolve()
+    })
+  }
+
+  static excludeCss (src) {
+    return new Promise((resolve) => {
+      const link = document.querySelector('link[href="' + src + '"]')
+      if (link) {
+        link.remove()
+      }
+      resolve()
+    })
+  }
+
+  static getVueScope (element) {
+    if (!element) {
+      return null
+    }
+    if (element.__vue__) {
+      console.warn('old vue version, please update pleroma-fe')
+      return element.__vue__
+    }
+    if (element._vnode) {
+      return element._vnode
+    }
+    if (element.__vnode) {
+      return element.__vnode
+    }
+    if (element.parentNode) {
+      return PleromaModLoader.getVueScope(element.parentNode)
+    }
+    return null
+  }
+
+  static getVueComponent (element) {
+    if (!element) {
+      return null
+    }
+    if (element.__vnode && element.__vnode.component) {
+      return element.__vnode.component
+    }
+    if (element.__vueParentComponent) {
+      return element.__vueParentComponent.ctx
+    }
+    if (element.__vueComponent__) {
+      return element.__vueComponent__
+    }
+    if (element.parentNode) {
+      return PleromaModLoader.getVueComponent(element.parentNode)
+    }
+    return null
+  }
+
+  static getRootVueScope () {
+    return PleromaModLoader.getVueScope(document.querySelector('#app'))
+  }
+
+  static getToken () {
+    return PleromaModLoader.getRootVueScope().appContext.provides.store.getters.getUserToken()
+  }
+
+  static getModDir () {
+    return window.__pleromaModLoader.config.modDirectory
+  }
+
+  static getClassName (name) {
+    let className = 'PleromaMod'
+    name.split('-').forEach((namePart) => {
+      className += namePart.substring(0, 1).toUpperCase()
+      className += namePart.substring(1)
+    })
+    return className
+  }
+
+  static api (method, path, params) {
+    return new Promise((resolve, reject) => {
+      const token = PleromaModLoader.getToken()
+      const xhr = new XMLHttpRequest()
+      xhr.responseType = 'json'
+      xhr.open(method, path)
+      xhr.setRequestHeader('Content-Type', 'application/json')
+      xhr.setRequestHeader('Authorization', 'Bearer ' + token)
+      xhr.onreadstatechange = () => {
+        if (xhr.readyState === 4) {
+          if (xhr.status !== 200) {
+            reject(new Error({
+              status: xhr.status,
+              response: xhr.response,
+              xhr
+            }))
+          }
+        }
+      }
+      xhr.onload = () => {
+        resolve(xhr.response)
+      }
+      xhr.send(JSON.stringify(params))
+    })
+  }
+}
+
+class PleromaMod { // eslint-disable-line no-unused-vars
+  constructor (name) {
+    this.name = name
+    this.config = {}
+    this.isRunning = false
+  }
+
+  get isEnabled () {
+    return localStorage.getItem('pleroma_mod_' + this.name + '_enabled') !== 'false' || true
+  }
+
+  getClassName () {
+    return PleromaModLoader.getClassName(this.name)
+  }
+
+  getModDir () {
+    return PleromaModLoader.getModDir() + this.name + '/'
+  }
+
+  ready () {
+    this.onReady()
+    this.run()
+  }
+
+  destroy () {
+    this.isRunning = false
+    if (this.config.includes) {
+      const styles = this.config.includes.css || []
+      const scripts = this.config.includes.js || []
+
+      Promise.all(styles.map((style) => {
+        return this.excludeCss(style)
+      }).concat(scripts.map((script) => {
+        return this.excludeScript(script)
+      }))).then(() => {
+        this.onDestroy()
+      })
+
+      return
+    }
+
+    this.onDestroy()
+  }
+
+  run () {
+    if (this.config.includes) {
+      const styles = this.config.includes.css || []
+      const scripts = this.config.includes.js || []
+
+      Promise.all(styles.map((style) => {
+        return this.includeCss(style)
+      }).concat(scripts.map((script) => {
+        return this.includeScript(script)
+      })).concat([
+        this.loadConfig(),
+        this.onCreate()
+      ])).then(() => {
+        this.isRunning = true
+        this.onRun()
+      })
+
+      return
+    }
+
+    this.isRunning = true
+    this.onRun()
+  }
+
+  mutate (mutation, observer) {
+    if (this.isRunning) {
+      this.onMutation(mutation, observer)
+    }
+  }
+
+  saveConfig () {
+    const storedConfig = {}
+    Object.keys(this.config).filter((key) => {
+      return key !== 'includes' && key !== 'filter'
+    }).forEach((key) => {
+      storedConfig[key] = this.config[key]
+    })
+    localStorage.setItem(this.name + '_config', JSON.stringify(storedConfig))
+  }
+
+  mergeConfig (newConfig) {
+    Object.keys(newConfig).forEach((key) => {
+      this.config[key] = JSON.parse(JSON.stringify(newConfig[key]))
+    })
+  }
+
+  loadConfig () {
+    return new Promise((resolve) => {
+      // TODO: use structuredClone when its more supported
+      this.defaultConfig = JSON.parse(JSON.stringify(this.config))
+
+      const storedConfig = JSON.parse(localStorage.getItem(this.name + '_config'))
+
+      this.onConfigLoad().then((json) => {
+        this.mergeConfig(json)
+        if (storedConfig) {
+          this.mergeConfig(storedConfig)
+        }
+        this.saveConfig()
+        resolve()
+      })
+    })
+  }
+
+  onReady () {}
+  onCreate () {
+    return new Promise((resolve) => {
+      resolve()
+    })
+  }
+
+  onDestroy () {}
+  onRun () {}
+  onMutation (mutation, observer) {}
+  onConfigLoad () {
+    return new Promise((resolve) => {
+      resolve({})
+    })
+  }
+
+  onSettingInit (key, ul, li) {}
+
+  includeCss (src) {
+    return PleromaModLoader.includeCss(PleromaModLoader.getModDir() + this.name + '/' + src)
+  }
+
+  includeScript (src) {
+    return PleromaModLoader.includeScript(PleromaModLoader.getModDir() + this.name + '/' + src)
+  }
+
+  excludeCss (src) {
+    return PleromaModLoader.excludeCss(PleromaModLoader.getModDir() + this.name + '/' + src)
+  }
+
+  excludeScript (src) {
+    return PleromaModLoader.excludeScript(PleromaModLoader.getModDir() + this.name + '/' + src)
+  }
+
+  fetchJson (src) {
+    console.log('loading ' + src)
+    return window.fetch(PleromaModLoader.getModDir() + this.name + '/' + src).then((response) => {
+      return response.json()
+    })
+  }
+
+  api (method, path, params) {
+    return PleromaModLoader.api(method, path, params)
+  }
+
+  enable () {
+    this.ready()
+    localStorage.setItem('pleroma_mod_' + this.name + '_enabled', true)
+  }
+
+  disable () {
+    this.destroy()
+    localStorage.setItem('pleroma_mod_' + this.name + '_enabled', false)
+  }
+}
+
+window.__pleromaModLoader = new PleromaModLoader()
+window.__pleromaModLoader.waitUntilReady()
--- a/instance/pleroma-mods/pleroma-mod-imgsearch
+++ b/instance/pleroma-mods/pleroma-mod-imgsearch
@ -0,0 +1 @@
+Subproject commit cfd4dd6404d2df6e07e646aff5ff1d606ed48228
--- a/instance/pleroma-mods/pleroma-mod-math
+++ b/instance/pleroma-mods/pleroma-mod-math
@ -0,0 +1 @@
+Subproject commit 5d7ac570770bd7f1d5cba1279c444b53626add3c
--- a/instance/pleroma-mods/pleroma-mod-syntax
+++ b/instance/pleroma-mods/pleroma-mod-syntax
@ -0,0 +1 @@
+Subproject commit 440dd5dcb4c97d58726a2a52abbe9c54a8b2f3fb
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@ -9,7 +9,7 @@
  </div>
 </template>

-<script src="./about.js" ></script>
+<script src="./about.js"></script>

 <style lang="scss">
 </style>
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -6,7 +6,7 @@
      :bound-to="{ x: 'container' }"
      remove-padding
    >
-      <template v-slot:content>
+      <template #content>
        <div class="dropdown-menu">
          <template v-if="relationship.following">
            <button
@ -71,7 +71,7 @@
          </button>
        </div>
      </template>
-      <template v-slot:trigger>
+      <template #trigger>
        <button class="button-unstyled ellipsis-button">
          <FAIcon
            class="icon"
@ -93,7 +93,7 @@
          keypath="user_card.block_confirm"
          tag="span"
        >
-          <template v-slot:user>
+          <template #user>
            <span
              v-text="user.screen_name_ui"
            />
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@ -14,7 +14,7 @@
  </div>
 </template>

-<script src="./avatar_list.js" ></script>
+<script src="./avatar_list.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@ -22,12 +22,12 @@

 <script>
 export default {
-  emits: ['update:modelValue'],
  props: [
    'modelValue',
    'indeterminate',
    'disabled'
-  ]
+  ],
+  emits: ['update:modelValue']
 }
 </script>

--- a/src/components/color_input/color_input.vue
+++ b/src/components/color_input/color_input.vue
@ -46,7 +46,6 @@
    </div>
  </div>
 </template>
-<style lang="scss" src="./color_input.scss"></style>
 <script>
 import Checkbox from '../checkbox/checkbox.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
@ -108,6 +107,7 @@ export default {
  }
 }
 </script>
+<style lang="scss" src="./color_input.scss"></style>

 <style lang="scss">
 .color-control {
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@ -25,6 +25,8 @@
  </dialog-modal>
 </template>

+<script src="./confirm_modal.js"></script>
+
 <style lang="scss" scoped>
@import '../../_variables';

@ -35,5 +37,3 @@
  }
 }
 </style>
-
-<script src="./confirm_modal.js"></script>
--- a/src/components/domain_mute_card/domain_mute_card.vue
+++ b/src/components/domain_mute_card/domain_mute_card.vue
@ -9,7 +9,7 @@
      class="btn button-default"
    >
      {{ $t('domain_mute_card.unmute') }}
-      <template v-slot:progress>
+      <template #progress>
        {{ $t('domain_mute_card.unmute_progress') }}
      </template>
    </ProgressButton>
@ -19,7 +19,7 @@
      class="btn button-default"
    >
      {{ $t('domain_mute_card.mute') }}
-      <template v-slot:progress>
+      <template #progress>
        {{ $t('domain_mute_card.mute_progress') }}
      </template>
    </ProgressButton>
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@ -11,10 +11,10 @@
      <PostStatusForm
        class="panel-body"
        v-bind="params"
-        @posted="closeModal"
-        :disablePolls="true"
-        :disableVisibilitySelector="true"
+        :disable-polls="true"
+        :disable-visibility-selector="true"
        :post-handler="doEditStatus"
+        @posted="closeModal"
      />
    </div>
  </Modal>
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -42,7 +42,10 @@
          :class="{ highlighted: index === highlighted }"
          @click.stop.prevent="onClick($event, suggestion)"
        >
-          <span v-if="!suggestion.mfm" class="image">
+          <span
+            v-if="!suggestion.mfm"
+            class="image"
+          >
            <img
              v-if="suggestion.img"
              :src="suggestion.img"
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@ -2,9 +2,9 @@
  <div class="emoji-picker panel panel-default panel-body">
    <div class="heading">
      <span
+        ref="emoji-tabs"
        class="emoji-tabs"
        @wheel="onWheel"
-        ref="emoji-tabs"
      >
        <span
          v-for="group in emojis"
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@ -41,7 +41,7 @@
  </div>
 </template>

-<script src="./emoji_reactions.js" ></script>
+<script src="./emoji_reactions.js"></script>
 <style lang="scss">
@import '../../_variables.scss';

--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@ -7,7 +7,7 @@
    :bound-to="{ x: 'container' }"
    remove-padding
  >
-    <template v-slot:content="{close}">
+    <template #content="{close}">
      <div class="dropdown-menu">
        <button
          v-if="canMute && !status.thread_muted"
@ -172,7 +172,7 @@
        </button>
      </div>
    </template>
-    <template v-slot:trigger>
+    <template #trigger>
      <button class="button-unstyled popover-trigger">
        <FAIcon
          class="fa-scale-110 fa-old-padding"
@ -205,7 +205,7 @@
  </Popover>
 </template>

-<script src="./extra_buttons.js" ></script>
+<script src="./extra_buttons.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@ -35,7 +35,7 @@
  </div>
 </template>

-<script src="./favorite_button.js" ></script>
+<script src="./favorite_button.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@ -23,7 +23,7 @@
  </div>
 </template>

-<script src="./features_panel.js" ></script>
+<script src="./features_panel.js"></script>

 <style lang="scss">
  .features-panel li {
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@ -47,7 +47,7 @@
  </div>
 </template>

-<script src="./font_control.js" ></script>
+<script src="./font_control.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/hashtag_link/hashtag_link.vue
+++ b/src/components/hashtag_link/hashtag_link.vue
@ -14,6 +14,6 @@
  </span>
 </template>

-<script src="./hashtag_link.js"/>
+<script src="./hashtag_link.js" />

-<style lang="scss" src="./hashtag_link.scss"/>
+<style lang="scss" src="./hashtag_link.scss" />
--- a/src/components/instance_specific_panel/instance_specific_panel.vue
+++ b/src/components/instance_specific_panel/instance_specific_panel.vue
@ -10,4 +10,4 @@
  </div>
 </template>

-<script src="./instance_specific_panel.js" ></script>
+<script src="./instance_specific_panel.js"></script>
--- a/src/components/local_bubble_panel/local_bubble_panel.vue
+++ b/src/components/local_bubble_panel/local_bubble_panel.vue
@ -10,7 +10,7 @@
        </div>
      </div>
      <div class="panel-body">
-        <p>{{ $t("about.bubble_instances_description")}}:</p>
+        <p>{{ $t("about.bubble_instances_description") }}:</p>
        <ul>
          <li
            v-for="instance in bubbleInstances"
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@ -90,7 +90,7 @@
  </div>
 </template>

-<script src="./login_form.js" ></script>
+<script src="./login_form.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@ -26,7 +26,7 @@
  </label>
 </template>

-<script src="./media_upload.js" ></script>
+<script src="./media_upload.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@ -66,6 +66,6 @@
  </span>
 </template>

-<script src="./mention_link.js"/>
+<script src="./mention_link.js" />

-<style lang="scss" src="./mention_link.scss"/>
+<style lang="scss" src="./mention_link.scss" />
--- a/src/components/mentions_line/mentions_line.vue
+++ b/src/components/mentions_line/mentions_line.vue
@ -37,5 +37,5 @@
    </span>
  </span>
 </template>
-<script src="./mentions_line.js" ></script>
+<script src="./mentions_line.js"></script>
 <style lang="scss" src="./mentions_line.scss" />
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@ -69,4 +69,4 @@
    </div>
  </div>
 </template>
-<script src="./recovery_form.js" ></script>
+<script src="./recovery_form.js"></script>
--- a/src/components/mod_modal/tabs/reports_tab/report_card.vue
+++ b/src/components/mod_modal/tabs/reports_tab/report_card.vue
@ -4,7 +4,7 @@
      class="panel-heading"
      @click="toggleHidden"
    >
-      <h4>{{ $t('moderation.reports.report') + ' ' + this.account.screen_name }}</h4>
+      <h4>{{ $t('moderation.reports.report') + ' ' + account.screen_name }}</h4>
      <button
        v-if="isOpen"
        class="button-default"
@ -24,7 +24,7 @@
        class="button-default"
        @click.stop="updateReportState('open')"
      >
-          {{ $t('moderation.reports.reopen') }}
+        {{ $t('moderation.reports.reopen') }}
      </button>
    </div>
    <div
@ -35,7 +35,10 @@
        <div v-if="content">
          {{ decode(content) }}
        </div>
-        <i v-else class="faint">
+        <i
+          v-else
+          class="faint"
+        >
          {{ $t('moderation.reports.no_content') }}
        </i>
        <div class="report-author">
@ -43,12 +46,12 @@
            class="small-avatar"
            :user="actor"
          />
-          {{ this.actor.screen_name }}
+          {{ actor.screen_name }}
        </div>
      </div>
      <div
+        v-if="!hidden && statuses.length > 0"
        class="dropdown"
-        v-if="!hidden && this.statuses.length > 0"
      >
        <button
          class="button button-unstyled dropdown-header"
@ -74,8 +77,8 @@
        </div>
      </div>
      <div
+        v-if="!hidden && notes.length > 0"
        class="dropdown"
-        v-if="!hidden && this.notes.length > 0"
      >
        <button
          class="button button-unstyled dropdown-header"
@ -99,9 +102,9 @@
      </div>
      <div class="report-add-note">
        <textarea
+          v-model.trim="note"
          rows="1"
          cols="1"
-          v-model.trim="note"
          :placeholder="$t('moderation.reports.note_placeholder')"
        />
        <button
@ -134,7 +137,7 @@
        :offset="{ y: 5 }"
        remove-padding
      >
-        <template v-slot:trigger>
+        <template #trigger>
          <button
            class="btn button-default"
            :disabled="!tagPolicyEnabled"
@ -147,7 +150,7 @@
            />
          </button>
        </template>
-        <template v-slot:content="{close}">
+        <template #content="{close}">
          <div
            class="dropdown-menu"
            :disabled="!tagPolicyEnabled"
--- a/src/components/mod_modal/tabs/reports_tab/report_note.vue
+++ b/src/components/mod_modal/tabs/reports_tab/report_note.vue
@ -6,7 +6,7 @@
          class="small-avatar"
          :user="user"
        />
-        {{ this.user.screen_name }}
+        {{ user.screen_name }}
      </div>
      <div class="header-right">
        <Timeago
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@ -8,7 +8,7 @@
      @show="setToggled(true)"
      @close="setToggled(false)"
    >
-      <template v-slot:content>
+      <template #content>
        <div class="dropdown-menu">
          <span v-if="user.is_local">
            <button
@ -122,7 +122,7 @@
          </span>
        </div>
      </template>
-      <template v-slot:trigger>
+      <template #trigger>
        <button
          class="btn button-default btn-block moderation-tools-button"
          :class="{ toggled }"
@ -137,11 +137,11 @@
        v-if="showDeleteUserDialog"
        :on-cancel="deleteUserDialog.bind(this, false)"
      >
-        <template v-slot:header>
+        <template #header>
          {{ $t('user_card.admin_menu.delete_user') }}
        </template>
        <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
-        <template v-slot:footer>
+        <template #footer>
          <button
            class="btn button-default"
            @click="deleteUserDialog(false)"
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@ -105,7 +105,7 @@
  </div>
 </template>

-<script src="./nav_panel.js" ></script>
+<script src="./nav_panel.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/notifications/notification_filters.vue
+++ b/src/components/notifications/notification_filters.vue
@ -5,7 +5,7 @@
    placement="bottom"
    :bound-to="{ x: 'container' }"
  >
-    <template v-slot:content>
+    <template #content>
      <div class="dropdown-menu">
        <button
          class="button-default dropdown-item"
@ -72,7 +72,7 @@
        </button>
      </div>
    </template>
-    <template v-slot:trigger>
+    <template #trigger>
      <button class="filter-trigger-button button-unstyled">
        <FAIcon icon="filter" />
      </button>
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@ -8,13 +8,13 @@
    remove-padding
    @show="focusInput"
  >
-    <template v-slot:content="{close}">
+    <template #content="{close}">
      <EmojiPicker
        :enable-sticker-picker="false"
        @emoji="addReaction($event, close)"
      />
    </template>
-    <template v-slot:trigger>
+    <template #trigger>
      <button
        class="button-unstyled popover-trigger"
        :title="$t('tool_tip.add_reaction')"
@ -28,7 +28,7 @@
  </Popover>
 </template>

-<script src="./react_button.js" ></script>
+<script src="./react_button.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@ -54,7 +54,7 @@
  </div>
 </template>

-<script src="./retweet_button.js" ></script>
+<script src="./retweet_button.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@ -24,7 +24,7 @@
      :items="items"
      :get-key="getKey"
    >
-      <template v-slot:item="{item}">
+      <template #item="{item}">
        <div
          class="selectable-list-item-inner"
          :class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
@ -41,7 +41,7 @@
          />
        </div>
      </template>
-      <template v-slot:empty>
+      <template #empty>
        <slot name="empty" />
      </template>
    </List>
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@ -6,14 +6,14 @@
    <Popover
      trigger="hover"
    >
-      <template v-slot:trigger>
+      <template #trigger>
        &nbsp;
        <FAIcon
          icon="wrench"
          :aria-label="$t('settings.setting_changed')"
        />
      </template>
-      <template v-slot:content>
+      <template #content>
        <div class="modified-tooltip">
          {{ $t('settings.setting_changed') }}
        </div>
--- a/src/components/settings_modal/helpers/server_side_indicator.vue
+++ b/src/components/settings_modal/helpers/server_side_indicator.vue
@ -6,14 +6,14 @@
    <Popover
      trigger="hover"
    >
-      <template v-slot:trigger>
+      <template #trigger>
        &nbsp;
        <FAIcon
          icon="server"
          :aria-label="$t('settings.setting_server_side')"
        />
      </template>
-      <template v-slot:content>
+      <template #content>
        <div class="serverside-tooltip">
          {{ $t('settings.setting_server_side') }}
        </div>
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@ -53,7 +53,7 @@
          :bound-to="{ x: 'container' }"
          remove-padding
        >
-          <template v-slot:trigger>
+          <template #trigger>
            <button
              class="btn button-default"
              :title="$t('general.close')"
@ -65,7 +65,7 @@
              />
            </button>
          </template>
-          <template v-slot:content="{close}">
+          <template #content="{close}">
            <div class="dropdown-menu">
              <button
                class="button-default dropdown-item dropdown-item-icon"
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -21,7 +21,6 @@
            >
              {{ $t('settings.settings_profile_force_sync') }}
            </button>
-
          </p>
          <div
            @click="toggleExpandedSettings"
@ -45,7 +44,6 @@
          <template
            v-if="profilesExpanded"
          >
-
            <div
              v-for="profile in settingsProfiles"
              :key="profile.id"
@ -74,15 +72,24 @@
                </button>
              </template>
            </div>
-            <button class="btn button-default" @click="refreshProfiles()">
+            <button
+              class="btn button-default"
+              @click="refreshProfiles()"
+            >
              {{ $t('settings.settings_profiles_refresh') }}
-              <FAIcon icon="sync" @click="refreshProfiles()" />
+              <FAIcon
+                icon="sync"
+                @click="refreshProfiles()"
+              />
            </button>
            <h3>{{ $t('settings.settings_profile_creation') }}</h3>
            <label for="settings-profile-new-name">
              {{ $t('settings.settings_profile_creation_new_name_label') }}
            </label>
-            <input v-model="newProfileName" id="settings-profile-new-name">
+            <input
+              id="settings-profile-new-name"
+              v-model="newProfileName"
+            >
            <button
              class="btn button-default"
              @click="createSettingsProfile"
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@ -10,7 +10,7 @@
          :query="queryUserIds"
          :placeholder="$t('settings.search_user_to_block')"
        >
-          <template v-slot="row">
+          <template #default="row">
            <BlockCard
              :user-id="row.item"
            />
@ -21,7 +21,7 @@
        :refresh="true"
        :get-key="i => i"
      >
-        <template v-slot:header="{selected}">
+        <template #header="{selected}">
          <div class="bulk-actions">
            <ProgressButton
              v-if="selected.length > 0"
@ -29,7 +29,7 @@
              :click="() => blockUsers(selected)"
            >
              {{ $t('user_card.block') }}
-              <template v-slot:progress>
+              <template #progress>
                {{ $t('user_card.block_progress') }}
              </template>
            </ProgressButton>
@ -39,16 +39,16 @@
              :click="() => unblockUsers(selected)"
            >
              {{ $t('user_card.unblock') }}
-              <template v-slot:progress>
+              <template #progress>
                {{ $t('user_card.unblock_progress') }}
              </template>
            </ProgressButton>
          </div>
        </template>
-        <template v-slot:item="{item}">
+        <template #item="{item}">
          <BlockCard :user-id="item" />
        </template>
-        <template v-slot:empty>
+        <template #empty>
          {{ $t('settings.no_blocks') }}
        </template>
      </BlockList>
@ -63,7 +63,7 @@
              :query="queryUserIds"
              :placeholder="$t('settings.search_user_to_mute')"
            >
-              <template v-slot="row">
+              <template #default="row">
                <MuteCard
                  :user-id="row.item"
                />
@ -74,7 +74,7 @@
            :refresh="true"
            :get-key="i => i"
          >
-            <template v-slot:header="{selected}">
+            <template #header="{selected}">
              <div class="bulk-actions">
                <ProgressButton
                  v-if="selected.length > 0"
@ -82,7 +82,7 @@
                  :click="() => muteUsers(selected)"
                >
                  {{ $t('user_card.mute') }}
-                  <template v-slot:progress>
+                  <template #progress>
                    {{ $t('user_card.mute_progress') }}
                  </template>
                </ProgressButton>
@ -92,16 +92,16 @@
                  :click="() => unmuteUsers(selected)"
                >
                  {{ $t('user_card.unmute') }}
-                  <template v-slot:progress>
+                  <template #progress>
                    {{ $t('user_card.unmute_progress') }}
                  </template>
                </ProgressButton>
              </div>
            </template>
-            <template v-slot:item="{item}">
+            <template #item="{item}">
              <MuteCard :user-id="item" />
            </template>
-            <template v-slot:empty>
+            <template #empty>
              {{ $t('settings.no_mutes') }}
            </template>
          </MuteList>
@ -114,7 +114,7 @@
              :query="queryKnownDomains"
              :placeholder="$t('settings.type_domains_to_mute')"
            >
-              <template v-slot="row">
+              <template #default="row">
                <DomainMuteCard
                  :domain="row.item"
                />
@ -125,7 +125,7 @@
            :refresh="true"
            :get-key="i => i"
          >
-            <template v-slot:header="{selected}">
+            <template #header="{selected}">
              <div class="bulk-actions">
                <ProgressButton
                  v-if="selected.length > 0"
@ -133,16 +133,16 @@
                  :click="() => unmuteDomains(selected)"
                >
                  {{ $t('domain_mute_card.unmute') }}
-                  <template v-slot:progress>
+                  <template #progress>
                    {{ $t('domain_mute_card.unmute_progress') }}
                  </template>
                </ProgressButton>
              </div>
            </template>
-            <template v-slot:item="{item}">
+            <template #item="{item}">
              <DomainMuteCard :domain="item" />
            </template>
-            <template v-slot:empty>
+            <template #empty>
              {{ $t('settings.no_mutes') }}
            </template>
          </DomainMuteList>
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@ -1,7 +1,7 @@
 import { extractCommit } from 'src/services/version/version.service'

-const pleromaFeCommitUrl = 'https://akkoma.dev/puniko/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://akkoma.dev/puniko/akkoma/commits/'
+const pleromaFeCommitUrl = 'https://git.froth.zone/sam/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://git.froth.zone/sam/pleroma/commits/'

 const VersionTab = {
  data () {
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@ -215,7 +215,7 @@
  </div>
 </template>

-<script src="./shadow_control.js" ></script>
+<script src="./shadow_control.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@ -218,7 +218,7 @@
  </div>
 </template>

-<script src="./side_drawer.js" ></script>
+<script src="./side_drawer.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@ -24,7 +24,7 @@
  </div>
 </template>

-<script src="./staff_panel.js" ></script>
+<script src="./staff_panel.js"></script>

 <style lang="scss">

--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -538,6 +538,6 @@
  </div>
 </template>

-<script src="./status.js" ></script>
+<script src="./status.js"></script>

 <style src="./status.scss" lang="scss"></style>
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@ -89,7 +89,10 @@
                </option>
              </Select>
              {{ ' ' }}
-              <button @click="translateStatus" class="btn button-default">
+              <button
+                class="btn button-default"
+                @click="translateStatus"
+              >
                {{ $t('status.translate') }}
              </button>
            </div>
@ -138,5 +141,5 @@
    <slot v-if="!hideSubjectStatus" />
  </div>
 </template>
-<script src="./status_body.js" ></script>
+<script src="./status_body.js"></script>
 <style lang="scss" src="./status_body.scss" />
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@ -63,7 +63,7 @@
  </div>
 </template>

-<script src="./status_content.js" ></script>
+<script src="./status_content.js"></script>
 <style lang="scss">
 .StatusContent {
  flex: 1;
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@ -17,9 +17,9 @@
            v-for="status in history"
            :key="status.id"
            :statusoid="status"
-            :isPreview="true"
+            :is-preview="true"
            class="conversation-status status-fadein panel-body"
-        />
+          />
        </div>
      </div>
    </div>
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@ -5,10 +5,10 @@
    :bound-to="{ x: 'container' }"
    @show="enter"
  >
-    <template v-slot:trigger>
+    <template #trigger>
      <slot />
    </template>
-    <template v-slot:content>
+    <template #content>
      <Status
        v-if="status"
        :is-preview="true"
@ -35,7 +35,7 @@
  </Popover>
 </template>

-<script src="./status_popover.js" ></script>
+<script src="./status_popover.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/terms_of_service_panel/terms_of_service_panel.vue
+++ b/src/components/terms_of_service_panel/terms_of_service_panel.vue
@ -13,7 +13,7 @@
  </div>
 </template>

-<script src="./terms_of_service_panel.js" ></script>
+<script src="./terms_of_service_panel.js"></script>

 <style lang="scss">
 .tos-content {
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@ -4,7 +4,7 @@
    class="TimelineQuickSettings"
    :bound-to="{ x: 'container' }"
  >
-    <template v-slot:content>
+    <template #content>
      <div class="dropdown-menu">
        <div v-if="loggedIn">
          <button
@ -80,7 +80,7 @@
        </button>
      </div>
    </template>
-    <template v-slot:trigger>
+    <template #trigger>
      <button class="button-unstyled">
        <FAIcon icon="filter" />
      </button>
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@ -9,12 +9,12 @@
    @show="openMenu"
    @close="() => isOpen = false"
  >
-    <template v-slot:content>
+    <template #content>
      <div class="timeline-menu-popover popover-default">
        <TimelineMenuContent />
      </div>
    </template>
-    <template v-slot:trigger>
+    <template #trigger>
      <button class="button-unstyled title timeline-menu-title">
        <span class="timeline-title">{{ timelineName() }}</span>
        <span>
@ -32,7 +32,7 @@
  </Popover>
 </template>

-<script src="./timeline_menu.js" ></script>
+<script src="./timeline_menu.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@ -99,7 +99,7 @@
  </ul>
 </template>

-<script src="./timeline_menu_content.js" ></script>
+<script src="./timeline_menu_content.js"></script>

 <style lang="scss">
@import "../../_variables.scss";
--- a/src/components/timeline_menu_tabs/timeline_menu_content.vue
+++ b/src/components/timeline_menu_tabs/timeline_menu_content.vue
@ -99,7 +99,7 @@
  </ul>
 </template>

-<script src="./timeline_menu_content.js" ></script>
+<script src="./timeline_menu_content.js"></script>

 <style lang="scss">
@import "../../_variables.scss";
--- a/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
+++ b/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
@ -53,7 +53,7 @@
  </div>
 </template>

-<script src="./timeline_menu_tabs.js" ></script>
+<script src="./timeline_menu_tabs.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@ -4,10 +4,10 @@
    placement="top"
    :offset="{ y: 5 }"
  >
-    <template v-slot:trigger>
+    <template #trigger>
      <slot />
    </template>
-    <template v-slot:content>
+    <template #content>
      <div class="user-list-popover">
        <template v-if="users.length">
          <div
@ -45,7 +45,7 @@
  </Popover>
 </template>

-<script src="./user_list_popover.js" ></script>
+<script src="./user_list_popover.js"></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -98,7 +98,7 @@
          :disabled="!user.friends_count"
        >
          <FriendList :user-id="userId">
-            <template v-slot:item="{item}">
+            <template #item="{item}">
              <FollowCard :user="item" />
            </template>
          </FriendList>
@ -110,7 +110,7 @@
          :disabled="!user.followers_count"
        >
          <FollowerList :user-id="userId">
-            <template v-slot:item="{item}">
+            <template #item="{item}">
              <FollowCard
                :user="item"
                :no-follows-you="isUs"
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@ -45,7 +45,7 @@
        </div>
        <div class="user-reporting-panel-right">
          <List :items="statuses">
-            <template v-slot:item="{item}">
+            <template #item="{item}">
              <div class="status-fadein user-reporting-panel-sitem">
                <Status
                  :in-conversation="false"
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@ -27,7 +27,7 @@
  </div>
 </template>

-<script src="./who_to_follow_panel.js" ></script>
+<script src="./who_to_follow_panel.js"></script>

 <style lang="scss">
  .who-to-follow * {
--- a/static/.tos
+++ b/static/.tos
@ -1,45 +0,0 @@
-<h4>Terms of Service</h4>
-
-<p>It's mainly "be nice"</p>
-
-<ol>
-    <li>
-        <h3>Don't be a big meanie</h4>
-        <p>Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.</p>
-    </li>
-    <li>
-        <h3>Mark your lewds!</h3>
-	<p>Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're <em>going</em> to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.</p>
-    </li>
-    <li>
-	    <h3>This is a <b>Kink Shame Zone</b></h3>
-	    <p>Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™</p>
-    </li>
-    <li>
-	   <h3>Keep it legal!</h3>
-	   <p>Server is hosted in france, keep content legal for there (+ wherever you're browsing from)</p>
-    </li>
-    <li>
-	    <h3>No ads/spambots</h3>
-	    <p>I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise.</h3>
-    </li>
-    <li>
-	    <h3>Non-TOS recommendations</h3>
-	    <p>This is stuff that'd I'd <em>like</em> you to do, but I won't outright ban you if you don't follow them</p>
-	    <ul>
-		    <li>If someone is sadposting, don't antagonise them - they probably just want to vent</li>
-		    <li>Put walls of text behind a subject (CW) - helps the timeline not get flooded with text</li>
-	    </ul>
-    </li>
-
-    <li>
-	    <h3>Other</h3>
-	    <p>If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!</p>
-   </li>
-
-</ol>
-
-<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>
-
-<br>
-<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/logo.svg
+++ b/static/logo.svg
@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4485"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   sodipodi:docname="logo.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata4491">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4489" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1274"
-     inkscape:window-height="1410"
-     id="namedview4487"
-     showgrid="false"
-     inkscape:zoom="1.2636719"
-     inkscape:cx="305.99333"
-     inkscape:cy="304.30809"
-     inkscape:window-x="1280"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4612"
-     inkscape:document-rotation="0" />
-  <g
-     id="g4612">
-    <g
-       id="g850"
-       transform="matrix(0.99659595,0,0,0.99659595,0.37313949,0.87143746)">
-      <path
-         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.175879"
-         d="m 194.75841,124.65165 a 20.449443,20.449443 0 0 0 -20.44944,20.44945 v 242.24725 h 65.28091 v -262.6967 z"
-         id="path4497" />
-      <path
-         style="fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 272.6236,124.65165 V 256 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -110.8989 z"
-         id="path4516" />
-      <path
-         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 272.6236,322.06744 v 65.28091 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -44.83146 z"
-         id="path4516-5" />
-    </g>
-  </g>
-</svg>
--- a/static/styles.json
+++ b/static/styles.json
@ -1,18 +1,79 @@
 {
  "pleroma-dark": "/static/themes/pleroma-dark.json",
  "pleroma-light": "/static/themes/pleroma-light.json",
-  "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"],
-  "classic-dark": [ "Classic Dark", "#161c20", "#282e32", "#b9b9b9", "#baaa9c", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ],
-  "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"],
-  "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ],
-  "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ],
-
+  "pleroma-amoled": [
+    "Pleroma Dark AMOLED",
+    "#000000",
+    "#111111",
+    "#b0b0b1",
+    "#d8a070",
+    "#aa0000",
+    "#0fa00f",
+    "#0095ff",
+    "#d59500"
+  ],
+  "classic-dark": [
+    "Classic Dark",
+    "#161c20",
+    "#282e32",
+    "#b9b9b9",
+    "#baaa9c",
+    "#d31014",
+    "#0fa00f",
+    "#0095ff",
+    "#ffa500"
+  ],
+  "bird": [
+    "Bird",
+    "#f8fafd",
+    "#e6ecf0",
+    "#14171a",
+    "#0084b8",
+    "#e0245e",
+    "#17bf63",
+    "#1b95e0",
+    "#fab81e"
+  ],
+  "ir-black": [
+    "Ir Black",
+    "#000000",
+    "#242422",
+    "#b5b3aa",
+    "#ff6c60",
+    "#FF6C60",
+    "#A8FF60",
+    "#96CBFE",
+    "#FFFFB6"
+  ],
+  "monokai": [
+    "Monokai",
+    "#272822",
+    "#383830",
+    "#f8f8f2",
+    "#f92672",
+    "#F92672",
+    "#a6e22e",
+    "#66d9ef",
+    "#f4bf75"
+  ],
  "redmond-xx": "/static/themes/redmond-xx.json",
  "redmond-xx-se": "/static/themes/redmond-xx-se.json",
  "redmond-xxi": "/static/themes/redmond-xxi.json",
  "breezy-dark": "/static/themes/breezy-dark.json",
  "breezy-light": "/static/themes/breezy-light.json",
-  "ihatebeingalive": "/static/themes/ihatebeingalive.json",
+  "mammal": "/static/themes/mammal.json",
  "paper": "/static/themes/paper.json",
-  "thekanata": "/static/themes/thekanata.json"
+  "gnutan": "/static/themes/gnutan.json",
+  "chestnut": "/static/themes/chestnut.json",
+  "divoom": "/static/themes/divoom.json",
+  "electric-poles": "/static/themes/electric-poles.json",
+  "evening-city": "/static/themes/evening-city.json",
+  "galaxy-splash": "/static/themes/galaxy-splash.json",
+  "midnight-wizardry": "/static/themes/midnight-wizardry.json",
+  "mojave": "/static/themes/mojave.json",
+  "simply-dark": "/static/themes/simply-dark.json",
+  "blue-cum": "/static/themes/blue-cum.json",
+  "sleepy-green": "/static/themes/sleepy-green.json",
+  "desu-dark": "/static/themes/desu-dark.json",
+  "froth-noire": "/static/themes/froth-noire.json"
 }
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@ -1,5 +1,17 @@
-<h4>Terms of Service</h4>
+<h2>Welcome to the Froth Zone!</h2>

-<p>This is a placeholder, overwrite this by putting a file at <pre>$STATIC_DIR/static/terms-of-service.html</pre><p>
+<h4>
+  You need a valid email to sign up.<br />You will be sent an validation email.
+</h4>
+<h6>If I know who you are I might make an exception to that.</h6>

-<p>See the <a href="https://docs.akkoma.dev/main/backend/configuration/static_dir/">Static Directory</a> docs for more info.</p>
+<h3>Actual Terms</h3>
+<ol>
+  <li>Do not post anything that is illegal in the US.</li>
+  <li>Do not post anything NSFW without tagging it.</li>
+  <li>Do not post only NSFW. Go somewhere else for that.</li>
+  <li>No block evasion.</li>
+  <li>No doxing.</li>
+  <li>No spamming or shilling. Go back to Twitter.</li>
+  <li>Do not imitate being someone without their permission.</li>
+</ol>
--- a/static/themes/blue-cum.json
+++ b/static/themes/blue-cum.json
@ -0,0 +1,382 @@
+{
+  "name": "Blue Cum (@grumbulon)",
+  "_pleroma_theme_version": 2,
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [
+        {
+          "color": "#5f8785",
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1",
+          "alpha": "0.3"
+        }
+      ],
+      "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": [
+        {
+          "color": "#000000",
+          "x": "1",
+          "y": 1,
+          "blur": "7",
+          "spread": "-17",
+          "alpha": 0.7
+        }
+      ],
+      "avatarStatus": [],
+      "panelHeader": [],
+      "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": 4,
+          "spread": 0,
+          "color": "#e5e9f0",
+          "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
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 4,
+          "spread": 0,
+          "color": "#e5e9f0",
+          "alpha": 1
+        },
+        {
+          "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
+        }
+      ],
+      "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": "#000000",
+      "bg": "#031c2d",
+      "fg": "#031c2d",
+      "cRed": "#77767b",
+      "cGreen": "#7fc6a4",
+      "cOrange": "#f5dd90",
+      "cBlue": "#77767b",
+      "accent": "#f5dd90",
+      "link": "#f5dd90",
+      "text": "#e5e9f0",
+      "chatBg": "#031c2d",
+      "chatMessageIncomingBg": "#031c2d",
+      "chatMessageOutgoingBg": "#052b45",
+      "chatMessageOutgoingBorder": "#06314f",
+      "chatMessageOutgoingLink": "#f5dd90",
+      "chatMessageOutgoingText": "#e5e9f0",
+      "border": "#042237",
+      "chatMessageIncomingBorder": "#052841",
+      "chatMessageIncomingLink": "#f5dd90",
+      "chatMessageIncomingText": "#e5e9f0",
+      "badgeNotification": "#f0be75",
+      "badgeNotificationText": "#000000",
+      "alertNeutral": "#e5e9f0",
+      "alertNeutralText": "#0f131a",
+      "alertPopupNeutral": "#e5e9f0",
+      "alertPopupNeutralText": "#0f131a",
+      "alertSuccess": "#7fc6a4",
+      "alertSuccessText": "#e5e9f0",
+      "alertPopupSuccess": "#7fc6a4",
+      "alertPopupSuccessText": "#0f131a",
+      "alertWarning": "#f5dd90",
+      "alertWarningText": "#ffffff",
+      "alertPopupWarning": "#f5dd90",
+      "alertPopupWarningText": "#000000",
+      "alertError": "#d24e5a",
+      "alertErrorText": "#e5e9f0",
+      "alertPopupError": "#d24e5a",
+      "alertPopupErrorText": "#ffffff",
+      "panel": "#031c2d",
+      "panelText": "#e5e9f0",
+      "alertNeutralPanelText": "#0f131a",
+      "alertSuccessPanelText": "#e5e9f0",
+      "alertWarningPanelText": "#ffffff",
+      "alertErrorPanelText": "#e5e9f0",
+      "fgText": "#e5e9f0",
+      "topBar": "#031c2d",
+      "topBarText": "#e5e9f0",
+      "input": "#031c2d",
+      "inputTopbarText": "#e5e9f0",
+      "inputPanelText": "#e5e9f0",
+      "inputText": "#e5e9f0",
+      "btn": "#031c2d",
+      "btnText": "#e5e9f0",
+      "btnTopBarText": "#e5e9f0",
+      "btnDisabled": "#031c2d",
+      "btnDisabledTopBarText": "#3c505e",
+      "btnPanelText": "#e5e9f0",
+      "btnDisabledPanelText": "#3c505e",
+      "btnDisabledText": "#3c505e",
+      "btnToggled": "#0a578d",
+      "btnToggledTopBarText": "#e5e9f0",
+      "btnToggledPanelText": "#e5e9f0",
+      "btnToggledText": "#e5e9f0",
+      "btnPressed": "#031c2d",
+      "btnPressedTopBarText": "#e5e9f0",
+      "btnPressedTopBar": "#031c2d",
+      "btnPressedPanelText": "#e5e9f0",
+      "btnPressedPanel": "#031c2d",
+      "btnPressedText": "#e5e9f0",
+      "tabActiveText": "#e5e9f0",
+      "tabText": "#e5e9f0",
+      "tab": "#031c2d",
+      "fgLink": "#f5dd90",
+      "topBarLink": "#f5dd90",
+      "panelLink": "#f5dd90",
+      "panelFaint": "#e5e9f0",
+      "icon": "#74838f",
+      "poll": "#646a55",
+      "pollText": "#e5e9f0",
+      "postCyantext": "#85848a",
+      "postGreentext": "#7fc6a4",
+      "postLink": "#f5dd90",
+      "lightText": "#ffffff",
+      "popover": "#031c2d",
+      "selectedMenuPopover": "#052b45",
+      "highlight": "#052b45",
+      "highlightText": "#e5e9f0",
+      "selectedMenu": "#052b45",
+      "selectedMenuText": "#e5e9f0",
+      "selectedMenuPopoverIcon": "#758a9b",
+      "highlightLink": "#f5dd90",
+      "selectedMenuLink": "#f5dd90",
+      "selectedMenuPopoverLink": "#f5dd90",
+      "selectedMenuPopoverText": "#e5e9f0",
+      "faintLink": "#f5dd90",
+      "highlightFaintLink": "#f5dd90",
+      "selectedMenuFaintLink": "#f5dd90",
+      "selectedMenuPopoverFaintLink": "#f5dd90",
+      "faint": "#e5e9f0",
+      "highlightFaintText": "#e5e9f0",
+      "selectedMenuFaintText": "#e5e9f0",
+      "selectedMenuPopoverFaintText": "#e5e9f0",
+      "highlightLightText": "#ffffff",
+      "selectedMenuLightText": "#ffffff",
+      "selectedMenuPopoverLightText": "#ffffff",
+      "selectedMenuIcon": "#758a9b",
+      "selectedPost": "#052b45",
+      "selectedPostText": "#e5e9f0",
+      "selectedPostIcon": "#758a9b",
+      "selectedPostLink": "#f5dd90",
+      "selectedPostFaintLink": "#f5dd90",
+      "highlightPostLink": "#f5dd90",
+      "selectedPostPostLink": "#f5dd90",
+      "selectedPostLightText": "#ffffff",
+      "selectedPostFaintText": "#e5e9f0",
+      "popoverText": "#e5e9f0",
+      "popoverIcon": "#74838f",
+      "popoverLink": "#f5dd90",
+      "postFaintLink": "#f5dd90",
+      "popoverPostFaintLink": "#f5dd90",
+      "popoverFaintLink": "#f5dd90",
+      "popoverFaintText": "#e5e9f0",
+      "popoverPostLink": "#f5dd90",
+      "popoverLightText": "#ffffff",
+      "highlightIcon": "#758a9b",
+      "highlightPostFaintLink": "#f5dd90",
+      "profileTint": "#031c2d",
+      "profileBg": "#010f1a",
+      "wallpaper": "#031624"
+    },
+    "opacity": {
+      "underlay": 0.15,
+      "bg": 1,
+      "border": 1,
+      "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
+      "input": 0.5,
+      "btn": 1,
+      "faint": 0.5,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": "0",
+      "input": "2",
+      "checkbox": "0",
+      "panel": "17",
+      "avatar": "7",
+      "avatarAlt": "2",
+      "tooltip": 2,
+      "attachment": "3",
+      "chatMessage": "17"
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {},
+    "shadows": {
+      "avatar": [
+        {
+          "x": "1",
+          "y": 1,
+          "blur": "7",
+          "spread": "-17",
+          "color": "#000000",
+          "alpha": 0.7
+        }
+      ],
+      "panel": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1",
+          "color": "#5f8785",
+          "alpha": "0.3"
+        }
+      ]
+    },
+    "opacity": {},
+    "colors": {
+      "bg": "#031C2D",
+      "fg": "#031C2D",
+      "text": "#e5e9f0",
+      "link": "#F5DD90",
+      "cBlue": "#77767b",
+      "cRed": "#77767b",
+      "cGreen": "#7FC6A4",
+      "cOrange": "#F5DD90",
+      "alertError": "#d24e5a",
+      "badgeNotification": "#f0be75"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "2",
+      "checkbox": "0",
+      "panel": "17",
+      "avatar": "7",
+      "avatarAlt": "2",
+      "tooltip": 2,
+      "attachment": "3"
+    }
+  }
+}
--- a/static/themes/chestnut.json
+++ b/static/themes/chestnut.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":1,"y":1,"blur":4,"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":[],"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":4,"spread":0,"color":"#eee7e3","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}],"buttonPressed":[{"x":0,"y":0,"blur":4,"spread":0,"color":"#eee7e3","alpha":1},{"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}],"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":"#000000","bg":"#6f574c","fg":"#655953","cRed":"#d31014","cOrange":"#ffa500","cGreen":"#0095ff","cBlue":"#0fa00f","accent":"#992600","link":"#eabca4","text":"#eee7e3","chatBg":"#6f574c","chatMessageIncomingBg":"#6f574c","chatMessageOutgoingBg":"#7f6357","chatMessageOutgoingBorder":"#85685b","chatMessageOutgoingLink":"#5b2d16","chatMessageOutgoingText":"#eee7e3","border":"#6b5e58","chatMessageIncomingBorder":"#71635d","chatMessageIncomingLink":"#5b2d16","chatMessageIncomingText":"#eee7e3","badgeNotification":"#d31014","badgeNotificationText":"#ffffff","alertNeutral":"#eee7e3","alertNeutralText":"#1d1611","alertPopupNeutral":"#eee7e3","alertPopupNeutralText":"#1d1611","alertWarning":"#ffa500","alertWarningText":"#1d1611","alertPopupWarning":"#ffa500","alertPopupWarningText":"#1d1611","alertError":"#d31014","alertErrorText":"#ffffff","alertPopupError":"#d31014","alertPopupErrorText":"#ffffff","panel":"#655953","panelText":"#e9e9fb","alertNeutralPanelText":"#050517","alertWarningPanelText":"#050517","alertErrorPanelText":"#e9e9fb","fgText":"#eee7e3","topBar":"#655953","topBarText":"#eee7e3","input":"#655953","inputTopbarText":"#eee7e3","inputPanelText":"#e9e9fb","inputText":"#eee7e3","btn":"#655953","btnText":"#eee7e3","btnTopBarText":"#eee7e3","btnDisabled":"#6d584e","btnDisabledTopBarText":"#8d7c74","btnPanelText":"#eee7e3","btnDisabledPanelText":"#8d7c74","btnDisabledText":"#8d7c74","btnToggled":"#9a8c85","btnToggledTopBarText":"#ffffff","btnToggledPanelText":"#1d1611","btnToggledText":"#1d1611","btnPressed":"#655953","btnPressedTopBarText":"#eee7e3","btnPressedTopBar":"#655953","btnPressedPanelText":"#eee7e3","btnPressedPanel":"#655953","btnPressedText":"#eee7e3","tabActiveText":"#1d1611","tabText":"#eee7e3","tab":"#655953","fgLink":"#5b2d16","topBarLink":"#eabda5","panelLink":"#eabda5","panelFaint":"#eee7e3","icon":"#af9f98","poll":"#80442e","pollText":"#eee7e3","postGreentext":"#9aaad0","postLink":"#ebdfdb","lightText":"#000000","popover":"#6f574c","selectedMenuPopover":"#7f6357","highlight":"#7f6357","highlightText":"#ffffff","selectedMenu":"#7f6357","selectedMenuText":"#ffffff","selectedMenuPopoverIcon":"#bfb1ab","highlightLink":"#5b2d16","selectedMenuLink":"#eabda5","selectedMenuPopoverLink":"#5b2e16","selectedMenuPopoverText":"#000000","faintLink":"#eabca4","highlightFaintLink":"#5b2d16","selectedMenuFaintLink":"#eabda5","selectedMenuPopoverFaintLink":"#5b2e16","faint":"#eee7e3","highlightFaintText":"#ffffff","selectedMenuFaintText":"#ffffff","selectedMenuPopoverFaintText":"#000000","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#000000","selectedMenuIcon":"#bfb1ab","selectedPost":"#7f6357","selectedPostText":"#ffffff","selected
--- a/static/themes/desu-dark.json
+++ b/static/themes/desu-dark.json
@ -0,0 +1,478 @@
+{
+  "name": "Desu Dark (@neko)",
+  "_pleroma_theme_version": 2,
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [
+        {
+          "color": "#0a1707",
+          "x": 0,
+          "y": "0",
+          "blur": "5",
+          "spread": "2",
+          "inset": false,
+          "alpha": "0.4"
+        }
+      ],
+      "topBar": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": "1",
+          "blur": 4,
+          "spread": 0,
+          "alpha": "0.4"
+        },
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": "2",
+          "blur": "7",
+          "spread": 0,
+          "inset": false,
+          "alpha": "0.3"
+        }
+      ],
+      "popup": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": 3,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.5
+        }
+      ],
+      "avatar": [
+        {
+          "color": "#000000",
+          "x": 0,
+          "y": 1,
+          "blur": "6",
+          "spread": "0",
+          "alpha": "0.8",
+          "inset": false
+        }
+      ],
+      "avatarStatus": [],
+      "panelHeader": [
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": "-2",
+          "blur": "0",
+          "spread": "0",
+          "inset": true,
+          "alpha": "0.15"
+        }
+      ],
+      "button": [
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": "1",
+          "blur": "0",
+          "spread": "0",
+          "inset": true,
+          "alpha": "0.2"
+        },
+        {
+          "color": "#253817",
+          "x": 0,
+          "y": "20",
+          "blur": "20",
+          "spread": "-14",
+          "inset": true,
+          "alpha": "0.7"
+        }
+      ],
+      "buttonHover": [
+        {
+          "color": "#5a873a",
+          "x": 0,
+          "y": 0,
+          "blur": "0",
+          "spread": "2",
+          "inset": false,
+          "alpha": "0.5"
+        },
+        {
+          "color": "#253817",
+          "x": 0,
+          "y": "20",
+          "blur": "20",
+          "spread": "-14",
+          "inset": true,
+          "alpha": "0.7"
+        }
+      ],
+      "buttonPressed": [
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": "2",
+          "inset": false,
+          "alpha": "0.6"
+        },
+        {
+          "color": "#ffffff",
+          "x": 0,
+          "y": "0",
+          "blur": "11",
+          "spread": "1",
+          "inset": true,
+          "alpha": "0.3"
+        }
+      ],
+      "input": [
+        {
+          "color": "#1b501e",
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": "1",
+          "inset": true,
+          "alpha": 1
+        }
+      ]
+    },
+    "colors": {
+      "underlay": "#0f2d0c",
+      "bg": "#0e1907",
+      "fg": "#051402",
+      "cRed": "#d31014",
+      "cGreen": "#5dc94a",
+      "cOrange": "#ffc459",
+      "cBlue": "#81beea",
+      "accent": "#89d68c",
+      "link": "#79a988",
+      "text": "#dfe0e2",
+      "chatBg": "#0e1907",
+      "chatMessageIncomingBg": "#0e1907",
+      "chatMessageOutgoingBg": "#1a2d0d",
+      "chatMessageOutgoingBorder": "#1e350f",
+      "chatMessageOutgoingLink": "#79a988",
+      "chatMessageOutgoingText": "#dfe0e2",
+      "border": "#092204",
+      "chatMessageIncomingBorder": "#0b2c05",
+      "chatMessageIncomingLink": "#79a988",
+      "chatMessageIncomingText": "#dfe0e2",
+      "badgeNotification": "#e15932",
+      "badgeNotificationText": "#ffffff",
+      "alertNeutral": "#dfe0e2",
+      "alertNeutralText": "#ffffff",
+      "alertPopupNeutral": "#dfe0e2",
+      "alertPopupNeutralText": "#000000",
+      "alertSuccess": "#5dc94a",
+      "alertSuccessText": "#ffffff",
+      "alertPopupSuccess": "#5dc94a",
+      "alertPopupSuccessText": "#000000",
+      "alertWarning": "#ffc459",
+      "alertWarningText": "#ffffff",
+      "alertPopupWarning": "#ffc459",
+      "alertPopupWarningText": "#000000",
+      "alertError": "#d31014",
+      "alertErrorText": "#ffffff",
+      "alertPopupError": "#d31014",
+      "alertPopupErrorText": "#ffffff",
+      "panel": "#051402",
+      "panelText": "#dfe0e2",
+      "alertNeutralPanelText": "#ffffff",
+      "alertSuccessPanelText": "#dfe0e2",
+      "alertWarningPanelText": "#ffffff",
+      "alertErrorPanelText": "#dfe0e2",
+      "fgText": "#dfe0e2",
+      "topBar": "#051402",
+      "topBarText": "#c5c7cb",
+      "input": "#051402",
+      "inputTopbarText": "#c5c7cb",
+      "inputPanelText": "#dfe0e2",
+      "inputText": "#dfe0e2",
+      "btn": "#213913",
+      "btnText": "#dfe0e2",
+      "btnTopBarText": "#dfe0e2",
+      "btnDisabled": "#13210a",
+      "btnDisabledTopBarText": "#465140",
+      "btnPanelText": "#dfe0e2",
+      "btnDisabledPanelText": "#465140",
+      "btnDisabledText": "#465140",
+      "btnToggled": "#3ba940",
+      "btnToggledTopBarText": "#1e1e21",
+      "btnToggledPanelText": "#1e1e21",
+      "btnToggledText": "#1e1e21",
+      "btnPressed": "#213913",
+      "btnPressedTopBarText": "#dfe0e2",
+      "btnPressedTopBar": "#213913",
+      "btnPressedPanelText": "#dfe0e2",
+      "btnPressedPanel": "#213913",
+      "btnPressedText": "#dfe0e2",
+      "tabActiveText": "#dfe0e2",
+      "tabText": "#dfe0e2",
+      "tab": "#213913",
+      "fgLink": "#40da83",
+      "topBarLink": "#c5c7cb",
+      "panelLink": "#40da83",
+      "panelFaint": "#dfe0e2",
+      "icon": "#777d75",
+      "poll": "#40653d",
+      "pollText": "#dfe0e2",
+      "postCyantext": "#81beea",
+      "postGreentext": "#2cdb30",
+      "postLink": "#79a988",
+      "lightText": "#ffffff",
+      "popover": "#0e1907",
+      "selectedMenuPopover": "#1a2d0d",
+      "highlight": "#1a2d0d",
+      "highlightText": "#dfe0e2",
+      "selectedMenu": "#1a2d0d",
+      "selectedMenuText": "#dfe0e2",
+      "selectedMenuPopoverIcon": "#7d8778",
+      "highlightLink": "#79a988",
+      "selectedMenuLink": "#79a988",
+      "selectedMenuPopoverLink": "#79a988",
+      "selectedMenuPopoverText": "#dfe0e2",
+      "faintLink": "#79a988",
+      "highlightFaintLink": "#79a988",
+      "selectedMenuFaintLink": "#79a988",
+      "selectedMenuPopoverFaintLink": "#79a988",
+      "faint": "#dfe0e2",
+      "highlightFaintText": "#dfe0e2",
+      "selectedMenuFaintText": "#dfe0e2",
+      "selectedMenuPopoverFaintText": "#dfe0e2",
+      "highlightLightText": "#ffffff",
+      "selectedMenuLightText": "#ffffff",
+      "selectedMenuPopoverLightText": "#ffffff",
+      "selectedMenuIcon": "#7d8778",
+      "selectedPost": "#1e2a15",
+      "selectedPostText": "#dfe0e2",
+      "selectedPostIcon": "#7f857c",
+      "selectedPostLink": "#79a988",
+      "selectedPostFaintLink": "#79a988",
+      "highlightPostLink": "#79a988",
+      "selectedPostPostLink": "#79a988",
+      "selectedPostLightText": "#ffffff",
+      "selectedPostFaintText": "#dfe0e2",
+      "popoverText": "#dfe0e2",
+      "popoverIcon": "#777d75",
+      "popoverLink": "#79a988",
+      "postFaintLink": "#79a988",
+      "popoverPostFaintLink": "#79a988",
+      "popoverFaintLink": "#79a988",
+      "popoverFaintText": "#dfe0e2",
+      "popoverPostLink": "#79a988",
+      "popoverLightText": "#ffffff",
+      "highlightIcon": "#7d8778",
+      "highlightPostFaintLink": "#79a988",
+      "profileTint": "#0e1907",
+      "profileBg": "#070e04",
+      "wallpaper": "#151c09"
+    },
+    "opacity": {
+      "underlay": 0.35,
+      "bg": 1,
+      "border": 1,
+      "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
+      "input": 0.5,
+      "btn": 1,
+      "faint": 0.5,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "3",
+      "avatarAlt": "3",
+      "tooltip": "10",
+      "attachment": "0",
+      "chatMessage": "0"
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {},
+    "shadows": {
+      "buttonHover": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "0",
+          "spread": "2",
+          "inset": false,
+          "color": "#5a873a",
+          "alpha": "0.5"
+        },
+        {
+          "x": 0,
+          "y": "20",
+          "blur": "20",
+          "spread": "-14",
+          "inset": true,
+          "color": "#253817",
+          "alpha": "0.7"
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": "2",
+          "inset": false,
+          "color": "#ffffff",
+          "alpha": "0.6"
+        },
+        {
+          "x": 0,
+          "y": "0",
+          "blur": "11",
+          "spread": "1",
+          "inset": true,
+          "color": "#ffffff",
+          "alpha": "0.3"
+        }
+      ],
+      "panelHeader": [
+        {
+          "x": 0,
+          "y": "-2",
+          "blur": "0",
+          "spread": "0",
+          "inset": true,
+          "color": "#ffffff",
+          "alpha": "0.15"
+        }
+      ],
+      "panel": [
+        {
+          "x": 0,
+          "y": "0",
+          "blur": "5",
+          "spread": "2",
+          "inset": false,
+          "color": "#0a1707",
+          "alpha": "0.4"
+        }
+      ],
+      "button": [
+        {
+          "x": 0,
+          "y": "1",
+          "blur": "0",
+          "spread": "0",
+          "inset": true,
+          "color": "#ffffff",
+          "alpha": "0.2"
+        },
+        {
+          "x": 0,
+          "y": "20",
+          "blur": "20",
+          "spread": "-14",
+          "inset": true,
+          "color": "#253817",
+          "alpha": "0.7"
+        }
+      ],
+      "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"
+        }
+      ],
+      "avatar": [
+        {
+          "x": 0,
+          "y": 1,
+          "blur": "6",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0.8",
+          "inset": false
+        }
+      ],
+      "input": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 0,
+          "spread": "1",
+          "inset": true,
+          "color": "#1b501e",
+          "alpha": 1
+        }
+      ]
+    },
+    "opacity": {
+      "underlay": "0.35"
+    },
+    "colors": {
+      "bg": "#0e1907",
+      "wallpaper": "#151c09",
+      "fg": "#051402",
+      "text": "#dfe0e2",
+      "underlay": "#0f2d0c",
+      "link": "#79a988",
+      "accent": "#89d68c",
+      "cBlue": "#81beea",
+      "cRed": "#d31014",
+      "cGreen": "#5dc94a",
+      "cOrange": "#ffc459",
+      "selectedPost": "#1e2a15",
+      "postGreentext": "#2cdb30",
+      "border": "--fg,3",
+      "fgLink": "#40da83",
+      "topBarText": "--text,-9.75",
+      "topBarLink": "--topBarText",
+      "btn": "#213913",
+      "btnToggled": "--accent,-24.2",
+      "alertErrorText": "--text,21.2",
+      "badgeNotification": "#e15932",
+      "badgeNotificationText": "#ffffff"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "3",
+      "avatarAlt": "3",
+      "tooltip": "10",
+      "attachment": "0"
+    }
+  }
+}
--- a/static/themes/divoom.json
+++ b/static/themes/divoom.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":"5","y":"5","blur":"5","spread":"6","color":"#000000","alpha":"0.5"}],"topBar":[{"x":"0","y":"0","blur":4,"spread":"1","color":"#f6b831","alpha":"0.4"}],"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":[{"x":0,"y":0,"blur":"6","spread":"4","inset":false,"color":"#f6b831","alpha":"0.2"}],"panelHeader":[{"x":"0","y":"0","blur":"9","spread":"0","inset":false,"color":"#f7be48","alpha":"0.6"}],"button":[{"x":"5","y":"9","blur":"9","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":"4","y":"3","blur":"12","spread":"3","color":"#f0f000","alpha":"0.5"}],"buttonPressed":[{"x":0,"y":"0","blur":"3","spread":"2","inset":false,"color":"#ffff00","alpha":1}],"input":[]},"colors":{"underlay":"#000000","bg":"#271210","fg":"#ff9428","cRed":"#efebeb","cOrange":"#d3ac08","cGreen":"#1f9f18","cBlue":"#30a1cd","accent":"#d16029","link":"#ec8b41","text":"#29dc1b","chatBg":"#271210","chatMessageIncomingBg":"#271210","chatMessageOutgoingBg":"#3a1b18","chatMessageOutgoingBorder":"#411e1b","chatMessageOutgoingLink":"#ec8b41","chatMessageOutgoingText":"#29dc1b","border":"#000000","chatMessageIncomingBorder":"#060606","chatMessageIncomingLink":"#ec8b41","chatMessageIncomingText":"#29dc1b","badgeNotification":"#dc7e5f","badgeNotificationText":"#000000","alertNeutral":"#29dc1b","alertNeutralText":"#ffffff","alertPopupNeutral":"#29dc1b","alertPopupNeutralText":"#000000","alertWarning":"#d3ac08","alertWarningText":"#ffffff","alertPopupWarning":"#d3ac08","alertPopupWarningText":"#000000","alertError":"#efebeb","alertErrorText":"#000000","alertPopupError":"#efebeb","alertPopupErrorText":"#000000","panel":"#ff8000","panelText":"#00ff00","alertNeutralPanelText":"#ffffff","alertWarningPanelText":"#000000","alertErrorPanelText":"#000000","fgText":"#008040","topBar":"#6f0000","topBarText":"#f3e853","input":"#150a05","inputTopbarText":"#f3e853","inputPanelText":"#00ff00","inputText":"#29dc1b","btn":"#863c23","btnText":"#fff780","btnTopBarText":"#ffff00","btnDisabled":"#3f1d15","btnDisabledTopBarText":"#6f5610","btnPanelText":"#ffff00","btnDisabledPanelText":"#6f5610","btnDisabledText":"#6f5430","btnToggled":"#ce6542","btnToggledTopBarText":"#ffff00","btnToggledPanelText":"#ffffff","btnToggledText":"#ffffff","btnPressed":"#a55a40","btnPressedTopBarText":"#ffff00","btnPressedTopBar":"#a55a40","btnPressedPanelText":"#ffff00","btnPressedPanel":"#a55a40","btnPressedText":"#fff780","tabActiveText":"#29dc1b","tabText":"#f7c164","tab":"#863c23","fgLink":"#f3c853","topBarLink":"#00ff00","panelLink":"#31ffff","panelFaint":"#7fffc0","icon":"#e87721","poll":"#6b321a","pollText":"#29dc1b","postGreentext":"#43f8e6","postLink":"#f3e853","lightText":"#79ee70","popover":"#800000","selectedMenuPopover":"#9a0000","highlight":"#3a1b18","highlightText":"#29dc1b","selectedMenu":"#ff8080","selectedMenuText":"#ffff00","selectedMenuPopoverIcon":"#cd8000","highlightLink":"#ec8b41","selectedMenuLink":"#be5d13","selectedMenuPopoverLink":"#ec8b41","selectedMenuPopoverText":"#ffffff","faintLink":"#d28346","highlightFaintLink":"#d28346","selectedMenuFaintLink":"#b96a2d","selectedMenuPopoverFaintLink":"#d38346","faint":"#95814b","highlightFaintText":"#b4a06a","selectedMenuFaintText":"#ffffff","selectedMenuPopoverFaintText":"#000000","highlightLightText":"#79ee70","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#000000","selectedMenuIcon":"#ffc040","selectedPost":"#3a1b18","selectedPostText":"#00ff00","selectedPostIcon":"#1d8d0c","selectedPostLink":"#2fbbff","selectedPostFaintLink":"#d28346","highlightPostLink":"#f3e853","selectedPostPostLink":"#f3e853","selectedPostLightText":"#79ee70","selectedPostFaintText":"#b4a06a","popoverText":"#00ee00","popoverIcon":"#407700","popoverLink":"#ffff00","postFaintLink":"#f3e853
--- a/static/themes/electric-poles.json
+++ b/static/themes/electric-poles.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":1,"y":1,"blur":4,"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":[],"button":[{"x":0,"y":0,"blur":"0","spread":"1","color":"#00FFFF","alpha":"0.75","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}],"buttonHover":[{"x":0,"y":0,"blur":"0","spread":"1","color":"#00ffff","alpha":1,"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":"2","spread":"1","color":"#00ffff","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}],"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":"#000000","bg":"#102457","fg":"#1a1a1a","cRed":"#ffb0aa","cOrange":"#ffffaa","cGreen":"#5fad47","cBlue":"#21a1de","accent":"#ffb0ab","link":"#ffb0ab","text":"#d7d7d7","chatBg":"#102457","chatMessageIncomingBg":"#102457","chatMessageOutgoingBg":"#102457","chatMessageOutgoingBorder":"#102457","chatMessageOutgoingLink":"#ffb0ab","chatMessageOutgoingText":"#d7d7d7","border":"#102457","chatMessageIncomingBorder":"#122860","chatMessageIncomingLink":"#ffbbae","chatMessageIncomingText":"#d7d7d7","badgeNotification":"#ffbbaa","badgeNotificationText":"#000000","alertNeutral":"#d7d7d7","alertNeutralText":"#282828","alertPopupNeutral":"#d7d7d7","alertPopupNeutralText":"#282828","alertWarning":"#20a1de","alertWarningText":"#ffffff","alertPopupWarning":"#20a1de","alertPopupWarningText":"#000000","alertError":"#ffbcbb","alertErrorText":"#000000","alertPopupError":"#ffbcbb","alertPopupErrorText":"#000000","panel":"#102457","panelText":"#d7d7d7","alertNeutralPanelText":"#000000","alertWarningPanelText":"#ffffff","alertErrorPanelText":"#000000","fgText":"#b7faef","topBar":"#102457","topBarText":"#ffcaee","input":"#104690","inputTopbarText":"#ffcaee","inputPanelText":"#d7d7d7","inputText":"#ffcade","btn":"#102457","btnText":"#ffbeae","btnTopBarText":"#ffccdd","btnDisabled":"#102457","btnDisabledTopBarText":"#4c4e79","btnPanelText":"#ffbeaa","btnDisabledPanelText":"#4c4b6c","btnDisabledText":"#4c4b6d","btnToggled":"#2048ae","btnToggledTopBarText":"#ffccdd","btnToggledPanelText":"#ffbeaa","btnToggledText":"#ffbeae","btnPressed":"#103470","btnPressedTopBarText":"#f36ed6","btnPressedTopBar":"#103470","btnPressedPanelText":"#e58bb8","btnPressedPanel":"#103470","btnPressedText":"#e58bb8","tabActiveText":"#d7d7d7","tabText":"#e58bb8","tab":"#102457","fgLink":"#3ef9ed","topBarLink":"#fbd0f6","panelLink":"#ffbbde","panelFaint":"#b7faef","icon":"#747e97","poll":"#705c79","pollText":"#ffffff","postGreentext":"#5ade47","postLink":"#ffb0ab","lightText":"#ffffff","popover":"#102457","selectedMenuPopover":"#142d6d","highlight":"#142d6d","highlightText":"#d7d7d7","selectedMenu":"#142d6d","selectedMenuText":"#d7d7d7","selectedMenuPopoverIcon":"#7682a2","highlightLink":"#ffb0ab","selectedMenuLink":"#ffbbce","selectedMenuPopoverLink":"#440013","selectedMenuPopoverText":"#282828","faintLink":"#ffbea1","highlightFaintLink":"#ffbea1","selectedMenuFaintLink":"#ffbea1","selectedMenuPopoverFaintLink":"#5f1e00","faint":"#d7d7d7","highlightFaintText":"#d7d7d7","selectedMenuFaintText":"#d7d7d7","selectedMenuPopoverFaintText":"#282828","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#000000","selectedMenuIcon":"#7682a2","sele
--- a/static/themes/evening-city.json
+++ b/static/themes/evening-city.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"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":"#accfe8","alpha":1,"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":"#b9b9ba","alpha":0.5,"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":{"underlay":"#000000","bg":"#0b0b0b","fg":"#182230","cRed":"#d31014","cOrange":"#ffa500","cGreen":"#0fa00f","cBlue":"#0095ff","accent":"#accfe8","link":"#accfe8","text":"#b9b9ba","chatBg":"#0b0b0b","chatMessageIncomingBg":"#0b0b0b","chatMessageOutgoingBg":"#181818","chatMessageOutgoingBorder":"#1d1d1d","chatMessageOutgoingLink":"#accfe8","chatMessageOutgoingText":"#b9b9ba","border":"#4c545b","chatMessageIncomingBorder":"#515a61","chatMessageIncomingLink":"#accfe8","chatMessageIncomingText":"#b9b9ba","badgeNotification":"#d31014","badgeNotificationText":"#ffffff","alertNeutral":"#b9b9ba","alertNeutralText":"#ffffff","alertPopupNeutral":"#b9b9ba","alertPopupNeutralText":"#000000","alertWarning":"#ffa500","alertWarningText":"#ffffff","alertPopupWarning":"#ffa500","alertPopupWarningText":"#000000","alertError":"#d31014","alertErrorText":"#b9b9ba","alertPopupError":"#d31014","alertPopupErrorText":"#ffffff","panel":"#31363b","panelText":"#b9b9ba","alertNeutralPanelText":"#ffffff","alertWarningPanelText":"#ffffff","alertErrorPanelText":"#b9b9ba","fgText":"#b9b9ba","topBar":"#313131","topBarText":"#b9b9ba","input":"#0b0b0b","inputTopbarText":"#b9b9ba","inputPanelText":"#b9b9ba","inputText":"#b9b9ba","btn":"#0b0b0b","btnText":"#b9b9ba","btnTopBarText":"#b9b9ba","btnDisabled":"#0b0b0b","btnDisabledTopBarText":"#373737","btnPanelText":"#b9b9ba","btnDisabledPanelText":"#373737","btnDisabledText":"#373737","btnToggled":"#3e3e3e","btnToggledTopBarText":"#b9b9ba","btnToggledPanelText":"#b9b9ba","btnToggledText":"#b9b9ba","btnPressed":"#0b0b0b","btnPressedTopBarText":"#b9b9ba","btnPressedTopBar":"#0b0b0b","btnPressedPanelText":"#b9b9ba","btnPressedPanel":"#0b0b0b","btnPressedText":"#b9b9ba","tabActiveText":"#b9b9ba","tabText":"#b9b9ba","tab":"#0b0b0b","fgLink":"#accfe8","topBarLink":"#eff0f1","panelLink":"#accfe8","panelFaint":"#b9b9ba","icon":"#626263","poll":"#4c5a64","pollText":"#ffffff","postGreentext":"#0fa00f","postLink":"#accfe8","lightText":"#ededed","popover":"#0b0b0b","selectedMenuPopover":"#181818","highlight":"#181818","highlightText":"#b9b9ba","selectedMenu":"#181818","selectedMenuText":"#b9b9ba","selectedMenuPopoverIcon":"#696969","highlightLink":"#accfe8","selectedMenuLink":"#accfe8","selectedMenuPopoverLink":"#accfe8","selectedMenuPopoverText":"#b9b9ba","faintLink":"#accfe8","highlightFaintLink":"#accfe8","selectedMenuFaintLink":"#accfe8","selectedMenuPopoverFaintLink":"#accfe8","faint":"#b9b9ba","highlightFaintText":"#b9b9ba","selectedMenuFaintText":"#b9b9ba","selectedMenuPopoverFaintText":"#b9b9ba","highlightLightText":"#ededed","selectedMenuLightText":"#ededed","selectedMenuPopoverLightText":"#ededed","selectedMenuIcon":"#696969","selectedPost":"#181818","selectedPostText":"#b9b9ba","selectedPostIcon":"#696969","selectedPostLink":"#accfe8","selectedPostFaintLink":"#accfe8","highlightPostLink":"#accfe8","select
--- a/static/themes/froth-noire.json
+++ b/static/themes/froth-noire.json
@ -0,0 +1,356 @@
+{
+  "name": "Froth Noire (@sam)",
+  "_pleroma_theme_version": 2,
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [
+        {
+          "x": 1,
+          "y": 1,
+          "blur": 4,
+          "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": [],
+      "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": 4,
+          "spread": 0,
+          "color": "#ffffff",
+          "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
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": 4,
+          "spread": 0,
+          "color": "#ffffff",
+          "alpha": 1
+        },
+        {
+          "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
+        }
+      ],
+      "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": "#000000",
+      "bg": "#000000",
+      "fg": "#0a0a0a",
+      "cRed": "#ea3000",
+      "cGreen": "#12984f",
+      "cOrange": "#ffff0b",
+      "cBlue": "#c0c0c0",
+      "accent": "#bcbcbc",
+      "link": "#a0a0a0",
+      "text": "#ffffff",
+      "chatBg": "#000000",
+      "chatMessageIncomingBg": "#000000",
+      "chatMessageOutgoingBg": "#0d0d0d",
+      "chatMessageOutgoingBorder": "#121212",
+      "chatMessageOutgoingLink": "#a0a0a0",
+      "chatMessageOutgoingText": "#ffffff",
+      "border": "#101010",
+      "chatMessageIncomingBorder": "#151515",
+      "chatMessageIncomingLink": "#a0a0a0",
+      "chatMessageIncomingText": "#ffffff",
+      "badgeNotification": "#c23000",
+      "badgeNotificationText": "#ffffff",
+      "alertNeutral": "#ffffff",
+      "alertNeutralText": "#000000",
+      "alertPopupNeutral": "#ffffff",
+      "alertPopupNeutralText": "#000000",
+      "alertSuccess": "#12984f",
+      "alertSuccessText": "#ffffff",
+      "alertPopupSuccess": "#12984f",
+      "alertPopupSuccessText": "#000000",
+      "alertWarning": "#ffff0b",
+      "alertWarningText": "#000000",
+      "alertPopupWarning": "#ffff0b",
+      "alertPopupWarningText": "#000000",
+      "alertError": "#ea3000",
+      "alertErrorText": "#ffffff",
+      "alertPopupError": "#ea3000",
+      "alertPopupErrorText": "#ffffff",
+      "panel": "#0a0a0a",
+      "panelText": "#ffffff",
+      "alertNeutralPanelText": "#000000",
+      "alertSuccessPanelText": "#ffffff",
+      "alertWarningPanelText": "#000000",
+      "alertErrorPanelText": "#ffffff",
+      "fgText": "#ffffff",
+      "topBar": "#0a0a0a",
+      "topBarText": "#ffffff",
+      "input": "#0a0a0a",
+      "inputTopbarText": "#ffffff",
+      "inputPanelText": "#ffffff",
+      "inputText": "#ffffff",
+      "btn": "#0a0a0a",
+      "btnText": "#ffffff",
+      "btnTopBarText": "#ffffff",
+      "btnDisabled": "#030303",
+      "btnDisabledTopBarText": "#424242",
+      "btnPanelText": "#ffffff",
+      "btnDisabledPanelText": "#424242",
+      "btnDisabledText": "#424242",
+      "btnToggled": "#3d3d3d",
+      "btnToggledTopBarText": "#ffffff",
+      "btnToggledPanelText": "#ffffff",
+      "btnToggledText": "#ffffff",
+      "btnPressed": "#0a0a0a",
+      "btnPressedTopBarText": "#ffffff",
+      "btnPressedTopBar": "#0a0a0a",
+      "btnPressedPanelText": "#ffffff",
+      "btnPressedPanel": "#0a0a0a",
+      "btnPressedText": "#ffffff",
+      "tabActiveText": "#ffffff",
+      "tabText": "#ffffff",
+      "tab": "#0a0a0a",
+      "fgLink": "#c0c0c0",
+      "topBarLink": "#c0c0c0",
+      "panelLink": "#c0c0c0",
+      "panelFaint": "#ffffff",
+      "icon": "#808080",
+      "poll": "#4c4c4c",
+      "pollText": "#ffffff",
+      "postCyantext": "#c0c0c0",
+      "postGreentext": "#12984f",
+      "postLink": "#a0a0a0",
+      "lightText": "#ffffff",
+      "popover": "#000000",
+      "selectedMenuPopover": "#0d0d0d",
+      "highlight": "#0d0d0d",
+      "highlightText": "#ffffff",
+      "selectedMenu": "#0d0d0d",
+      "selectedMenuText": "#ffffff",
+      "selectedMenuPopoverIcon": "#868686",
+      "highlightLink": "#a0a0a0",
+      "selectedMenuLink": "#a0a0a0",
+      "selectedMenuPopoverLink": "#a0a0a0",
+      "selectedMenuPopoverText": "#ffffff",
+      "faintLink": "#a0a0a0",
+      "highlightFaintLink": "#a0a0a0",
+      "selectedMenuFaintLink": "#a0a0a0",
+      "selectedMenuPopoverFaintLink": "#a0a0a0",
+      "faint": "#ffffff",
+      "highlightFaintText": "#ffffff",
+      "selectedMenuFaintText": "#ffffff",
+      "selectedMenuPopoverFaintText": "#ffffff",
+      "highlightLightText": "#ffffff",
+      "selectedMenuLightText": "#ffffff",
+      "selectedMenuPopoverLightText": "#ffffff",
+      "selectedMenuIcon": "#868686",
+      "selectedPost": "#0d0d0d",
+      "selectedPostText": "#ffffff",
+      "selectedPostIcon": "#868686",
+      "selectedPostLink": "#a0a0a0",
+      "selectedPostFaintLink": "#a0a0a0",
+      "highlightPostLink": "#a0a0a0",
+      "selectedPostPostLink": "#a0a0a0",
+      "selectedPostLightText": "#ffffff",
+      "selectedPostFaintText": "#ffffff",
+      "popoverText": "#ffffff",
+      "popoverIcon": "#808080",
+      "popoverLink": "#a0a0a0",
+      "postFaintLink": "#a0a0a0",
+      "popoverPostFaintLink": "#a0a0a0",
+      "popoverFaintLink": "#a0a0a0",
+      "popoverFaintText": "#ffffff",
+      "popoverPostLink": "#a0a0a0",
+      "popoverLightText": "#ffffff",
+      "highlightIcon": "#868686",
+      "highlightPostFaintLink": "#a0a0a0",
+      "profileTint": "#000000",
+      "profileBg": "#000000",
+      "wallpaper": "#000000"
+    },
+    "opacity": {
+      "underlay": 0,
+      "bg": 0.95,
+      "border": 1,
+      "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
+      "input": 0.5,
+      "btn": 1,
+      "faint": 0.5,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": 4,
+      "input": 4,
+      "checkbox": 2,
+      "panel": 10,
+      "avatar": 5,
+      "avatarAlt": 50,
+      "tooltip": 2,
+      "attachment": 5
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {},
+    "shadows": {},
+    "opacity": {
+      "bg": "0.95",
+      "underlay": "0.0"
+    },
+    "colors": {
+      "bg": "#000000",
+      "fg": "#0A0A0A",
+      "text": "#ffffff",
+      "underlay": "#000000",
+      "link": "#A0A0A0",
+      "accent": "#bcbcbc",
+      "cBlue": "#c0c0c0",
+      "cRed": "#EA3000",
+      "cGreen": "#12984f",
+      "cOrange": "#ffff0b",
+      "fgLink": "#c0c0c0",
+      "badgeNotification": "#C23000"
+    },
+    "radii": {}
+  }
+}
--- a/static/themes/galaxy-splash.json
+++ b/static/themes/galaxy-splash.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":"5","y":"5","blur":"5","spread":"6","color":"#000000","alpha":"0.5"}],"topBar":[{"x":"0","y":"0","blur":4,"spread":"1","color":"#f6b831","alpha":"0.4"}],"popup":[{"x":2,"y":2,"blur":3,"spread":0,"color":"#000000","alpha":0.5}],"avatar":[{"x":0,"y":1,"blur":"10","spread":"-13","color":"#ffffff","alpha":0.7}],"avatarStatus":[{"x":0,"y":0,"blur":"6","spread":"4","inset":false,"color":"#f6b831","alpha":"0.2"}],"panelHeader":[{"x":"11","y":"0","blur":"16","spread":"-16","inset":false,"color":"#f7be48","alpha":"0.6"}],"button":[{"x":"5","y":"9","blur":"0","spread":"-12","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":"4","y":"3","blur":"12","spread":"3","color":"#d8d8d8","alpha":"0.5"}],"buttonPressed":[{"x":0,"y":"0","blur":"3","spread":"2","inset":false,"color":"#dadada","alpha":1}],"input":[]},"colors":{"underlay":"#000000","bg":"#450000","fg":"#d22d2a","cRed":"#ff8e00","cOrange":"#00ff07","cGreen":"#d3fc00","cBlue":"#30a1cd","accent":"#d52562","link":"#01ffe7","text":"#d5d5d5","chatBg":"#450000","chatMessageIncomingBg":"#450000","chatMessageOutgoingBg":"#5f0000","chatMessageOutgoingBorder":"#690000","chatMessageOutgoingLink":"#01ffe7","chatMessageOutgoingText":"#d5d5d5","border":"#000000","chatMessageIncomingBorder":"#060606","chatMessageIncomingLink":"#01ffe7","chatMessageIncomingText":"#d5d5d5","badgeNotification":"#dc7e5f","badgeNotificationText":"#000000","alertNeutral":"#d5d5d5","alertNeutralText":"#000000","alertPopupNeutral":"#d5d5d5","alertPopupNeutralText":"#000000","alertWarning":"#00ff07","alertWarningText":"#ffffff","alertPopupWarning":"#00ff07","alertPopupWarningText":"#000000","alertError":"#ff8e00","alertErrorText":"#ffffff","alertPopupError":"#ff8e00","alertPopupErrorText":"#000000","panel":"#4e4e4e","panelText":"#d9d6d6","alertNeutralPanelText":"#000000","alertWarningPanelText":"#ffffff","alertErrorPanelText":"#ffffff","fgText":"#008040","topBar":"#6f0000","topBarText":"#d6d6d6","input":"#150a05","inputTopbarText":"#d6d6d6","inputPanelText":"#d9d6d6","inputText":"#d5d5d5","btn":"#8b2213","btnText":"#d7d7d7","btnTopBarText":"#d8d8d8","btnDisabled":"#570905","btnDisabledTopBarText":"#773d3a","btnPanelText":"#d8d8d8","btnDisabledPanelText":"#773d3a","btnDisabledText":"#773d3a","btnToggled":"#e13b24","btnToggledTopBarText":"#d8d8d8","btnToggledPanelText":"#ffffff","btnToggledText":"#ffffff","btnPressed":"#a55a40","btnPressedTopBarText":"#d8d8d8","btnPressedTopBar":"#a55a40","btnPressedPanelText":"#d8d8d8","btnPressedPanel":"#a55a40","btnPressedText":"#d7d7d7","tabActiveText":"#d5d5d5","tabText":"#d5d5d5","tab":"#863c23","fgLink":"#f353c9","topBarLink":"#ffe9e8","panelLink":"#31ffff","panelFaint":"#7fffc0","icon":"#e87721","poll":"#7f0f28","pollText":"#d5d5d5","postGreentext":"#efff00","postLink":"#00fffc","lightText":"#ffffff","popover":"#800000","selectedMenuPopover":"#9a0000","highlight":"#5f0000","highlightText":"#d5d5d5","selectedMenu":"#d52b52","selectedMenuText":"#cdff00","selectedMenuPopoverIcon":"#b48000","highlightLink":"#01ffe7","selectedMenuLink":"#01ffe7","selectedMenuPopoverLink":"#00fee7","selectedMenuPopoverText":"#ffffff","faintLink":"#d28346","highlightFaintLink":"#d28346","selectedMenuFaintLink":"#b96a2d","selectedMenuPopoverFaintLink":"#d38346","faint":"#95814b","highlightFaintText":"#b4a06a","selectedMenuFaintText":"#ffffff","selectedMenuPopoverFaintText":"#000000","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#000000","selectedMenuIcon":"#d19529","selectedPost":"#5f0000","selectedPostText":"#d5d5d5","selectedPostIcon":"#9a6b6b","selectedPostLink":"#2fbbff","selectedPostFaintLink":"#d28346","highlightPostLink":"#00fffc","selectedPostPostLink":"#00fffc","selectedPostLightText":"#ffffff","selectedPostFaintText":"#b4a06a","popoverText":"#ffffff","popoverIcon":"#c08080","popoverLink":"#d6d6d6","postFaintL
--- a/static/themes/gnutan.json
+++ b/static/themes/gnutan.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":1,"y":1,"blur":4,"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":[],"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":4,"spread":0,"color":"#ffffff","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}],"buttonPressed":[{"x":0,"y":0,"blur":4,"spread":0,"color":"#ffffff","alpha":1},{"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}],"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":"#000000","bg":"#101010","fg":"#161616","cRed":"#ff3d77","cOrange":"#fab81e","cGreen":"#17bf63","cBlue":"#1b95e0","accent":"#0084b8","link":"#0084b8","text":"#ffffff","chatBg":"#101010","chatMessageIncomingBg":"#101010","chatMessageOutgoingBg":"#1d1d1d","chatMessageOutgoingBorder":"#222222","chatMessageOutgoingLink":"#47cbff","chatMessageOutgoingText":"#ffffff","border":"#1c1c1c","chatMessageIncomingBorder":"#212121","chatMessageIncomingLink":"#0084b8","chatMessageIncomingText":"#ffffff","badgeNotification":"#ff3d77","badgeNotificationText":"#ffffff","alertNeutral":"#ffffff","alertNeutralText":"#000000","alertPopupNeutral":"#ffffff","alertPopupNeutralText":"#000000","alertWarning":"#fab81e","alertWarningText":"#ffffff","alertPopupWarning":"#fab81e","alertPopupWarningText":"#000000","alertError":"#ff3d77","alertErrorText":"#ffffff","alertPopupError":"#ff3d77","alertPopupErrorText":"#000000","panel":"#161616","panelText":"#ffffff","alertNeutralPanelText":"#000000","alertWarningPanelText":"#ffffff","alertErrorPanelText":"#ffffff","fgText":"#ffffff","topBar":"#161616","topBarText":"#ffffff","input":"#161616","inputTopbarText":"#ffffff","inputPanelText":"#ffffff","inputText":"#ffffff","btn":"#161616","btnText":"#ffffff","btnTopBarText":"#ffffff","btnDisabled":"#121212","btnDisabledTopBarText":"#4d4d4d","btnPanelText":"#ffffff","btnDisabledPanelText":"#4d4d4d","btnDisabledText":"#4d4d4d","btnToggled":"#494949","btnToggledTopBarText":"#ffffff","btnToggledPanelText":"#ffffff","btnToggledText":"#ffffff","btnPressed":"#161616","btnPressedTopBarText":"#ffffff","btnPressedTopBar":"#161616","btnPressedPanelText":"#ffffff","btnPressedPanel":"#161616","btnPressedText":"#ffffff","tabActiveText":"#ffffff","tabText":"#ffffff","tab":"#161616","fgLink":"#47cbff","topBarLink":"#47cbff","panelLink":"#47cbff","panelFaint":"#ffffff","icon":"#888888","poll":"#0a3f54","pollText":"#ffffff","postGreentext":"#17bf63","postLink":"#0084b8","lightText":"#ffffff","popover":"#101010","selectedMenuPopover":"#1d1d1d","highlight":"#1d1d1d","highlightText":"#ffffff","selectedMenu":"#1d1d1d","selectedMenuText":"#ffffff","selectedMenuPopoverIcon":"#8e8e8e","highlightLink":"#47cbff","selectedMenuLink":"#47cbff","selectedMenuPopoverLink":"#47cbff","selectedMenuPopoverText":"#ffffff","faintLink":"#0084b8","highlightFaintLink":"#47cbff","selectedMenuFaintLink":"#47cbff","selectedMenuPopoverFaintLink":"#47cbff","faint":"#ffffff","highlightFaintText":"#ffffff","selectedMenuFaintText":"#ffffff","selectedMenuPopoverFaintText":"#ffffff","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#ffffff","selectedMenuIcon":"#8e8e8e","selectedPost":"#1d1d1d","selectedPostText":"#ffffff","selected
--- a/static/themes/ihatebeingalive.json
+++ b/static/themes/ihatebeingalive.json
@ -1,543 +0,0 @@
-{
-  "_pleroma_theme_version": 2,
-  "name": "ihatebeinga.live",
-  "theme": {
-    "themeEngineVersion": 3,
-    "shadows": {
-      "panel": [
-        {
-          "color": "#000000",
-          "x": "1",
-          "y": "2",
-          "blur": "6",
-          "spread": 0,
-          "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": [
-        {
-          "color": "#ffffff",
-          "x": 0,
-          "y": "40",
-          "blur": "40",
-          "spread": "-40",
-          "inset": true,
-          "alpha": "0.1"
-        }
-      ],
-      "button": [
-        {
-          "color": "#ffffff",
-          "x": 0,
-          "y": "0",
-          "blur": "0",
-          "spread": "1",
-          "alpha": "0.15",
-          "inset": true
-        },
-        {
-          "color": "#000000",
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonHover": [
-        {
-          "color": "#3daee9",
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "alpha": 1,
-          "inset": true
-        },
-        {
-          "color": "#000000",
-          "x": "1",
-          "y": "1",
-          "blur": "1",
-          "spread": 0,
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "buttonPressed": [
-        {
-          "color": "#bebebe",
-          "x": 0,
-          "y": 0,
-          "blur": "0",
-          "spread": "50",
-          "alpha": 0.5,
-          "inset": true
-        },
-        {
-          "color": "#ffffff",
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "alpha": 0.2,
-          "inset": true
-        },
-        {
-          "color": "#000000",
-          "x": "1",
-          "y": "1",
-          "blur": 0,
-          "spread": 0,
-          "alpha": "0.3",
-          "inset": false
-        }
-      ],
-      "input": [
-        {
-          "color": "#FFFFFF",
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "alpha": "0.2",
-          "inset": true
-        }
-      ]
-    },
-    "colors": {
-      "underlay": "#000000",
-      "bg": "#070e1b",
-      "fg": "#31363b",
-      "cRed": "#c42d38",
-      "cGreen": "#22b325",
-      "cOrange": "#d7d720",
-      "cBlue": "#ffffff",
-      "accent": "#3daee9",
-      "link": "#3daee9",
-      "text": "#bebebe",
-      "chatBg": "#070e1b",
-      "chatMessageIncomingBg": "#070e1b",
-      "chatMessageOutgoingBg": "#0d1930",
-      "chatMessageOutgoingBorder": "#0f1d38",
-      "chatMessageOutgoingLink": "#3daee9",
-      "chatMessageOutgoingText": "#bebebe",
-      "border": "#363c41",
-      "chatMessageIncomingBorder": "#3b4247",
-      "chatMessageIncomingLink": "#3daee9",
-      "chatMessageIncomingText": "#bebebe",
-      "badgeNotification": "#024297",
-      "badgeNotificationText": "#ffffff",
-      "alertNeutral": "#bebebe",
-      "alertNeutralText": "#ffffff",
-      "alertPopupNeutral": "#bebebe",
-      "alertPopupNeutralText": "#000000",
-      "alertSuccess": "#22b325",
-      "alertSuccessText": "#ffffff",
-      "alertPopupSuccess": "#22b325",
-      "alertPopupSuccessText": "#000000",
-      "alertWarning": "#d7d720",
-      "alertWarningText": "#ffffff",
-      "alertPopupWarning": "#d7d720",
-      "alertPopupWarningText": "#000000",
-      "alertError": "#ff090f",
-      "alertErrorText": "#bebebe",
-      "alertPopupError": "#ff090f",
-      "alertPopupErrorText": "#ffffff",
-      "panel": "#0d1a31",
-      "panelText": "#bebebe",
-      "alertNeutralPanelText": "#ffffff",
-      "alertSuccessPanelText": "#ffffff",
-      "alertWarningPanelText": "#ffffff",
-      "alertErrorPanelText": "#bebebe",
-      "fgText": "#bebebe",
-      "topBar": "#0d1a31",
-      "topBarText": "#bebebe",
-      "input": "#1b1d1f",
-      "inputTopbarText": "#bebebe",
-      "inputPanelText": "#bebebe",
-      "inputText": "#bebebe",
-      "btn": "#1b1d1f",
-      "btnText": "#bebebe",
-      "btnTopBarText": "#bebebe",
-      "btnDisabled": "#0c121c",
-      "btnDisabledTopBarText": "#393d45",
-      "btnPanelText": "#bebebe",
-      "btnDisabledPanelText": "#393d45",
-      "btnDisabledText": "#393d45",
-      "btnToggled": "#1b1d1f",
-      "btnToggledTopBarText": "#bebebe",
-      "btnToggledPanelText": "#bebebe",
-      "btnToggledText": "#bebebe",
-      "btnPressed": "#1b1d1f",
-      "btnPressedTopBarText": "#bebebe",
-      "btnPressedTopBar": "#1b1d1f",
-      "btnPressedPanelText": "#bebebe",
-      "btnPressedPanel": "#1b1d1f",
-      "btnPressedText": "#bebebe",
-      "tabActiveText": "#bebebe",
-      "tabText": "#bebebe",
-      "tab": "#1b1d1f",
-      "fgLink": "#543fe7",
-      "topBarLink": "#bebebe",
-      "panelLink": "#38a5ed",
-      "panelFaint": "#bebebe",
-      "icon": "#63666d",
-      "poll": "#1d4f6e",
-      "pollText": "#bebebe",
-      "postGreentext": "#22b325",
-      "postLink": "#3daee9",
-      "lightText": "#f2f2f2",
-      "popover": "#070e1b",
-      "selectedMenuPopover": "#0d1930",
-      "highlight": "#0d1930",
-      "highlightText": "#bebebe",
-      "selectedMenu": "#0d1930",
-      "selectedMenuText": "#bebebe",
-      "selectedMenuPopoverIcon": "#666c77",
-      "highlightLink": "#3daee9",
-      "selectedMenuLink": "#3daee9",
-      "selectedMenuPopoverLink": "#3daee9",
-      "selectedMenuPopoverText": "#bebebe",
-      "faintLink": "#3daee9",
-      "highlightFaintLink": "#3daee9",
-      "selectedMenuFaintLink": "#3daee9",
-      "selectedMenuPopoverFaintLink": "#3daee9",
-      "faint": "#bebebe",
-      "highlightFaintText": "#bebebe",
-      "selectedMenuFaintText": "#bebebe",
-      "selectedMenuPopoverFaintText": "#bebebe",
-      "highlightLightText": "#f2f2f2",
-      "selectedMenuLightText": "#f2f2f2",
-      "selectedMenuPopoverLightText": "#f2f2f2",
-      "selectedMenuIcon": "#666c77",
-      "selectedPost": "#0d1930",
-      "selectedPostText": "#bebebe",
-      "selectedPostIcon": "#666c77",
-      "selectedPostLink": "#3daee9",
-      "selectedPostFaintLink": "#3daee9",
-      "highlightPostLink": "#3daee9",
-      "selectedPostPostLink": "#3daee9",
-      "selectedPostLightText": "#f2f2f2",
-      "selectedPostFaintText": "#bebebe",
-      "popoverText": "#bebebe",
-      "popoverIcon": "#63666d",
-      "popoverLink": "#3daee9",
-      "postFaintLink": "#3daee9",
-      "popoverPostFaintLink": "#3daee9",
-      "popoverFaintLink": "#3daee9",
-      "popoverFaintText": "#bebebe",
-      "popoverPostLink": "#3daee9",
-      "popoverLightText": "#f2f2f2",
-      "highlightIcon": "#666c77",
-      "highlightPostFaintLink": "#3daee9",
-      "profileTint": "#070e1b",
-      "profileBg": "#03070f",
-      "wallpaper": "#050a13"
-    },
-    "opacity": {
-      "underlay": 0.15,
-      "bg": 0.99,
-      "border": 0.55,
-      "alert": 0.5,
-      "alertPopup": 0.95,
-      "panel": 0.75,
-      "input": 0.9,
-      "btn": 0.9,
-      "faint": 0.5,
-      "popover": 1,
-      "profileTint": 0.5
-    },
-    "radii": {
-      "btn": "4",
-      "input": "4",
-      "checkbox": "1",
-      "panel": "9",
-      "avatar": "3",
-      "avatarAlt": "4",
-      "tooltip": "7",
-      "attachment": "3",
-      "chatMessage": "9"
-    },
-    "fonts": {
-      "interface": {
-        "family": "Tiresias PCFont"
-      },
-      "input": {
-        "family": "inherit"
-      },
-      "post": {
-        "family": "inherit"
-      },
-      "postCode": {
-        "family": "monospace"
-      }
-    }
-  },
-  "source": {
-    "themeEngineVersion": 3,
-    "fonts": {
-      "interface": {
-        "family": "Tiresias PCFont"
-      }
-    },
-    "shadows": {
-      "panel": [
-        {
-          "x": "1",
-          "y": "2",
-          "blur": "6",
-          "spread": 0,
-          "color": "#000000",
-          "alpha": 0.6
-        }
-      ],
-      "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
-        }
-      ],
-      "panelHeader": [
-        {
-          "x": 0,
-          "y": "40",
-          "blur": "40",
-          "spread": "-40",
-          "inset": true,
-          "color": "#ffffff",
-          "alpha": "0.1"
-        }
-      ],
-      "buttonHover": [
-        {
-          "x": 0,
-          "y": "0",
-          "blur": 0,
-          "spread": "1",
-          "color": "--link",
-          "alpha": 1,
-          "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": 0.5,
-          "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
-        }
-      ]
-    },
-    "opacity": {
-      "bg": "0.99",
-      "border": "0.55",
-      "panel": "0.75",
-      "btn": "0.9",
-      "input": "0.9"
-    },
-    "colors": {
-      "bg": "#070e1b",
-      "fg": "#31363b",
-      "text": "#bebebe",
-      "underlay": "#000000",
-      "link": "#3daee9",
-      "accent": "#3daee9",
-      "faint": "#bebebe",
-      "faintLink": "#3daee9",
-      "postFaintLink": "#3daee9",
-      "cBlue": "#ffffff",
-      "cRed": "#c42d38",
-      "cGreen": "#22b325",
-      "cOrange": "#d7d720",
-      "highlight": "#0d1930",
-      "highlightLightText": "#f2f2f2",
-      "highlightPostLink": "#3daee9",
-      "highlightFaintText": "#bebebe",
-      "highlightFaintLink": "#3daee9",
-      "highlightPostFaintLink": "#3daee9",
-      "highlightText": "#bebebe",
-      "highlightLink": "#3daee9",
-      "highlightIcon": "#666c77",
-      "popover": "#070e1b",
-      "popoverLightText": "#f2f2f2",
-      "popoverPostLink": "#3daee9",
-      "popoverFaintText": "#bebebe",
-      "popoverFaintLink": "#3daee9",
-      "popoverPostFaintLink": "#3daee9",
-      "popoverText": "#bebebe",
-      "popoverLink": "#3daee9",
-      "popoverIcon": "#63666d",
-      "selectedPost": "#0d1930",
-      "selectedPostFaintText": "#bebebe",
-      "selectedPostLightText": "#f2f2f2",
-      "selectedPostPostLink": "#3daee9",
-      "selectedPostFaintLink": "#3daee9",
-      "selectedPostText": "#bebebe",
-      "selectedPostLink": "#3daee9",
-      "selectedPostIcon": "#666c77",
-      "selectedMenu": "#0d1930",
-      "selectedMenuLightText": "#f2f2f2",
-      "selectedMenuFaintText": "#bebebe",
-      "selectedMenuFaintLink": "#3daee9",
-      "selectedMenuText": "#bebebe",
-      "selectedMenuLink": "#3daee9",
-      "selectedMenuIcon": "#666c77",
-      "selectedMenuPopover": "#0d1930",
-      "selectedMenuPopoverLightText": "#f2f2f2",
-      "selectedMenuPopoverFaintText": "#bebebe",
-      "selectedMenuPopoverFaintLink": "#3daee9",
-      "selectedMenuPopoverText": "#bebebe",
-      "selectedMenuPopoverLink": "#3daee9",
-      "selectedMenuPopoverIcon": "#666c77",
-      "lightText": "#f2f2f2",
-      "postLink": "#3daee9",
-      "border": "#363c41",
-      "poll": "#1d4f6e",
-      "pollText": "#bebebe",
-      "icon": "#63666d",
-      "fgText": "#bebebe",
-      "fgLink": "#543fe7",
-      "panel": "#0d1a31",
-      "panelText": "#bebebe",
-      "panelFaint": "#bebebe",
-      "panelLink": "#38a5ed",
-      "topBar": "#0d1a31",
-      "topBarText": "#bebebe",
-      "topBarLink": "#bebebe",
-      "tab": "#1b1d1f",
-      "tabText": "#bebebe",
-      "tabActiveText": "#bebebe",
-      "btn": "#1b1d1f",
-      "btnText": "#bebebe",
-      "btnPanelText": "#bebebe",
-      "btnTopBarText": "#bebebe",
-      "btnPressed": "#1b1d1f",
-      "btnPressedText": "#bebebe",
-      "btnPressedPanel": "#1b1d1f",
-      "btnPressedPanelText": "#bebebe",
-      "btnPressedTopBar": "#1b1d1f",
-      "btnPressedTopBarText": "#bebebe",
-      "btnToggled": "#1b1d1f",
-      "btnToggledText": "#bebebe",
-      "btnToggledPanelText": "#bebebe",
-      "btnToggledTopBarText": "#bebebe",
-      "btnDisabled": "#0c121c",
-      "btnDisabledText": "#393d45",
-      "btnDisabledPanelText": "#393d45",
-      "btnDisabledTopBarText": "#393d45",
-      "input": "#1b1d1f",
-      "inputText": "#bebebe",
-      "inputPanelText": "#bebebe",
-      "inputTopbarText": "#bebebe",
-      "alertError": "#ff090f",
-      "alertErrorText": "#bebebe",
-      "alertErrorPanelText": "#bebebe",
-      "alertWarning": "#d7d720",
-      "alertWarningText": "#ffffff",
-      "alertWarningPanelText": "#ffffff",
-      "alertNeutral": "#bebebe",
-      "alertNeutralText": "#ffffff",
-      "alertNeutralPanelText": "#ffffff",
-      "badgeNotification": "#024297",
-      "badgeNotificationText": "#ffffff"
-    },
-    "radii": {
-      "btn": "4",
-      "input": "4",
-      "checkbox": "1",
-      "panel": "9",
-      "avatar": "3",
-      "avatarAlt": "4",
-      "tooltip": "7",
-      "attachment": "3"
-    }
-  }
-}
--- a/static/themes/mammal.json
+++ b/static/themes/mammal.json
@ -0,0 +1,57 @@
+{
+  "_pleroma_theme_version": 2,
+  "name": "Mammal",
+  "theme": {
+    "shadows": {
+      "button": [],
+      "buttonHover": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": 1024,
+          "color": "#56a7e1",
+          "alpha": "1",
+          "inset": true
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": 1024,
+          "color": "#56a7e1",
+          "alpha": "1",
+          "inset": true
+        }
+      ],
+      "panel": [],
+      "panelHeader": [],
+      "topBar": []
+    },
+    "opacity": { "input": "1" },
+    "colors": {
+      "bg": "#282c37",
+      "text": "#f8f8f8",
+      "link": "#9bacc8",
+      "fg": "#444b5d",
+      "input": "#FFFFFF",
+      "inputText": "#282c37",
+      "btn": "#2b90d9",
+      "btnText": "#FFFFFF",
+      "cRed": "#7f3142",
+      "cBlue": "#2b90d9",
+      "cGreen": "#2bd850",
+      "cOrange": "#ca8f04"
+    },
+    "radii": {
+      "btn": 4,
+      "input": 4,
+      "panel": "0",
+      "avatar": "4",
+      "avatarAlt": "4",
+      "attachment": "4"
+    }
+  }
+}
--- a/static/themes/midnight-wizardry.json
+++ b/static/themes/midnight-wizardry.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":1,"y":1,"blur":4,"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":[],"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":4,"spread":0,"color":"#ddffff","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}],"buttonPressed":[{"x":0,"y":0,"blur":4,"spread":0,"color":"#ddffff","alpha":1},{"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}],"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":"#000000","bg":"#280055","fg":"#c9f1ff","cRed":"#f08fff","cOrange":"#ffd05d","cGreen":"#5bff90","cBlue":"#beeaff","accent":"#f9cdff","link":"#ffaaff","text":"#ddffff","chatBg":"#280055","chatMessageIncomingBg":"#280055","chatMessageOutgoingBg":"#34006f","chatMessageOutgoingBorder":"#390079","chatMessageOutgoingLink":"#ffaaff","chatMessageOutgoingText":"#ddffff","border":"#d4f4ff","chatMessageIncomingBorder":"#def7ff","chatMessageIncomingLink":"#ffaaff","chatMessageIncomingText":"#ddffff","badgeNotification":"#800be1","badgeNotificationText":"#fed9ff","alertNeutral":"#ddffff","alertNeutralText":"#002223","alertPopupNeutral":"#ddffff","alertPopupNeutralText":"#002223","alertWarning":"#ffc1c1","alertWarningText":"#ffffff","alertPopupWarning":"#ffc1c1","alertPopupWarningText":"#000000","alertError":"#ac1be8","alertErrorText":"#dcf5ff","alertPopupError":"#ac1be8","alertPopupErrorText":"#dcf5ff","panel":"#091833","panelText":"#c1ffe8","alertNeutralPanelText":"#000000","alertWarningPanelText":"#ffffff","alertErrorPanelText":"#c1ffe8","fgText":"#c9f2ff","topBar":"#6600a3","topBarText":"#ff6c60","input":"#133e7c","inputTopbarText":"#ffffff","inputPanelText":"#c1ffe8","inputText":"#d7d7d5","btn":"#133e7c","btnText":"#a7f3f7","btnTopBarText":"#a7f3f7","btnDisabled":"#23105f","btnDisabledTopBarText":"#444985","btnPanelText":"#a7f3f7","btnDisabledPanelText":"#444985","btnDisabledText":"#444985","btnToggled":"#216ad5","btnToggledTopBarText":"#ffffff","btnToggledPanelText":"#ffffff","btnToggledText":"#ffffff","btnPressed":"#133e7c","btnPressedTopBarText":"#a7f3f7","btnPressedTopBar":"#133e7c","btnPressedPanelText":"#a7f3f7","btnPressedPanel":"#133e7c","btnPressedText":"#a7f3f7","tabActiveText":"#ddffff","tabText":"#a7f3f7","tab":"#133e7c","fgLink":"#edf9ff","topBarLink":"#edf9ff","panelLink":"#edf9ff","panelFaint":"#c9f2ff","icon":"#8380aa","poll":"#7c5299","pollText":"#ddffff","postGreentext":"#5bff90","postLink":"#ffaaff","lightText":"#ffffff","popover":"#280055","selectedMenuPopover":"#34006f","highlight":"#34006f","highlightText":"#ddffff","selectedMenu":"#34006f","selectedMenuText":"#ddffff","selectedMenuPopoverIcon":"#8980b7","highlightLink":"#ffaaff","selectedMenuLink":"#ffaaff","selectedMenuPopoverLink":"#ffaaff","selectedMenuPopoverText":"#ddffff","faintLink":"#ffaaff","highlightFaintLink":"#ffaaff","selectedMenuFaintLink":"#ffaaff","selectedMenuPopoverFaintLink":"#ffaaff","faint":"#ddffff","highlightFaintText":"#ddffff","selectedMenuFaintText":"#ddffff","selectedMenuPopoverFaintText":"#ddffff","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#ffffff","selectedMenuIcon":"#8980b7","selectedPost":"#34006f","selectedPostText":"#ddffff","selected
--- a/static/themes/mojave.json
+++ b/static/themes/mojave.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"name":"Mojave (@hellpie)","theme":{"fonts":{"postCode":{"family":"Menlo,sans-serif"},"interface":{"family":"SF Pro Display,sans-serif"},"input":{"family":"SF Pro Text,sans-serif"},"post":{"family":"SF Pro Text,sans-serif"}},"shadows":{"panelHeader":[{"x":0,"y":"-0.5","blur":0,"spread":0,"inset":true,"color":"#000000","alpha":"1"},{"x":0,"y":"-1","blur":0,"spread":0,"inset":true,"color":"#2B2B2B","alpha":"1"},{"x":0,"y":"0.5","blur":0,"spread":0,"inset":true,"color":"#FFFFFF","alpha":"0.1"},{"x":0,"y":"50","blur":"50","spread":"0","inset":true,"color":"#4B4B4B","alpha":"1"}],"topBar":[{"x":0,"y":"-0.5","blur":0,"spread":0,"inset":true,"color":"#000000","alpha":"1"},{"x":0,"y":"-1","blur":0,"spread":0,"inset":true,"color":"#2B2B2B","alpha":"1"},{"x":0,"y":"0.5","blur":0,"spread":0,"inset":true,"color":"#FFFFFF","alpha":"0.1"}],"panel":[{"x":0,"y":0,"blur":0,"spread":"1","inset":true,"color":"#FFFFFF","alpha":"0.15"},{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.65"},{"x":0,"y":"2.5","blur":"5","spread":"0","inset":false,"color":"#000000","alpha":"0.3"},{"x":0,"y":"5","blur":"8.5","spread":"0","inset":false,"color":"#000000","alpha":"0.4"}],"popup":[{"x":"0","y":"0","blur":"0","spread":"1","color":"#FFFFFF","alpha":"0.15","inset":true},{"x":"0","y":"0","blur":"0","spread":"1","color":"#000000","alpha":"0.5","inset":true},{"x":2,"y":2,"blur":"10.5","spread":0,"color":"#000000","alpha":"0.25"}],"input":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#FFFFFF","alpha":"0.05"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.05"},{"x":0,"y":"-1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.08"},{"x":0,"y":"-0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.09"},{"x":0,"y":"1.5","blur":"1.5","spread":"0","inset":true,"color":"#000000","alpha":"0.10"}],"button":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"}],"buttonHover":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"},{"x":0,"y":"0","blur":"0","spread":"1000","inset":true,"color":"#FFFFFF","alpha":"0.2"}],"buttonPressed":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"},{"x":0,"y":"30","blur":"30","spread":"0","inset":true,"color":"#1768E5","alpha":"0.67"},{"x":0,"y":"0","blur":"0","spread":"1000","inset":true,"color":"#145CCC","alpha":"0.67"}],"avatarStatus":[{"x":0,"y":"1","blur":"2","spread":0,"inset":false,"color":"#000000","alpha":"0.4"}],"avatar":[{"x":0,"y":1,"blur":"2","spread":0,"color":"#000000","alpha":"0.4"}]},"opacity":{"btn":"0.22","input":"0.05","faint":"0.55"},"colors":{"bg":"#2c2c2c","text":"#FAFAFA","link":"#419cff","fg":"#5a5a5a","fgText":"#FAFAFA","fgLink":"#419cff","panel":"#3D3D3D","panelLink":"#FAFAFA","input":"#FFFFFF","inputText":"#FFFFFF","topBar":"#323639","topBarLink":"#FAFAFA","btn":"#FFFFFF","btnText":"#FFFFFF","alertError":"#ff655f","faint":"#FFFFFF","border":"#000000","cRed":"#ff453a","cBlue":"#0a84ff","cGreen":"#32d74b","cOrange":"#ff9f0a"},"radii":{"btn":"4","input":"4","checkbox":"3","panel":"4","avatar":"4","tooltip":"2","attachment":"4"}}}
--- a/static/themes/simply-dark.json
+++ b/static/themes/simply-dark.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"name":"Simply Dark (@pie)","theme":{"fonts":{"interface":{"family":"\"Roboto\", \"Droid Sans\", \"Open Sans\",Arial, Helvetica, sans-serif"},"postCode":{"family":"Menlo, Consolas, Monaco, monospace"}},"shadows":{"button":[{"x":0,"y":0,"blur":"0","spread":0,"color":"#000000","alpha":"0"},{"x":0,"y":1,"blur":0,"spread":0,"color":"#FFFFFF","alpha":"0","inset":true},{"x":0,"y":-1,"blur":0,"spread":0,"color":"#000000","alpha":0.2,"inset":true}]},"opacity":{},"colors":{"bg":"#0F0F0F","text":"#DBDCDD","link":"#FFFFFF","fg":"#191919","cRed":"#DE544E","cBlue":"#768AD4","cGreen":"#64B285","cOrange":"#EFA941"},"radii":{"btn":"0","input":"0","checkbox":"0","panel":"0","avatar":"0","avatarAlt":"0","tooltip":"0","attachment":"0"}}}
--- a/static/themes/sleepy-green.json
+++ b/static/themes/sleepy-green.json
@ -0,0 +1,372 @@
+{
+  "name": "Sleepy Green (@khan)",
+  "_pleroma_theme_version": 2,
+  "theme": {
+    "themeEngineVersion": 3,
+    "shadows": {
+      "panel": [],
+      "topBar": [],
+      "popup": [
+        {
+          "color": "#35313b",
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1024",
+          "alpha": "1",
+          "inset": true
+        },
+        {
+          "color": "#000000",
+          "x": "0",
+          "y": "0",
+          "blur": "8",
+          "spread": "0",
+          "inset": false,
+          "alpha": "1"
+        }
+      ],
+      "avatar": [
+        {
+          "x": 0,
+          "y": 1,
+          "blur": 8,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.7
+        }
+      ],
+      "avatarStatus": [],
+      "panelHeader": [],
+      "button": [
+        {
+          "color": "#26232a",
+          "x": 0,
+          "y": 0,
+          "blur": "6",
+          "spread": "0",
+          "alpha": 1,
+          "inset": false
+        }
+      ],
+      "buttonHover": [
+        {
+          "color": "#34812b",
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1024",
+          "alpha": "1",
+          "inset": true
+        }
+      ],
+      "buttonPressed": [
+        {
+          "color": "#34812b",
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": 1024,
+          "alpha": "1",
+          "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": 1
+        }
+      ]
+    },
+    "colors": {
+      "underlay": "#000000",
+      "bg": "#423d4a",
+      "fg": "#1d1d1d",
+      "cRed": "#da4453",
+      "cGreen": "#47bd38",
+      "cOrange": "#f5b800",
+      "cBlue": "#3c8fdd",
+      "accent": "#34812b",
+      "link": "#47bd38",
+      "text": "#eff0f1",
+      "chatBg": "#423d4a",
+      "chatMessageIncomingBg": "#4e4857",
+      "chatMessageOutgoingBg": "#5b5465",
+      "chatMessageOutgoingBorder": "#60596b",
+      "chatMessageOutgoingLink": "#51c842",
+      "chatMessageOutgoingText": "#eff0f1",
+      "border": "#232323",
+      "chatMessageIncomingBorder": "#282828",
+      "chatMessageIncomingLink": "#51c842",
+      "chatMessageIncomingText": "#eff0f1",
+      "badgeNotification": "#da4453",
+      "badgeNotificationText": "#ffffff",
+      "alertNeutral": "#eff0f1",
+      "alertNeutralText": "#0f0f11",
+      "alertPopupNeutral": "#eff0f1",
+      "alertPopupNeutralText": "#0f0f11",
+      "alertSuccess": "#47bd38",
+      "alertSuccessText": "#ffffff",
+      "alertPopupSuccess": "#47bd38",
+      "alertPopupSuccessText": "#000000",
+      "alertWarning": "#f5b800",
+      "alertWarningText": "#0f0f11",
+      "alertPopupWarning": "#f5b800",
+      "alertPopupWarningText": "#0f0f11",
+      "alertError": "#da4453",
+      "alertErrorText": "#eff0f1",
+      "alertPopupError": "#da4453",
+      "alertPopupErrorText": "#ffffff",
+      "panel": "#35313b",
+      "panelText": "#eff0f1",
+      "alertNeutralPanelText": "#0f0f11",
+      "alertSuccessPanelText": "#eff0f1",
+      "alertWarningPanelText": "#ffffff",
+      "alertErrorPanelText": "#eff0f1",
+      "fgText": "#eff0f1",
+      "topBar": "#1d1d1d",
+      "topBarText": "#eff0f1",
+      "input": "#322f38",
+      "inputTopbarText": "#eff0f1",
+      "inputPanelText": "#eff0f1",
+      "inputText": "#eff0f1",
+      "btn": "#423d4a",
+      "btnText": "#eff0f1",
+      "btnTopBarText": "#eff0f1",
+      "btnDisabled": "#423d4a",
+      "btnDisabledTopBarText": "#6e6a74",
+      "btnPanelText": "#eff0f1",
+      "btnDisabledPanelText": "#6e6a74",
+      "btnDisabledText": "#6e6a74",
+      "btnToggled": "#746c82",
+      "btnToggledTopBarText": "#ffffff",
+      "btnToggledPanelText": "#ffffff",
+      "btnToggledText": "#ffffff",
+      "btnPressed": "#34812b",
+      "btnPressedTopBarText": "#ffffff",
+      "btnPressedTopBar": "#34812b",
+      "btnPressedPanelText": "#ffffff",
+      "btnPressedPanel": "#34812b",
+      "btnPressedText": "#ffffff",
+      "tabActiveText": "#eff0f1",
+      "tabText": "#eff0f1",
+      "tab": "#423d4a",
+      "fgLink": "#47bd38",
+      "topBarLink": "#eff0f1",
+      "panelLink": "#47bd38",
+      "panelFaint": "#eff0f1",
+      "icon": "#99979e",
+      "poll": "#3d593e",
+      "pollText": "#eff0f1",
+      "postGreentext": "#47bd38",
+      "postLink": "#51c842",
+      "lightText": "#ffffff",
+      "popover": "#35313b",
+      "selectedMenuPopover": "#34812b",
+      "highlight": "#4f4958",
+      "highlightText": "#eff0f1",
+      "selectedMenu": "#34812b",
+      "selectedMenuText": "#ffffff",
+      "selectedMenuPopoverIcon": "#9ac095",
+      "highlightLink": "#51c842",
+      "selectedMenuLink": "#47bd38",
+      "selectedMenuPopoverLink": "#51c842",
+      "selectedMenuPopoverText": "#ffffff",
+      "faintLink": "#47bd38",
+      "highlightFaintLink": "#51c842",
+      "selectedMenuFaintLink": "#47bd38",
+      "selectedMenuPopoverFaintLink": "#51c842",
+      "faint": "#eff0f1",
+      "highlightFaintText": "#eff0f1",
+      "selectedMenuFaintText": "#ffffff",
+      "selectedMenuPopoverFaintText": "#ffffff",
+      "highlightLightText": "#ffffff",
+      "selectedMenuLightText": "#ffffff",
+      "selectedMenuPopoverLightText": "#ffffff",
+      "selectedMenuIcon": "#9ac095",
+      "selectedPost": "#4f4958",
+      "selectedPostText": "#eff0f1",
+      "selectedPostIcon": "#9f9da5",
+      "selectedPostLink": "#47bd38",
+      "selectedPostFaintLink": "#47bd38",
+      "highlightPostLink": "#47bd38",
+      "selectedPostPostLink": "#51c842",
+      "selectedPostLightText": "#ffffff",
+      "selectedPostFaintText": "#eff0f1",
+      "popoverText": "#eff0f1",
+      "popoverIcon": "#929196",
+      "popoverLink": "#47bd38",
+      "postFaintLink": "#51c842",
+      "popoverPostFaintLink": "#51c842",
+      "popoverFaintLink": "#47bd38",
+      "popoverFaintText": "#eff0f1",
+      "popoverPostLink": "#51c842",
+      "popoverLightText": "#ffffff",
+      "highlightIcon": "#9f9da5",
+      "highlightPostFaintLink": "#47bd38",
+      "profileTint": "#423d4a",
+      "profileBg": "#22222b",
+      "wallpaper": "#3d3945"
+    },
+    "opacity": {
+      "underlay": 0.15,
+      "bg": 1,
+      "border": 0,
+      "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
+      "input": 0.5,
+      "btn": 1,
+      "faint": 0.5,
+      "popover": 1,
+      "profileTint": 0.5
+    },
+    "radii": {
+      "btn": "5",
+      "input": "5",
+      "checkbox": "5",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "5",
+      "tooltip": "5",
+      "attachment": 5,
+      "chatMessage": "5"
+    },
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      },
+      "input": {
+        "family": "inherit"
+      },
+      "post": {
+        "family": "inherit"
+      },
+      "postCode": {
+        "family": "monospace"
+      }
+    }
+  },
+  "source": {
+    "themeEngineVersion": 3,
+    "fonts": {},
+    "shadows": {
+      "buttonHover": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1024",
+          "color": "#34812b",
+          "alpha": "1",
+          "inset": true
+        }
+      ],
+      "buttonPressed": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": 1024,
+          "color": "#34812b",
+          "alpha": "1",
+          "inset": true
+        }
+      ],
+      "panel": [],
+      "panelHeader": [],
+      "topBar": [],
+      "button": [
+        {
+          "x": 0,
+          "y": 0,
+          "blur": "6",
+          "spread": "0",
+          "color": "#26232a",
+          "alpha": 1,
+          "inset": false
+        }
+      ],
+      "popup": [
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "0",
+          "spread": "1024",
+          "color": "#35313b",
+          "alpha": "1",
+          "inset": true
+        },
+        {
+          "x": "0",
+          "y": "0",
+          "blur": "8",
+          "spread": "0",
+          "inset": false,
+          "color": "#000000",
+          "alpha": "1"
+        }
+      ]
+    },
+    "opacity": {
+      "underlay": "0.15",
+      "border": "0"
+    },
+    "colors": {
+      "bg": "#423d4a",
+      "fg": "#1d1d1d",
+      "text": "#eff0f1",
+      "underlay": "#000000",
+      "link": "#47bd38",
+      "accent": "#34812b",
+      "cBlue": "#3c8fdd",
+      "cRed": "#da4453",
+      "cGreen": "#47bd38",
+      "cOrange": "#f5b800",
+      "popover": "#35313b",
+      "selectedMenu": "--accent",
+      "selectedMenuPopover": "--accent",
+      "postGreentext": "#47bd38",
+      "panel": "#35313b",
+      "topBarLink": "--topBarText",
+      "btn": "--bg",
+      "btnPressed": "--accent",
+      "input": "--bg,-6.47",
+      "chatMessageIncomingBg": "#4e4857"
+    },
+    "radii": {
+      "btn": "5",
+      "input": "5",
+      "checkbox": "5",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "5",
+      "tooltip": "5",
+      "attachment": 5,
+      "chatMessage": "5"
+    }
+  }
+}
--- a/static/themes/thekanata.json
+++ b/static/themes/thekanata.json
@ -1,548 +0,0 @@
-{
-  "_pleroma_theme_version": 2,
-  "name": "thekanata",
-  "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.2"
-        }
-      ],
-      "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": "#f3f2f7",
-      "fg": "#0f31b9",
-      "cRed": "#d31014",
-      "cOrange": "#f7e8a7",
-      "cGreen": "#5dc94a",
-      "cBlue": "#90d9e0",
-      "accent": "#0f31b9",
-      "link": "#0f31b9",
-      "text": "#382d33",
-      "badgeNotification": "#e15932",
-      "badgeNotificationText": "#ffffff",
-      "panel": "#0f31b9",
-      "panelText": "#d2c7cd",
-      "alertNeutral": "#382d33",
-      "alertNeutralPanelText": "#d2c7cd",
-      "alertNeutralText": "#000000",
-      "alertWarning": "#f7e8a7",
-      "alertWarningPanelText": "#000000",
-      "alertWarningText": "#382d33",
-      "alertError": "#d31014",
-      "alertErrorPanelText": "#d2c7cd",
-      "alertErrorText": "#745e6a",
-      "fgText": "#ffffff",
-      "topBar": "#ffffff",
-      "topBarText": "#382d33",
-      "input": "#ffffff",
-      "inputTopbarText": "#382d33",
-      "inputPanelText": "#392e33",
-      "inputText": "#382d33",
-      "btn": "#081d56",
-      "btnText": "#ffffff",
-      "btnTopBarText": "#ffffff",
-      "btnDisabled": "#b9bdcf",
-      "btnDisabledTopBarText": "#cacedb",
-      "btnPanelText": "#ffffff",
-      "btnDisabledPanelText": "#cacedb",
-      "btnDisabledText": "#cacedb",
-      "btnToggled": "#061347",
-      "btnToggledTopBarText": "#ffffff",
-      "btnToggledPanelText": "#ffffff",
-      "btnToggledText": "#ffffff",
-      "btnPressed": "#081d56",
-      "btnPressedTopBarText": "#ffffff",
-      "btnPressedTopBar": "#081d56",
-      "btnPressedPanelText": "#ffffff",
-      "btnPressedPanel": "#081d56",
-      "btnPressedText": "#ffffff",
-      "tabActiveText": "#382d33",
-      "tabText": "#ffffff",
-      "tab": "#081d56",
-      "fgLink": "#4668f0",
-      "topBarLink": "#382d33",
-      "panelLink": "#1030ba",
-      "panelFaint": "#ffffff",
-      "icon": "#969095",
-      "poll": "#98a5df",
-      "pollText": "#382d33",
-      "border": "#0e2dab",
-      "postGreentext": "#49b537",
-      "postLink": "#0f31b9",
-      "lightText": "#000000",
-      "popover": "#f3f2f7",
-      "selectedMenuPopover": "#e5e3ee",
-      "highlight": "#e5e3ee",
-      "highlightText": "#382d33",
-      "selectedMenu": "#e5e3ee",
-      "selectedMenuText": "#382d33",
-      "selectedMenuPopoverIcon": "#8f8891",
-      "highlightLink": "#0f31b9",
-      "selectedMenuLink": "#0f31b9",
-      "selectedMenuPopoverLink": "#0f31b9",
-      "selectedMenuPopoverText": "#382d33",
-      "faintLink": "#0f31b9",
-      "highlightFaintLink": "#0f31b9",
-      "selectedMenuFaintLink": "#0f31b9",
-      "selectedMenuPopoverFaintLink": "#0f31b9",
-      "faint": "#382d33",
-      "highlightFaintText": "#382d33",
-      "selectedMenuFaintText": "#382d33",
-      "selectedMenuPopoverFaintText": "#382d33",
-      "highlightLightText": "#000000",
-      "selectedMenuLightText": "#000000",
-      "selectedMenuPopoverLightText": "#000000",
-      "selectedMenuIcon": "#8f8891",
-      "selectedPost": "#e5e3ee",
-      "selectedPostText": "#382d33",
-      "selectedPostIcon": "#8f8891",
-      "selectedPostLink": "#0f31b9",
-      "selectedPostFaintLink": "#0f31b9",
-      "highlightPostLink": "#0f31b9",
-      "selectedPostPostLink": "#0f31b9",
-      "selectedPostLightText": "#000000",
-      "selectedPostFaintText": "#382d33",
-      "popoverText": "#382d33",
-      "popoverIcon": "#969095",
-      "popoverLink": "#0f31b9",
-      "postFaintLink": "#0f31b9",
-      "popoverPostFaintLink": "#0f31b9",
-      "popoverFaintLink": "#0f31b9",
-      "popoverFaintText": "#382d33",
-      "popoverPostLink": "#0f31b9",
-      "popoverLightText": "#000000",
-      "highlightIcon": "#8f8891",
-      "highlightPostFaintLink": "#0f31b9",
-      "profileTint": "#f3f2f7",
-      "profileBg": "#808791"
-    },
-    "opacity": {
-      "underlay": 0,
-      "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": "15",
-      "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": {},
-    "shadows": {
-      "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
-        }
-      ],
-      "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.2"
-        }
-      ],
-      "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"
-        }
-      ],
-      "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
-        }
-      ],
-      "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"
-        }
-      ]
-    },
-    "opacity": {
-      "underlay": "0"
-    },
-    "colors": {
-      "bg": "#F3F2F7",
-      "fg": "#0F31B9",
-      "text": "#382D33",
-      "underlay": "#090e14",
-      "accent": "#0F31B9",
-      "cBlue": "#90D9E0",
-      "cRed": "#d31014",
-      "cGreen": "#5dc94a",
-      "cOrange": "#F7E8A7",
-      "border": "--fg,3",
-      "fgText": "#FFFFFF",
-      "topBar": "#ffffff",
-      "topBarText": "#382D33",
-      "topBarLink": "#382D33",
-      "btn": "#081D56",
-      "btnToggled": "--accent,-24.2",
-      "input": "#FFFFFF",
-      "alertErrorText": "--text,21.2",
-      "badgeNotification": "#e15932",
-      "badgeNotificationText": "#ffffff"
-    },
-    "radii": {
-      "btn": "3",
-      "input": "3",
-      "panel": "15",
-      "avatar": "3",
-      "attachment": "3"
-    }
-  }
-}
--- a/static/themes/wavemaster.json
+++ b/static/themes/wavemaster.json
@ -0,0 +1 @@
+{"_pleroma_theme_version":2,"name":"Wavemaster (@lanodan)","theme":{"fonts":{},"shadows":{"button":[{"x":0,"y":0,"blur":"0","spread":"1","inset":true,"color":"#242422","alpha":1},{"x":"1","y":"1","blur":"1","spread":"0","inset":true,"color":"#242422","alpha":"0.3"}],"buttonHover":[{"x":0,"y":0,"blur":"0","spread":"1","inset":true,"color":"#d2738a","alpha":1},{"x":"1","y":"1","blur":"1","spread":"0","inset":true,"color":"#000000","alpha":"0.3"}],"buttonPressed":[{"x":0,"y":0,"blur":0,"spread":"50","inset":true,"color":"#242422","alpha":1},{"x":"1","y":"1","blur":0,"spread":"0","inset":true,"color":"#000000","alpha":"0.3"},{"x":0,"y":0,"blur":0,"spread":"1","inset":true,"color":"#ffffff","alpha":1}],"input":[],"topBar":[{"x":0,"y":0,"blur":"20","spread":"5","color":"#204a87","alpha":0.6}]},"opacity":{"bg":"0.85","btn":"0"},"colors":{"bg":"#0d0114","text":"#b5b3aa","link":"#65cfed","fg":"#0f0403","cRed":"#f82604","cBlue":"#96cbfe","cGreen":"#a8ff60","cOrange":"#ffffb6"},"radii":{}}}
				`@ -0,0 +1 @@`
				`Subproject commit cfd4dd6404d2df6e07e646aff5ff1d606ed48228`
				`@ -0,0 +1 @@`
				`Subproject commit 5d7ac570770bd7f1d5cba1279c444b53626add3c`
				`@ -0,0 +1 @@`
				`Subproject commit 440dd5dcb4c97d58726a2a52abbe9c54a8b2f3fb`
				`@ -0,0 +1 @@`
				{"_pleroma_theme_version":2,"theme":{"themeEngineVersion":3,"shadows":{"panel":[{"x":1,"y":1,"blur":4,"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":[],"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":4,"spread":0,"color":"#eee7e3","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}],"buttonPressed":[{"x":0,"y":0,"blur":4,"spread":0,"color":"#eee7e3","alpha":1},{"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}],"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":"#000000","bg":"#6f574c","fg":"#655953","cRed":"#d31014","cOrange":"#ffa500","cGreen":"#0095ff","cBlue":"#0fa00f","accent":"#992600","link":"#eabca4","text":"#eee7e3","chatBg":"#6f574c","chatMessageIncomingBg":"#6f574c","chatMessageOutgoingBg":"#7f6357","chatMessageOutgoingBorder":"#85685b","chatMessageOutgoingLink":"#5b2d16","chatMessageOutgoingText":"#eee7e3","border":"#6b5e58","chatMessageIncomingBorder":"#71635d","chatMessageIncomingLink":"#5b2d16","chatMessageIncomingText":"#eee7e3","badgeNotification":"#d31014","badgeNotificationText":"#ffffff","alertNeutral":"#eee7e3","alertNeutralText":"#1d1611","alertPopupNeutral":"#eee7e3","alertPopupNeutralText":"#1d1611","alertWarning":"#ffa500","alertWarningText":"#1d1611","alertPopupWarning":"#ffa500","alertPopupWarningText":"#1d1611","alertError":"#d31014","alertErrorText":"#ffffff","alertPopupError":"#d31014","alertPopupErrorText":"#ffffff","panel":"#655953","panelText":"#e9e9fb","alertNeutralPanelText":"#050517","alertWarningPanelText":"#050517","alertErrorPanelText":"#e9e9fb","fgText":"#eee7e3","topBar":"#655953","topBarText":"#eee7e3","input":"#655953","inputTopbarText":"#eee7e3","inputPanelText":"#e9e9fb","inputText":"#eee7e3","btn":"#655953","btnText":"#eee7e3","btnTopBarText":"#eee7e3","btnDisabled":"#6d584e","btnDisabledTopBarText":"#8d7c74","btnPanelText":"#eee7e3","btnDisabledPanelText":"#8d7c74","btnDisabledText":"#8d7c74","btnToggled":"#9a8c85","btnToggledTopBarText":"#ffffff","btnToggledPanelText":"#1d1611","btnToggledText":"#1d1611","btnPressed":"#655953","btnPressedTopBarText":"#eee7e3","btnPressedTopBar":"#655953","btnPressedPanelText":"#eee7e3","btnPressedPanel":"#655953","btnPressedText":"#eee7e3","tabActiveText":"#1d1611","tabText":"#eee7e3","tab":"#655953","fgLink":"#5b2d16","topBarLink":"#eabda5","panelLink":"#eabda5","panelFaint":"#eee7e3","icon":"#af9f98","poll":"#80442e","pollText":"#eee7e3","postGreentext":"#9aaad0","postLink":"#ebdfdb","lightText":"#000000","popover":"#6f574c","selectedMenuPopover":"#7f6357","highlight":"#7f6357","highlightText":"#ffffff","selectedMenu":"#7f6357","selectedMenuText":"#ffffff","selectedMenuPopoverIcon":"#bfb1ab","highlightLink":"#5b2d16","selectedMenuLink":"#eabda5","selectedMenuPopoverLink":"#5b2e16","selectedMenuPopoverText":"#000000","faintLink":"#eabca4","highlightFaintLink":"#5b2d16","selectedMenuFaintLink":"#eabda5","selectedMenuPopoverFaintLink":"#5b2e16","faint":"#eee7e3","highlightFaintText":"#ffffff","selectedMenuFaintText":"#ffffff","selectedMenuPopoverFaintText":"#000000","highlightLightText":"#ffffff","selectedMenuLightText":"#ffffff","selectedMenuPopoverLightText":"#000000","selectedMenuIcon":"#bfb1ab","selectedPost":"#7f6357","selectedPostText":"#ffffff","selected
				`@ -0,0 +1 @@`
				{"_pleroma_theme_version":2,"name":"Mojave (@hellpie)","theme":{"fonts":{"postCode":{"family":"Menlo,sans-serif"},"interface":{"family":"SF Pro Display,sans-serif"},"input":{"family":"SF Pro Text,sans-serif"},"post":{"family":"SF Pro Text,sans-serif"}},"shadows":{"panelHeader":[{"x":0,"y":"-0.5","blur":0,"spread":0,"inset":true,"color":"#000000","alpha":"1"},{"x":0,"y":"-1","blur":0,"spread":0,"inset":true,"color":"#2B2B2B","alpha":"1"},{"x":0,"y":"0.5","blur":0,"spread":0,"inset":true,"color":"#FFFFFF","alpha":"0.1"},{"x":0,"y":"50","blur":"50","spread":"0","inset":true,"color":"#4B4B4B","alpha":"1"}],"topBar":[{"x":0,"y":"-0.5","blur":0,"spread":0,"inset":true,"color":"#000000","alpha":"1"},{"x":0,"y":"-1","blur":0,"spread":0,"inset":true,"color":"#2B2B2B","alpha":"1"},{"x":0,"y":"0.5","blur":0,"spread":0,"inset":true,"color":"#FFFFFF","alpha":"0.1"}],"panel":[{"x":0,"y":0,"blur":0,"spread":"1","inset":true,"color":"#FFFFFF","alpha":"0.15"},{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.65"},{"x":0,"y":"2.5","blur":"5","spread":"0","inset":false,"color":"#000000","alpha":"0.3"},{"x":0,"y":"5","blur":"8.5","spread":"0","inset":false,"color":"#000000","alpha":"0.4"}],"popup":[{"x":"0","y":"0","blur":"0","spread":"1","color":"#FFFFFF","alpha":"0.15","inset":true},{"x":"0","y":"0","blur":"0","spread":"1","color":"#000000","alpha":"0.5","inset":true},{"x":2,"y":2,"blur":"10.5","spread":0,"color":"#000000","alpha":"0.25"}],"input":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#FFFFFF","alpha":"0.05"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.05"},{"x":0,"y":"-1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.08"},{"x":0,"y":"-0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.09"},{"x":0,"y":"1.5","blur":"1.5","spread":"0","inset":true,"color":"#000000","alpha":"0.10"}],"button":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"}],"buttonHover":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"},{"x":0,"y":"0","blur":"0","spread":"1000","inset":true,"color":"#FFFFFF","alpha":"0.2"}],"buttonPressed":[{"x":0,"y":0,"blur":0,"spread":"0.5","inset":true,"color":"#000000","alpha":"0.35"},{"x":0,"y":"1","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.04"},{"x":0,"y":"0.5","blur":0,"spread":"0","inset":true,"color":"#FFFFFF","alpha":"0.16"},{"x":0,"y":"0.5","blur":"1.5","spread":"0","inset":false,"color":"#000000","alpha":"0.20"},{"x":0,"y":"30","blur":"30","spread":"0","inset":true,"color":"#1768E5","alpha":"0.67"},{"x":0,"y":"0","blur":"0","spread":"1000","inset":true,"color":"#145CCC","alpha":"0.67"}],"avatarStatus":[{"x":0,"y":"1","blur":"2","spread":0,"inset":false,"color":"#000000","alpha":"0.4"}],"avatar":[{"x":0,"y":1,"blur":"2","spread":0,"color":"#000000","alpha":"0.4"}]},"opacity":{"btn":"0.22","input":"0.05","faint":"0.55"},"colors":{"bg":"#2c2c2c","text":"#FAFAFA","link":"#419cff","fg":"#5a5a5a","fgText":"#FAFAFA","fgLink":"#419cff","panel":"#3D3D3D","panelLink":"#FAFAFA","input":"#FFFFFF","inputText":"#FFFFFF","topBar":"#323639","topBarLink":"#FAFAFA","btn":"#FFFFFF","btnText":"#FFFFFF","alertError":"#ff655f","faint":"#FFFFFF","border":"#000000","cRed":"#ff453a","cBlue":"#0a84ff","cGreen":"#32d74b","cOrange":"#ff9f0a"},"radii":{"btn":"4","input":"4","checkbox":"3","panel":"4","avatar":"4","tooltip":"2","attachment":"4"}}}
				`@ -0,0 +1 @@`
				{"_pleroma_theme_version":2,"name":"Simply Dark (@pie)","theme":{"fonts":{"interface":{"family":"\"Roboto\", \"Droid Sans\", \"Open Sans\",Arial, Helvetica, sans-serif"},"postCode":{"family":"Menlo, Consolas, Monaco, monospace"}},"shadows":{"button":[{"x":0,"y":0,"blur":"0","spread":0,"color":"#000000","alpha":"0"},{"x":0,"y":1,"blur":0,"spread":0,"color":"#FFFFFF","alpha":"0","inset":true},{"x":0,"y":-1,"blur":0,"spread":0,"color":"#000000","alpha":0.2,"inset":true}]},"opacity":{},"colors":{"bg":"#0F0F0F","text":"#DBDCDD","link":"#FFFFFF","fg":"#191919","cRed":"#DE544E","cBlue":"#768AD4","cGreen":"#64B285","cOrange":"#EFA941"},"radii":{"btn":"0","input":"0","checkbox":"0","panel":"0","avatar":"0","avatarAlt":"0","tooltip":"0","attachment":"0"}}}
				`@ -0,0 +1 @@`
				{"_pleroma_theme_version":2,"name":"Wavemaster (@lanodan)","theme":{"fonts":{},"shadows":{"button":[{"x":0,"y":0,"blur":"0","spread":"1","inset":true,"color":"#242422","alpha":1},{"x":"1","y":"1","blur":"1","spread":"0","inset":true,"color":"#242422","alpha":"0.3"}],"buttonHover":[{"x":0,"y":0,"blur":"0","spread":"1","inset":true,"color":"#d2738a","alpha":1},{"x":"1","y":"1","blur":"1","spread":"0","inset":true,"color":"#000000","alpha":"0.3"}],"buttonPressed":[{"x":0,"y":0,"blur":0,"spread":"50","inset":true,"color":"#242422","alpha":1},{"x":"1","y":"1","blur":0,"spread":"0","inset":true,"color":"#000000","alpha":"0.3"},{"x":0,"y":0,"blur":0,"spread":"1","inset":true,"color":"#ffffff","alpha":1}],"input":[],"topBar":[{"x":0,"y":0,"blur":"20","spread":"5","color":"#204a87","alpha":0.6}]},"opacity":{"bg":"0.85","btn":"0"},"colors":{"bg":"#0d0114","text":"#b5b3aa","link":"#65cfed","fg":"#0f0403","cRed":"#f82604","cBlue":"#96cbfe","cGreen":"#a8ff60","cOrange":"#ffffb6"},"radii":{}}}