diff --git a/.emacs.d/config.org b/.emacs.d/config.org
index 89972c1..8f83183 100644
--- a/.emacs.d/config.org
+++ b/.emacs.d/config.org
@@ -339,6 +339,8 @@ On the fly syntax checking.
 	((org-mode
 	  prog-mode)
 	 . yas-minor-mode)
+	:custom (yas-prompt-functions '(yas-ido-prompt
+									yas-completing-prompt))
 	:config (yas-reload-all))
 
   (use-package yasnippet-snippets
@@ -715,6 +717,7 @@ Define default terminal option.
 #+END_SRC
 
 ** Aliases
+
 *** General
 
 Make confirm easier, by just pressing y/n.
@@ -814,6 +817,8 @@ Disable spacebar in evil motion.
   (global-set-key (kbd "C-M-h") 'centaur-tabs-move-current-tab-to-left)
   (global-set-key (kbd "C-M-l") 'centaur-tabs-move-current-tab-to-right)
 
+  (global-set-key (kbd "M-x") 'smex)
+
   ;; Company completion selection
   (with-eval-after-load 'company
 	(define-key company-active-map (kbd "M-n") nil)
@@ -942,6 +947,10 @@ General.el ~leader key binds.
 	  "k"   '(centaur-tabs-select-beg-tab      :which-key "Tab select last")
 	  "l"   '(centaur-tabs-forward-group       :which-key "Tab forward group")
 
+	  ;; Insert
+	  "i"   '(:ignore t                        :which-key "insert")
+	  "i s" '(yas-insert-snippet               :which-key "Snippet")
+
 	  ;; Neotree
 	  "n"   '(neotree-toggle-in-project-root   :which-key "Toggle Neotree")