From d780c9bccc0fb9878fcb66bb2d6249c01567a9f5 Mon Sep 17 00:00:00 2001
From: Fabrizio Destro <destro.fabrizio@gmail.com>
Date: Sun, 7 Jul 2019 16:54:10 +0200
Subject: [PATCH] New themes and some fixes.

---
 .tools/generate_theme_preview.sh           |  2 +-
 .tools/generate_themes_previews.sh         |  2 +-
 README.md                                  | 10 +++-
 themes/Monokai_Classic.conf                | 47 +++++++++++++++
 themes/Monokai_Pro.conf                    | 47 +++++++++++++++
 themes/Monokai_Pro_(Filter_Machine).conf   | 47 +++++++++++++++
 themes/Monokai_Pro_(Filter_Octagon).conf   | 47 +++++++++++++++
 themes/Monokai_Pro_(Filter_Ristretto).conf | 47 +++++++++++++++
 themes/Monokai_Pro_(Filter_Spectrum).conf  | 66 +++++++++++++++-------
 9 files changed, 293 insertions(+), 22 deletions(-)
 create mode 100644 themes/Monokai_Classic.conf
 create mode 100644 themes/Monokai_Pro.conf
 create mode 100644 themes/Monokai_Pro_(Filter_Machine).conf
 create mode 100644 themes/Monokai_Pro_(Filter_Octagon).conf
 create mode 100644 themes/Monokai_Pro_(Filter_Ristretto).conf

diff --git a/.tools/generate_theme_preview.sh b/.tools/generate_theme_preview.sh
index d4c7547..040867b 100755
--- a/.tools/generate_theme_preview.sh
+++ b/.tools/generate_theme_preview.sh
@@ -16,7 +16,7 @@ conf_filename=$(basename "$theme")
 lockfile=$(mktemp)
 
 kitty @ set-colors --match id:"$id" "$theme"
-kitty @ send-text --match id:"$id" "clear && figlet -f digital -t \"$conf_filename\" && unbuffer ./color_table.sh && rm \"$lockf\""
+kitty @ send-text --match id:"$id" "clear && figlet -f digital -t \"$conf_filename\" && unbuffer ./color_table.sh && rm \"$lockfile\"\n"
 
 # simple sync mechanism, wait for the lockfile to be removed
 ( echo "$lockfile" | entr "false" 1>/dev/null 2>&1 ) || capture themes "$preview_filename"
diff --git a/.tools/generate_themes_previews.sh b/.tools/generate_themes_previews.sh
index dcd8018..1ad9dba 100755
--- a/.tools/generate_themes_previews.sh
+++ b/.tools/generate_themes_previews.sh
@@ -3,7 +3,7 @@
 
 root="$(git rev-parse --show-toplevel)"
 tools="$root/.tools"
-themes="$root/themes"
+themes="$root/monokai"
 
 # new kitty window, return its id
 id=$(kitty @ new-window --title themes --window-type os --cwd "$tools")
