diff --git a/contrib/!config/salt/README.org b/contrib/!config/salt/README.org
index 82a315bc4..b1fdc4985 100644
--- a/contrib/!config/salt/README.org
+++ b/contrib/!config/salt/README.org
@@ -15,3 +15,9 @@ To use this contribution add it to your =~/.spacemacs=
 #+BEGIN_SRC emacs-lisp
   (setq-default dotspacemacs-configuration-layers '(salt))
 #+END_SRC
+
+* Key bindings
+
+| Key Binding   | Description                                  |
+|---------------+----------------------------------------------|
+| ~SPC m p b~   | mmm-mode parse buffer via =mmm-parse-buffer= |
diff --git a/contrib/!config/salt/config.el b/contrib/!config/salt/config.el
deleted file mode 100644
index 45c69932d..000000000
--- a/contrib/!config/salt/config.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;; config.el --- salt Layer packages File for Spacemacs
-;;
-;; Copyright (c) 2012-2015 Sylvain Benner
-;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
-;;
-;; Author: Sylvain Benner <sylvain.benner@gmail.com>
-;;
-;; This file is not part of GNU Emacs.
-;;
-;;; License: GPLv3
-
-;; Prerequisites
-
-(configuration-layer/declare-layer 'yaml)
diff --git a/contrib/!config/salt/packages.el b/contrib/!config/salt/packages.el
index 82106783c..37552e7d4 100644
--- a/contrib/!config/salt/packages.el
+++ b/contrib/!config/salt/packages.el
@@ -1,24 +1,26 @@
 ;;; packages.el --- Salt Layer extensions File for Spacemacs
 ;;
 ;; Copyright (c) 2012-2014 Sylvain Benner
-;; Copyright (c) 2015 phils@stackoverflow & Ben Hayden
+;; Copyright (c) 2015 Ben Hayden
 ;;
 ;; Author: Ben Hayden <hayden767@gmail.com>
-;; Pulled from Stackoverflow: http://stackoverflow.com/a/27737759/76267
 ;; URL: https://github.com/syl20bnr/spacemacs
+;; Salt mode URL: https://github.com/beardedprojamz/salt-mode
 ;;
 ;; This file is not part of GNU Emacs.
 ;;
 ;;; License: GPLv3
-(setq salt-packages '(yaml-mode))
+(setq salt-packages '(salt-mode))
 
-(defun salt/pre-init-yaml-mode ()
-  (spacemacs|use-package-add-hook yaml-mode
-    :post-init
+(defun salt/init-salt-mode ()
+  (use-package salt-mode
+    :defer t
+    :init (add-hook 'salt-mode-hook 'smartparens-mode)
+    :config
     (progn
-      (define-derived-mode saltstack-mode yaml-mode "Saltstack"
-        "Minimal Saltstack mode, based on `yaml-mode'."
-        (setq tab-width 2
-              indent-tabs-mode nil))
-      (add-to-list 'auto-mode-alist '("\\.sls\\'" . saltstack-mode)))
-    ))
+      (evil-leader/set-key-for-mode 'salt-mode
+        "mp" 'mmm-parse-buffer
+        )
+      (sp-local-pair 'salt-mode "{{" " }}")
+      (sp-local-pair 'salt-mode "{%" " %}")
+      (sp-local-pair 'salt-mode "{#" " #}"))))