diff --git a/themes/chocolate_milk.json b/themes/chocolate_milk.json
new file mode 100644
index 0000000..bb45639
--- /dev/null
+++ b/themes/chocolate_milk.json
@@ -0,0 +1,210 @@
+{
+  "_pleroma_theme_version": 2,
+  "name": "Chocolate Milk",
+  "theme": {
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      }
+    },
+    "shadows": {
+      "button": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "inset": false
+        },
+        {
+          "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": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0.35",
+          "inset": false
+        },
+        {
+          "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": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "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
+        }
+      ],
+      "panel": [
+        {
+          "x": "4",
+          "y": "4",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "popup": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.5
+        }
+      ],
+      "input": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": 0,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.15",
+          "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
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "avatar": [
+        {
+          "x": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.5"
+        }
+      ]
+    },
+    "opacity": {
+      "bg": "0.85",
+      "input": "0.9",
+      "panel": "0.9",
+      "border": "0.3",
+      "faint": "1"
+    },
+    "colors": {
+      "bg": "#ebebeb",
+      "text": "#202020",
+      "link": "#ad343a",
+      "fg": "#5f3637",
+      "panel": "#5f3637",
+      "panelText": "#dddddd",
+      "panelFaint": "#dddddd",
+      "input": "#ffffff",
+      "topBar": "#4d3536",
+      "topBarText": "#dddddd",
+      "topBarLink": "#dddddd",
+      "btn": "#5f3637",
+      "btnText": "#ca9fa0",
+      "alertError": "#d33030",
+      "badgeNotification": "#d33030",
+      "faint": "#202020",
+      "faintLink": "#b35555",
+      "border": "#4d3536",
+      "cRed": "#e80000",
+      "cBlue": "#21c4fa",
+      "cGreen": "#14c80b",
+      "cOrange": "#f2f810"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "0",
+      "tooltip": "0",
+      "attachment": "0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/themes/chocolate_milk_pleroma.json b/themes/chocolate_milk_pleroma.json
deleted file mode 100644
index b202d90..0000000
--- a/themes/chocolate_milk_pleroma.json
+++ /dev/null
@@ -1 +0,0 @@
-{"_pleroma_theme_version":2,"theme":{"fonts":{"interface":{"family":"sans-serif"}},"shadows":{"button":[{"x":"3","y":"3","blur":"0","spread":0,"color":"#000000","alpha":"0.4","inset":false},{"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":"3","y":"3","blur":"0","spread":"0","color":"#000000","alpha":"0.35","inset":false},{"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":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4","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}],"panel":[{"x":"4","y":"4","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"popup":[{"x":2,"y":2,"blur":"0","spread":0,"color":"#000000","alpha":0.5}],"input":[{"x":"3","y":"3","blur":0,"spread":0,"color":"#000000","alpha":"0.15","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}],"topBar":[{"x":0,"y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"avatar":[{"x":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.5"}]},"opacity":{"bg":"0.85","input":"0.9","panel":"0.9","border":"0.3","faint":"1"},"colors":{"bg":"#ebebeb","text":"#202020","link":"#ad343a","fg":"#5f3637","panel":"#5f3637","panelText":"#dddddd","panelFaint":"#dddddd","input":"#ffffff","topBar":"#4d3536","topBarText":"#dddddd","topBarLink":"#dddddd","btn":"#5f3637","btnText":"#ca9fa0","alertError":"#d33030","badgeNotification":"#d33030","faint":"#202020","faintLink":"#b35555","border":"#4d3536","cRed":"#e80000","cBlue":"#21c4fa","cGreen":"#14c80b","cOrange":"#f2f810"},"radii":{"btn":"0","input":"0","checkbox":"0","panel":"0","avatar":"0","avatarAlt":"0","tooltip":"0","attachment":"0"}}}
\ No newline at end of file
diff --git a/themes/hina_kagiyama.json b/themes/hina_kagiyama.json
new file mode 100644
index 0000000..34c81da
--- /dev/null
+++ b/themes/hina_kagiyama.json
@@ -0,0 +1,210 @@
+{
+  "_pleroma_theme_version": 2,
+  "name": "Hina Kagiyama",
+  "theme": {
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      }
+    },
+    "shadows": {
+      "button": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "inset": false
+        },
+        {
+          "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": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0.35",
+          "inset": false
+        },
+        {
+          "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": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "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
+        }
+      ],
+      "panel": [
+        {
+          "x": "4",
+          "y": "4",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "popup": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.5
+        }
+      ],
+      "input": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": 0,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.15",
+          "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
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "avatar": [
+        {
+          "x": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.5"
+        }
+      ]
+    },
+    "opacity": {
+      "bg": "0.85",
+      "input": "0.6",
+      "panel": "0.9",
+      "border": "0.3",
+      "faint": "0.7"
+    },
+    "colors": {
+      "bg": "#d2b7b8",
+      "text": "#202020",
+      "link": "#ad343a",
+      "fg": "#a8978f",
+      "panel": "#ad343a",
+      "panelText": "#bbe1c4",
+      "panelFaint": "#000000",
+      "input": "#ffffff",
+      "topBar": "#ad343a",
+      "topBarText": "#bbe1c4",
+      "topBarLink": "#bbe1c4",
+      "btn": "#82ae92",
+      "btnText": "#eaeaea",
+      "alertError": "#ff5e5e",
+      "badgeNotification": "#772428",
+      "faint": "#000000",
+      "faintLink": "#b00000",
+      "border": "#000000",
+      "cRed": "#ff4646",
+      "cBlue": "#59d2fb",
+      "cGreen": "#15df0b",
+      "cOrange": "#f4f946"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "0",
+      "tooltip": "0",
+      "attachment": "0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/themes/hina_kagiyama_pleroma.json b/themes/hina_kagiyama_pleroma.json
deleted file mode 100644
index 6c74daf..0000000
--- a/themes/hina_kagiyama_pleroma.json
+++ /dev/null
@@ -1 +0,0 @@
-{"_pleroma_theme_version":2,"theme":{"fonts":{"interface":{"family":"sans-serif"}},"shadows":{"button":[{"x":"3","y":"3","blur":"0","spread":0,"color":"#000000","alpha":"0.4","inset":false},{"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":"3","y":"3","blur":"0","spread":"0","color":"#000000","alpha":"0.35","inset":false},{"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":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4","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}],"panel":[{"x":"4","y":"4","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"popup":[{"x":2,"y":2,"blur":"0","spread":0,"color":"#000000","alpha":0.5}],"input":[{"x":"3","y":"3","blur":0,"spread":0,"color":"#000000","alpha":"0.15","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}],"topBar":[{"x":0,"y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"avatar":[{"x":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.5"}]},"opacity":{"bg":"0.85","input":"0.6","panel":"0.9","border":"0.3","faint":"0.7"},"colors":{"bg":"#d2b7b8","text":"#202020","link":"#ad343a","fg":"#a8978f","panel":"#ad343a","panelText":"#bbe1c4","panelFaint":"#000000","input":"#ffffff","topBar":"#ad343a","topBarText":"#bbe1c4","topBarLink":"#bbe1c4","btn":"#82ae92","btnText":"#eaeaea","alertError":"#ff5e5e","badgeNotification":"#772428","faint":"#000000","faintLink":"#b00000","border":"#000000","cRed":"#ff4646","cBlue":"#59d2fb","cGreen":"#15df0b","cOrange":"#f4f946"},"radii":{"btn":"0","input":"0","checkbox":"0","panel":"0","avatar":"0","avatarAlt":"0","tooltip":"0","attachment":"0"}}}
\ No newline at end of file
diff --git a/themes/hot_chocolate.json b/themes/hot_chocolate.json
new file mode 100644
index 0000000..2fdd2f4
--- /dev/null
+++ b/themes/hot_chocolate.json
@@ -0,0 +1,210 @@
+{
+  "_pleroma_theme_version": 2,
+  "name": "Hot Chocolate",
+  "theme": {
+    "fonts": {
+      "interface": {
+        "family": "sans-serif"
+      }
+    },
+    "shadows": {
+      "button": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "inset": false
+        },
+        {
+          "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": "3",
+          "y": "3",
+          "blur": "0",
+          "spread": "0",
+          "color": "#000000",
+          "alpha": "0.35",
+          "inset": false
+        },
+        {
+          "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": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4",
+          "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
+        }
+      ],
+      "panel": [
+        {
+          "x": "4",
+          "y": "4",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "popup": [
+        {
+          "x": 2,
+          "y": 2,
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": 0.5
+        }
+      ],
+      "input": [
+        {
+          "x": "3",
+          "y": "3",
+          "blur": 0,
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.15",
+          "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
+        }
+      ],
+      "topBar": [
+        {
+          "x": 0,
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.4"
+        }
+      ],
+      "avatar": [
+        {
+          "x": "2",
+          "y": "2",
+          "blur": "0",
+          "spread": 0,
+          "color": "#000000",
+          "alpha": "0.5"
+        }
+      ]
+    },
+    "opacity": {
+      "bg": "0.9",
+      "input": "0.8",
+      "panel": "0.9",
+      "border": "0.15",
+      "faint": "1"
+    },
+    "colors": {
+      "bg": "#4d3536",
+      "text": "#dddddd",
+      "link": "#dda2a3",
+      "fg": "#dda2a3",
+      "panel": "#5f3637",
+      "panelText": "#dddddd",
+      "panelFaint": "#dddddd",
+      "input": "#ffffff",
+      "topBar": "#4d3536",
+      "topBarText": "#dddddd",
+      "topBarLink": "#dddddd",
+      "btn": "#5f3637",
+      "btnText": "#dda2a3",
+      "alertError": "#d33030",
+      "badgeNotification": "#d33030",
+      "faint": "#dddddd",
+      "faintLink": "#dda2a3",
+      "border": "#dda2a3",
+      "cRed": "#c64646",
+      "cBlue": "#66c1cc",
+      "cGreen": "#3db843",
+      "cOrange": "#cacf67"
+    },
+    "radii": {
+      "btn": "0",
+      "input": "0",
+      "checkbox": "0",
+      "panel": "0",
+      "avatar": "0",
+      "avatarAlt": "0",
+      "tooltip": "0",
+      "attachment": "0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/themes/hot_chocolate_pleroma.json b/themes/hot_chocolate_pleroma.json
deleted file mode 100644
index 684c448..0000000
--- a/themes/hot_chocolate_pleroma.json
+++ /dev/null
@@ -1 +0,0 @@
-{"_pleroma_theme_version":2,"theme":{"fonts":{"interface":{"family":"sans-serif"}},"shadows":{"button":[{"x":"3","y":"3","blur":"0","spread":0,"color":"#000000","alpha":"0.4","inset":false},{"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":"3","y":"3","blur":"0","spread":"0","color":"#000000","alpha":"0.35","inset":false},{"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":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4","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}],"panel":[{"x":"4","y":"4","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"popup":[{"x":2,"y":2,"blur":"0","spread":0,"color":"#000000","alpha":0.5}],"input":[{"x":"3","y":"3","blur":0,"spread":0,"color":"#000000","alpha":"0.15","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}],"topBar":[{"x":0,"y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.4"}],"avatar":[{"x":"2","y":"2","blur":"0","spread":0,"color":"#000000","alpha":"0.5"}]},"opacity":{"bg":"0.9","input":"0.8","panel":"0.9","border":"0.15","faint":"1"},"colors":{"bg":"#4d3536","text":"#dddddd","link":"#dda2a3","fg":"#dda2a3","panel":"#5f3637","panelText":"#dddddd","panelFaint":"#dddddd","input":"#ffffff","topBar":"#4d3536","topBarText":"#dddddd","topBarLink":"#dddddd","btn":"#5f3637","btnText":"#dda2a3","alertError":"#d33030","badgeNotification":"#d33030","faint":"#dddddd","faintLink":"#dda2a3","border":"#dda2a3","cRed":"#c64646","cBlue":"#66c1cc","cGreen":"#3db843","cOrange":"#cacf67"},"radii":{"btn":"0","input":"0","checkbox":"0","panel":"0","avatar":"0","avatarAlt":"0","tooltip":"0","attachment":"0"}}}
\ No newline at end of file