fix(themes): unify filename and themename usage (#1492)

10 files changed, 70 insertions, 52 deletions

diff --git a/example/themes/README.md b/example/themes/README.md
new file mode 100644
index 000000000..ade4d6cd6
--- /dev/null
+++ b/example/themes/README.md
@@ -0,0 +1,7 @@
+# Themes
+Please make sure that the theme name and the file name are the same (+`.yaml`).
+
+Example:
+
+- theme: gruvbox
+- filename: `gruvbox.yaml`
diff --git a/example/themes/gruvbox-dark.yaml b/example/themes/gruvbox-dark.yaml
new file mode 100644
index 000000000..d672ec3b8
--- /dev/null
+++ b/example/themes/gruvbox-dark.yaml
@@ -0,0 +1,15 @@
+# Gruvbox theme
+
+themes:
+  gruvbox-light:
+    bg: [251, 82, 75]
+    red: [205, 75, 69]
+    green: [152, 151, 26]
+    yellow: [215, 153, 33]
+    blue: [69, 133, 136]
+    magenta: [177, 98, 134]
+    orange: [214, 93, 14]
+    fg: [60, 56, 54]
+    cyan: [104, 157, 106]
+    black: [40, 40, 40]
+    white: [213, 196, 161]
diff --git a/example/themes/gruvbox-light.yaml b/example/themes/gruvbox-light.yaml
new file mode 100644
index 000000000..d672ec3b8
--- /dev/null
+++ b/example/themes/gruvbox-light.yaml
@@ -0,0 +1,15 @@
+# Gruvbox theme
+
+themes:
+  gruvbox-light:
+    bg: [251, 82, 75]
+    red: [205, 75, 69]
+    green: [152, 151, 26]
+    yellow: [215, 153, 33]
+    blue: [69, 133, 136]
+    magenta: [177, 98, 134]
+    orange: [214, 93, 14]
+    fg: [60, 56, 54]
+    cyan: [104, 157, 106]
+    black: [40, 40, 40]
+    white: [213, 196, 161]
diff --git a/example/themes/gruvbox.yaml b/example/themes/gruvbox.yaml
deleted file mode 100644
index df54f81c4..000000000
--- a/example/themes/gruvbox.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Gruvbox theme
-
-themes:
-  gruvbox-dark:
-    bg: [40, 40, 40]
-    red: [204, 36, 29]
-    green: [152, 151, 26]
-    yellow: [215, 153, 33]
-    blue: [69, 133, 136]
-    magenta: [177, 98, 134]
-    orange: [214, 93, 14]
-    fg: [213, 196, 161]
-    cyan: [104, 157, 106]
-    black: [60, 56, 54]
-    white: [251, 241, 199]
-  gruvbox-light:
-    bg: [251, 82, 75]
-    red: [205, 75, 69]
-    green: [152, 151, 26]
-    yellow: [215, 153, 33]
-    blue: [69, 133, 136]
-    magenta: [177, 98, 134]
-    orange: [214, 93, 14]
-    fg: [60, 56, 54]
-    cyan: [104, 157, 106]
-    black: [40, 40, 40]
-    white: [213, 196, 161]
\ No newline at end of file
diff --git a/example/themes/molokai.yaml b/example/themes/molokai-dark.yaml
index c0c652d55..b2135fdfc 100644
--- a/example/themes/molokai.yaml
+++ b/example/themes/molokai-dark.yaml
@@ -12,4 +12,4 @@ themes:
     fg: [248, 248, 240]
     cyan: [0, 255, 255]
     black: [0, 0, 0]
-    white: [255, 255, 255]
\ No newline at end of file
+    white: [255, 255, 255]
diff --git a/example/themes/one-half.yaml b/example/themes/one-half-dark.yaml
index 5f3b3968a..5f3b3968a 100644
--- a/example/themes/one-half.yaml
+++ b/example/themes/one-half-dark.yaml
diff --git a/example/themes/solarized.yaml b/example/themes/solarized-dark.yaml
index ddf9f3841..ddf9f3841 100644
--- a/example/themes/solarized.yaml
+++ b/example/themes/solarized-dark.yaml
diff --git a/example/themes/tokyo-night-light.yaml b/example/themes/tokyo-night-light.yaml
new file mode 100644
index 000000000..156943cd8
--- /dev/null
+++ b/example/themes/tokyo-night-light.yaml
@@ -0,0 +1,16 @@
+# TokyoNight Theme
+# Originally by https://github.com/enkia/tokyo-night-vscode-theme
+
+themes:
+  tokyo-night-light:
+    fg: [52,59,88] #343B58
+    bg: [213,214,219] #D5D6DB
+    black: [15,15,20] #0F0F14
+    red: [186,75,96] #BA4B60
+    green: [72,94,48]  #485E30
+    yellow: [143,94,21] #8F5E15
+    blue: [52,84,138]  #34548A
+    magenta: [90,74,120] #5A4A78
+    cyan: [15,75,110] #0F4B6E
+    white: [130,137,172] #8289AC
+    orange: [150,80,39] #965027
diff --git a/example/themes/tokyo-night-storm.yaml b/example/themes/tokyo-night-storm.yaml
new file mode 100644
index 000000000..9239990f9
--- /dev/null
+++ b/example/themes/tokyo-night-storm.yaml
@@ -0,0 +1,16 @@
+# TokyoNight Theme
+# Originally by https://github.com/enkia/tokyo-night-vscode-theme
+
+themes:
+  tokyo-night-storm:
+    fg: [169,177,214] #A9B1D6
+    bg: [36,40,59] #24283B
+    black: [56,62,90] #383E5A
+    red: [249,51,87] #F9334D
+    green: [158,206,106]  #9ECE6A
+    yellow: [224,175,104] #E0AF68
+    blue: [122,162,247]  #7AA2F7
+    magenta: [187,154,247] #BB9AF7
+    cyan: [42,195,222] #2AC3DE
+    white: [192,202,245] #C0CAF5
+    orange: [255,158,100] #FF9E64
diff --git a/example/themes/tokyo-night.yaml b/example/themes/tokyo-night.yaml
index 9962c1f8a..d62fb4228 100644
--- a/example/themes/tokyo-night.yaml
+++ b/example/themes/tokyo-night.yaml
@@ -14,27 +14,3 @@ themes:
     cyan: [42,195,222] #2AC3DE
     white: [192,202,245] #C0CAF5
     orange: [255,158,100] #FF9E64
-  tokyo-night-storm:
-    fg: [169,177,214] #A9B1D6
-    bg: [36,40,59] #24283B
-    black: [56,62,90] #383E5A
-    red: [249,51,87] #F9334D
-    green: [158,206,106]  #9ECE6A
-    yellow: [224,175,104] #E0AF68
-    blue: [122,162,247]  #7AA2F7
-    magenta: [187,154,247] #BB9AF7
-    cyan: [42,195,222] #2AC3DE
-    white: [192,202,245] #C0CAF5
-    orange: [255,158,100] #FF9E64
-  tokyo-night-light:
-    fg: [52,59,88] #343B58
-    bg: [213,214,219] #D5D6DB
-    black: [15,15,20] #0F0F14
-    red: [186,75,96] #BA4B60
-    green: [72,94,48]  #485E30
-    yellow: [143,94,21] #8F5E15
-    blue: [52,84,138]  #34548A
-    magenta: [90,74,120] #5A4A78
-    cyan: [15,75,110] #0F4B6E
-    white: [130,137,172] #8289AC
-    orange: [150,80,39] #965027