From 6f0425e3e922f007aee1a34414eeb3a9c35990a6 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@proton.me>
Date: Sun, 18 Dec 2022 04:56:23 +0100
Subject: [PATCH] Themes adjusted, added additional theme values

---
 public/data/themes.json | 60 ++++++++++++++++++++++-------------------
 styled.d.ts             |  4 +++
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/public/data/themes.json b/public/data/themes.json
index 2d2c150..e84c807 100644
--- a/public/data/themes.json
+++ b/public/data/themes.json
@@ -1,62 +1,66 @@
 {
   "themes": [
     {
-      "themeName": "Light Theme",
+      "themeName": "Cancer - Blue",
       "themeId": 0,
       "colors": {
         "background": "#ffffff",
-        "primary": "#00aaff",
-        "secondary": "#ff5300",
-        "online": "#00ff00",
-        "loading": "#ff5300",
-        "offline": "#ff0000"
+        "primary": "#00AAFF",
+        "secondary": "#FF5500",
+        "online": "#2BFF00",
+        "loading": "#D400FF",
+        "offline": "#FF002B"
       }
     },
     {
-      "themeName": "Dark Theme",
+      "themeName": "Dark - Blue",
       "themeId": 1,
       "colors": {
-        "background": "#1f1f1f",
-        "primary": "#00aaff",
-        "secondary": "#ff5300",
-        "online": "#00ff00",
-        "loading": "#ff5300",
-        "offline": "#ff0000"
+        "background": "#161616",
+        "primary": "#00AAFF",
+        "secondary": "#FF5500",
+        "online": "#2BFF00",
+        "loading": "#D400FF",
+        "offline": "#FF002B"
       }
     },
     {
-      "themeName": "AMOLED Theme",
+      "themeName": "AMOLED - Blue",
       "themeId": 2,
       "colors": {
         "background": "#000000",
-        "primary": "#00aaff",
-        "secondary": "#ff5300",
-        "online": "#00ff00",
-        "loading": "#ff5300",
-        "offline": "#ff0000"
+        "primary": "#00AAFF",
+        "secondary": "#FF5500",
+        "online": "#2BFF00",
+        "loading": "#D400FF",
+        "offline": "#FF002B"
       }
     },
     {
-      "themeName": "AMOLED Theme 2",
+      "themeName": "AMOLED - Purple",
       "themeId": 3,
       "colors": {
         "background": "#000000",
-        "primary": "#00ffaa",
-        "secondary": "#aa00ff",
+        "primary": "#886aff",
+        "secondary": "#E1FF6A",
         "online": "#00ff00",
-        "loading": "#ff5300",
+        "loading": "#FF6A97",
         "offline": "#ff0000"
       }
     },
     {
-      "themeName": "Custom Theme 3",
+      "themeName": "Norrsken",
       "themeId": 4,
+      "backgroundImage": "https://images4.alphacoders.com/112/1123390.jpg",
+      "invertButtons": true,
       "colors": {
-        "background": "#000000",
-        "primary": "#00ffaa",
-        "secondary": "#aa00ff",
+        "background": "#0008",
+        "backgroundAlt": "#000d",
+        "primary": "#ccc",
+        "secondary": "#00C7C7",
+        "text": "#000",
         "online": "#00ff00",
-        "loading": "#ff5300",
+        "loading": "#0063C7",
         "offline": "#ff0000"
       }
     }
diff --git a/styled.d.ts b/styled.d.ts
index c71f269..1dc2225 100644
--- a/styled.d.ts
+++ b/styled.d.ts
@@ -4,10 +4,14 @@ declare module 'styled-components' {
   export interface DefaultTheme {
     themeName: string,
     themeId: number,
+    backgroundImage?: string,
+    invertButtons?: boolean,
     colors: {
       background: string,
+      backgroundAlt?: string,
       primary: string,
       secondary: string,
+      text?: string,
       online: string,
       loading: string,
       offline: string,