Update some colours and add new screenshot

4 files changed, 24 insertions, 11 deletions

diff --git a/README.org b/README.org
index 1f7f0eb..c41b5d6 100644
--- a/README.org
+++ b/README.org
@@ -1,14 +1,18 @@
 * Pache Dark
 
+[![MELPA](http://melpa.org/packages/pache-dark-theme-badge.svg)](http://melpa.org/#/pache-dark-theme)
+
 A dark theme with high contrast. The colours are based on the gruvbox colour scheme by [[https://github.com/morhetz/gruvbox][morhetz]].
 The code base is adapted from [[https://github.com/rexim/gruber-darker-theme][gruber-darker]] theme.
 
 # Screenshot #
 
-[[./screenshot.png]]
+[[./screenshot-2.png]]
 
 * Installation
 
+** From source
+
 Download the theme to your local directory. You can do it through `git
 clone` command:
 
@@ -21,8 +25,15 @@ add the following to your emacs config file somewhere (.emacs,
 init.el, whatever):
 
 #+BEGIN_SRC emacs-lisp
-(add-to-list 'custom-theme-load-path
-             "/path/to/pache-dark-theme/")
+  (add-to-list 'custom-theme-load-path
+               "/path/to/pache-dark-theme/")
+  
+  (load-theme 'pache-dark :noconfirm)
 #+END_SRC
 
-Use `M-x customize-themes` to change your current theme.
+** With package.el
+
+You can install `pache-dark-theme` from [[https://melpa.org/#/pache-dark-theme][MELPA]]. You can just `M-x package-install RET pache-dark-theme` and then add the following to your Emacs' config:
+#+BEGIN_SRC emacs-lisp
+  (load-theme 'pache-dark :noconfirm)
+#+END_SRC
diff --git a/pache-dark-theme.el b/pache-dark-theme.el
index b668149..8db2dd8 100644
--- a/pache-dark-theme.el
+++ b/pache-dark-theme.el
@@ -44,7 +44,7 @@
       (pache-dark-bg+2      "#3c3836")
       (pache-dark-bg+3      "#504945")
       (pache-dark-bg+4      "#665c54")
-      (pache-dark-red-1     "#af1d1a")
+      (pache-dark-red-1     "#cc241d")
       (pache-dark-red       "#fb4934")
       (pache-dark-red+1     "#fe8019")
       (pache-dark-green     "#a9b665")
@@ -54,7 +54,8 @@
       (pache-dark-niagara-2 "#2a2827")
       (pache-dark-niagara-1 "#504945")
       (pache-dark-niagara   "#83a598")
-      (pache-dark-wisteria  "#d3869b"))
+      (pache-dark-wisteria  "#d3869b")
+      (pache-dark-string    "#8ec07c"))
   (custom-theme-set-variables
    'pache-dark
    '(frame-brackground-mode (quote dark)))
@@ -169,18 +170,18 @@
 
    ;; Font Lock
    `(font-lock-builtin-face ((t (:foreground ,pache-dark-yellow))))
-   `(font-lock-comment-face ((t (:foreground ,pache-dark-brown))))
+   `(font-lock-comment-face ((t (:foreground ,pache-dark-bg+4))))
    `(font-lock-comment-delimiter-face ((t (:foreground ,pache-dark-brown))))
    `(font-lock-constant-face ((t (:foreground ,pache-dark-quartz))))
-   `(font-lock-doc-face ((t (:foreground ,pache-dark-green))))
+   `(font-lock-doc-face ((t (:foreground ,pache-dark-string))))
    `(font-lock-doc-string-face ((t (:foreground ,pache-dark-green))))
    `(font-lock-function-name-face ((t (:foreground ,pache-dark-niagara))))
    `(font-lock-keyword-face ((t (:foreground ,pache-dark-red :bold t))))
    `(font-lock-preprocessor-face ((t (:foreground ,pache-dark-quartz))))
    `(font-lock-reference-face ((t (:foreground ,pache-dark-quartz))))
-   `(font-lock-string-face ((t (:foreground ,pache-dark-green))))
-   `(font-lock-type-face ((t (:foreground ,pache-dark-quartz))))
-   `(font-lock-variable-name-face ((t (:foreground ,pache-dark-fg+1))))
+   `(font-lock-string-face ((t (:foreground ,pache-dark-string))))
+   `(font-lock-type-face ((t (:foreground ,pache-dark-fg+1))))
+   `(font-lock-variable-name-face ((t (:foreground ,pache-dark-white))))
    `(font-lock-warning-face ((t (:foreground ,pache-dark-red))))
 
    ;; Flymake
@@ -378,6 +379,7 @@
    `(term-color-magenta ((t (:foreground ,pache-dark-wisteria :background ,pache-dark-wisteria))))
    `(term-color-cyan ((t (:foreground ,pache-dark-quartz :background ,pache-dark-quartz))))
    `(term-color-white ((t (:foreground ,pache-dark-fg :background ,pache-dark-white))))
+   `(ansi-color-bold ((t (:foreground ,pache-dark-yellow :background ,pache-dark-black))))
 
    ;; company-mode
    `(company-tooltip ((t (:foreground ,pache-dark-fg :background ,pache-dark-bg+1))))
diff --git a/screenshot-2.png b/screenshot-2.png
new file mode 100644
index 0000000..baa4496
--- /dev/null
+++ b/screenshot-2.png
diff --git a/screenshot.png b/screenshot.png
deleted file mode 100644
index cb4b385..0000000
--- a/screenshot.png
+++ /dev/null