diff --git a/README.md b/README.md
index f83ac5f..5214f45 100644
--- a/README.md
+++ b/README.md
@@ -276,8 +276,16 @@ wget -q -O - $(curl -s $COLOR_SCRIPT_REPO | jq '.[] | "\(.path) \(.download_url)
 ![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Molokai/preview.png)
 ### MonaLisa
 ![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/MonaLisa/preview.png)
+### Monokai Classic
+![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Classic/preview.png)
 ### Monokai Pro
-![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai/preview.png)
+![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Pro/preview.png)
+### Monokai Pro (Filter Machine)
+![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Pro_(Filter_Machine)/preview.png)
+### Monokai Pro (Filter Octagon)
+![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Pro_(Filter_Octagon)/preview.png)
+### Monokai Pro (Filter Ristretto)
+![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Pro_(Filter_Ristretto)/preview.png)
 ### Monokai Pro (Filter Spectrum)
 ![image](https://raw.githubusercontent.com/dexpota/kitty-themes-website/master/previews/Monokai_Pro_(Filter_Spectrum)/preview.png)
 ### Monokai Soda
diff --git a/themes/Monokai_Classic.conf b/themes/Monokai_Classic.conf
new file mode 100644
index 0000000..9c74f40
--- /dev/null
+++ b/themes/Monokai_Classic.conf
@@ -0,0 +1,47 @@
+background #3b3c35
+foreground #fdfff1
+
+cursor #fdfff1
+cursor_text_color #000000
+selection_foreground #3b3c35
+selection_background #fdfff1
+
+# dull black
+color0 #3b3c35
+# light black
+color8 #6e7066
+
+# dull red
+color1 #f82570
+# light red
+color9 #f82570
+
+# dull green
+color2 #a6e12d
+# light green
+color10 #a6e12d
+
+# yellow
+color3 #e4db73
+# light yellow
+color11 #e4db73
+
+# blue
+color4 #fc961f
+# light blue
+color12 #fc961f
+
+# magenta
+color5 #ae81ff
+# light magenta
+color13 #ae81ff
+
+# cyan
+color6 #66d9ee
+# light cyan
+color14 #66d9ee
+
+# dull white
+color7 #fdfff1
+# bright white
+color15 #fdfff1
diff --git a/themes/Monokai_Pro.conf b/themes/Monokai_Pro.conf
new file mode 100644
index 0000000..f5a2e8c
--- /dev/null
+++ b/themes/Monokai_Pro.conf
@@ -0,0 +1,47 @@
+background #403e41
+foreground #fcfcfa
+
+cursor #fcfcfa
+cursor_text_color #000000
+selection_foreground #403e41
+selection_background #fcfcfa
+
+# dull black
+color0 #403e41
+# light black
+color8 #727072
+
+# dull red
+color1 #ff6188
+# light red
+color9 #ff6188
+
+# dull green
+color2 #a9dc76
+# light green
+color10 #a9dc76
+
+# yellow
+color3 #ffd866
+# light yellow
+color11 #ffd866
+
+# blue
+color4 #fc9867
+# light blue
+color12 #fc9867
+
+# magenta
+color5 #ab9df2
+# light magenta
+color13 #ab9df2
+
+# cyan
+color6 #78dce8
+# light cyan
+color14 #78dce8
+
+# dull white
+color7 #fcfcfa
+# bright white
+color15 #fcfcfa
diff --git a/themes/Monokai_Pro_(Filter_Machine).conf b/themes/Monokai_Pro_(Filter_Machine).conf
new file mode 100644
index 0000000..b46e1d3
--- /dev/null
+++ b/themes/Monokai_Pro_(Filter_Machine).conf
@@ -0,0 +1,47 @@
+background #3a4449
+foreground #f2fffc
+
+cursor #f2fffc
+cursor_text_color #000000
+selection_foreground #3a4449
+selection_background #f2fffc
+
+# dull black
+color0 #3a4449
+# light black
+color8 #6b7678
+
+# dull red
+color1 #ff6d7e
+# light red
+color9 #ff6d7e
+
+# dull green
+color2 #a2e57b
+# light green
+color10 #a2e57b
+
+# yellow
+color3 #ffed72
+# light yellow
+color11 #ffed72
+
+# blue
+color4 #ffb270
+# light blue
+color12 #ffb270
+
+# magenta
+color5 #baa0f8
+# light magenta
+color13 #baa0f8
+
+# cyan
+color6 #7cd5f1
+# light cyan
+color14 #7cd5f1
+
+# dull white
+color7 #f2fffc
+# bright white
+color15 #f2fffc
diff --git a/themes/Monokai_Pro_(Filter_Octagon).conf b/themes/Monokai_Pro_(Filter_Octagon).conf
new file mode 100644
index 0000000..3aee34a
--- /dev/null
+++ b/themes/Monokai_Pro_(Filter_Octagon).conf
@@ -0,0 +1,47 @@
+background #3a3d4b
+foreground #eaf2f1
+
+cursor #eaf2f1
+cursor_text_color #000000
+selection_foreground #3a3d4b
+selection_background #eaf2f1
+
+# dull black
+color0 #3a3d4b
+# light black
+color8 #696d77
+
+# dull red
+color1 #ff657a
+# light red
+color9 #ff657a
+
+# dull green
+color2 #bad761
+# light green
+color10 #bad761
+
+# yellow
+color3 #ffd76d
+# light yellow
+color11 #ffd76d
+
+# blue
+color4 #ff9b5e
+# light blue
+color12 #ff9b5e
+
+# magenta
+color5 #c39ac9
+# light magenta
+color13 #c39ac9
+
+# cyan
+color6 #9cd1bb
+# light cyan
+color14 #9cd1bb
+
+# dull white
+color7 #eaf2f1
+# bright white
+color15 #eaf2f1
diff --git a/themes/Monokai_Pro_(Filter_Ristretto).conf b/themes/Monokai_Pro_(Filter_Ristretto).conf
new file mode 100644
index 0000000..599b0e1
--- /dev/null
+++ b/themes/Monokai_Pro_(Filter_Ristretto).conf
@@ -0,0 +1,47 @@
+background #403838
+foreground #fff1f3
+
+cursor #fff1f3
+cursor_text_color #000000
+selection_foreground #403838
+selection_background #fff1f3
+
+# dull black
+color0 #403838
+# light black
+color8 #72696a
+
+# dull red
+color1 #fd6883
+# light red
+color9 #fd6883
+
+# dull green
+color2 #adda78
+# light green
+color10 #adda78
+
+# yellow
+color3 #f9cc6c
+# light yellow
+color11 #f9cc6c
+
+# blue
+color4 #f38d70
+# light blue
+color12 #f38d70
+
+# magenta
+color5 #a8a9eb
+# light magenta
+color13 #a8a9eb
+
+# cyan
+color6 #85dacc
+# light cyan
+color14 #85dacc
+
+# dull white
+color7 #fff1f3
+# bright white
+color15 #fff1f3
diff --git a/themes/Monokai_Pro_(Filter_Spectrum).conf b/themes/Monokai_Pro_(Filter_Spectrum).conf
index 9cce823..5617a6d 100644
--- a/themes/Monokai_Pro_(Filter_Spectrum).conf
+++ b/themes/Monokai_Pro_(Filter_Spectrum).conf
@@ -1,19 +1,47 @@
-background #363536
-foreground #f7f0ff
-cursor #f7f0ff
-selection_background #525053
-color0 #363536
-color8 #69666c
-color1 #fb618d
-color9 #fb618d
-color2 #7bd78e
-color10 #7bd78e
-color3 #fbe566
-color11 #fbe566
-color4 #fc9253
-color12 #fc9253
-color5 #948ae2
-color13 #948ae2
-color6 #5ad3e5
-color7 #f7f0ff
-color15 #f7f0ff
+background #363537
+foreground #f7f1ff
+
+cursor #f7f1ff
+cursor_text_color #000000
+selection_foreground #363537
+selection_background #f7f1ff
+
+# dull black
+color0 #363537
+# light black
+color8 #69676c
+
+# dull red
+color1 #fc618d
+# light red
+color9 #fc618d
+
+# dull green
+color2 #7bd88f
+# light green
+color10 #7bd88f
+
+# yellow
+color3 #fce566
+# light yellow
+color11 #fce566
+
+# blue
+color4 #fd9353
+# light blue
+color12 #fd9353
+
+# magenta
+color5 #948ae3
+# light magenta
+color13 #948ae3
+
+# cyan
+color6 #5ad4e6
+# light cyan
+color14 #5ad4e6
+
+# dull white
+color7 #f7f1ff
+# bright white
+color15 #f7f1ff