From 1586d50fd6aa5966c3b51738f9b0f8ffc556d19d Mon Sep 17 00:00:00 2001
From: Bachoo <cosmin_cb@hotmail.com>
Date: Thu, 23 Jul 2020 21:26:27 -0400
Subject: [PATCH 1/3] added GMK Ishtar, Deku, and Mashu themes

---
 public/themes/deku.css   | 11 +++++++++++
 public/themes/ishtar.css | 11 +++++++++++
 public/themes/list.json  | 15 +++++++++++++++
 public/themes/mashu.css  | 11 +++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 public/themes/deku.css
 create mode 100644 public/themes/ishtar.css
 create mode 100644 public/themes/mashu.css

diff --git a/public/themes/deku.css b/public/themes/deku.css
new file mode 100644
index 000000000..4effc610d
--- /dev/null
+++ b/public/themes/deku.css
@@ -0,0 +1,11 @@
+:root {
+    --bg-color: #058B8C;
+    --main-color: #F7F2EA;
+    --caret-color: #F7F2EA;
+    --sub-color: #BB1E10;
+    --text-color: #BB1E10;
+    --error-color: #BB1E10;
+    --error-extra-color: #791717;
+    --colorful-error-color: #c5da33;
+    --colorful-error-extra-color: #849224;
+}
\ No newline at end of file
diff --git a/public/themes/ishtar.css b/public/themes/ishtar.css
new file mode 100644
index 000000000..18ccb4a56
--- /dev/null
+++ b/public/themes/ishtar.css
@@ -0,0 +1,11 @@
+:root {
+    --bg-color: #2B2A2A;
+    --main-color: #fae1c3;
+    --caret-color: #fae1c3;
+    --sub-color: #bb1e10;
+    --text-color: #bb1e10;
+    --error-color: #bb1e10;
+    --error-extra-color: #791717;
+    --colorful-error-color: #c5da33;
+    --colorful-error-extra-color: #849224;
+}
\ No newline at end of file
diff --git a/public/themes/list.json b/public/themes/list.json
index d71285904..87dbbc7a3 100644
--- a/public/themes/list.json
+++ b/public/themes/list.json
@@ -312,5 +312,20 @@
         "name": "menthol",
         "bgColor": "#00c18c",
         "textColor": "#ffffff"
+    },
+    {
+        "name": "ishtar",
+        "bgColor": "#fae1c3",
+        "textColor": "#bb1e10"
+    },
+    {
+        "name": "mashu",
+        "bgColor": "#2b2b2c",
+        "textColor": "#76689a"
+    },
+    {
+        "name": "deku",
+        "bgColor": "#058B8C",
+        "textColor": "#F7F2EA"
     }
 ]
\ No newline at end of file
diff --git a/public/themes/mashu.css b/public/themes/mashu.css
new file mode 100644
index 000000000..414b4b3ba
--- /dev/null
+++ b/public/themes/mashu.css
@@ -0,0 +1,11 @@
+:root {
+    --bg-color: #2b2b2c;
+    --main-color: #76689a;
+    --caret-color: #76689a;
+    --sub-color: #d8a0a6;
+    --text-color: #d8a0a6;
+    --error-color: #d8a0a6;
+    --error-extra-color: #e9e0d2;
+    --colorful-error-color: #e9e0d2;
+    --colorful-error-extra-color: #e9e0d2;
+}
\ No newline at end of file

From 77fa583d301f0245b31e5c3bbbac13a3296adf2c Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Sat, 25 Jul 2020 01:18:33 +0100
Subject: [PATCH 2/3] made slight changes to increase readability

---
 public/themes/deku.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/themes/deku.css b/public/themes/deku.css
index 4effc610d..cffcbe993 100644
--- a/public/themes/deku.css
+++ b/public/themes/deku.css
@@ -1,11 +1,11 @@
 :root {
     --bg-color: #058B8C;
-    --main-color: #F7F2EA;
-    --caret-color: #F7F2EA;
-    --sub-color: #BB1E10;
-    --text-color: #BB1E10;
-    --error-color: #BB1E10;
-    --error-extra-color: #791717;
-    --colorful-error-color: #c5da33;
-    --colorful-error-extra-color: #849224;
+    --main-color: #b63530;
+    --caret-color: #b63530;
+    --sub-color: #255458;
+    --text-color: #F7F2EA;
+    --error-color: #b63530;
+    --error-extra-color: #530e0e;
+    --colorful-error-color: #ddca1f;
+    --colorful-error-extra-color: #8f8610;
 }
\ No newline at end of file

From 51f3f28b0254aca7868900f0340dd925d634df0e Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Sat, 25 Jul 2020 01:27:37 +0100
Subject: [PATCH 3/3] made a few changes to better fit the keycap theme

---
 public/themes/ishtar.css | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/themes/ishtar.css b/public/themes/ishtar.css
index 18ccb4a56..3044df8cf 100644
--- a/public/themes/ishtar.css
+++ b/public/themes/ishtar.css
@@ -1,11 +1,15 @@
 :root {
-    --bg-color: #2B2A2A;
-    --main-color: #fae1c3;
-    --caret-color: #fae1c3;
-    --sub-color: #bb1e10;
-    --text-color: #bb1e10;
+    --bg-color: #202020;
+    --main-color: #91170c;
+    --caret-color: #c58940;
+    --sub-color: #847869;
+    --text-color: #fae1c3;
     --error-color: #bb1e10;
     --error-extra-color: #791717;
     --colorful-error-color: #c5da33;
     --colorful-error-extra-color: #849224;
+}
+
+#top .logo .bottom {
+    color: #fae1c3;
 }
\ No newline at end of file