diff --git a/init.el b/init.el
index ae9cba77a..fe94c8e2c 100644
--- a/init.el
+++ b/init.el
@@ -50,6 +50,7 @@
 	mod-snippets		; Snippet engine
 	mod-git				; GIT tools/settings
 	mod-fly				; Syntax and spell checkers
+    mod-emmet           ; Zen-coding for HTML+CSS
 	; mod-webdev		; Webdev tools (sass, js, etc)
 	; mod-gamedev		; Gamedev tools (C++, love2D, html5)
 	; mod-shell			; Terminal emulator settings
diff --git a/init/core-keymaps.el b/init/core-keymaps.el
index 97360476e..f4dd0f486 100644
--- a/init/core-keymaps.el
+++ b/init/core-keymaps.el
@@ -44,8 +44,8 @@
 	  ;; Leader alternatives
 	  (nmap (kbd "s-f") 	'projectile-find-file)
 	  (nmap (kbd "s-F") 	'projectile-ag)
-	  (nmap (kbd "s-r") 	'helm-recentf)
-	  (nmap (kbd "s-R") 	'projectile-recentf)
+	  (nmap (kbd "s-m") 	'helm-recentf)
+	  (nmap (kbd "s-M") 	'projectile-recentf)
 	  (nmap (kbd "s-o") 	'ido-find-file)
 	  (nmap (kbd "s-O") 	'open-major-mode-conf)
 	  (nmap (kbd "s-d") 	'mc/mark-next-like-this)
@@ -65,11 +65,12 @@
   "E"       'my-init
   "f"       'projectile-find-file
   "F"       'projectile-ag
-  "r"       'helm-recentf 					; recent GLOBAL files
-  "R"       'projectile-recentf				; recent PROJECT files
+  "m"       'helm-recentf 					; recent GLOBAL files
+  "M"       'projectile-recentf				; recent PROJECT files
   "p"       'projectile-switch-project
   "/"       'evilnc-comment-or-uncomment-lines
-  "\\"      'toggle-sidebar
+  "\\"      'neotree-show
+  "|"       'neotree-hide
   ";"       'helm-imenu
   ","       'ido-switch-buffer
   "="       'align-regexp
diff --git a/modules/mod-emmet.el b/modules/mod-emmet.el
new file mode 100644
index 000000000..078e864f4
--- /dev/null
+++ b/modules/mod-emmet.el
@@ -0,0 +1,10 @@
+
+(require-package 'emmet-mode)
+
+(add-hook 'scss-mode-hook   'emmet-mode) ;; Enable Emmet's css abbreviation.
+(add-hook 'web-mode-hook    'emmet-mode) ;; Auto-start on any markup modes
+(add-hook 'nxml-mode-hook   'emmet-mode) ;; XML too...
+
+(imap (kbd "s-e") 'emmet-expand-line)
+
+(provide 'mod-emmet)