 
 ;;;_. yasnippet
 (use-package yasnippet
-  :conf
+  :init
   (progn 
     ; Initialize Yasnippet
-    (yas/initialize)
-    (setq yas/use-menu 'abbreviate)
-
-    (yas/global-mode 1)
-
-    ; set yas/root-directory as a list, to allow for adding user snippets 
-    (setq yas/root-directory '(
-                               "~/.emacs.d/snippets"
-                               "~/.emacs.d/el-get/yasnippet/snippets"))
-
-    ;; Map `yas/load-directory' to every element
-    (mapc 'yas/load-directory yas/root-directory)))
+    (setq yas-snippet-dirs
+	  '("~/.emacs.d/snippets"
+	    "~/.emacs.d/el-get/yasnippet/snippets"))
+    (yas-global-mode 1)))
 
 ;;;_. emacs-lisp-mode-hook
 (add-hook 'emacs-lisp-mode-hook

         auto-complete-yasnippet
         autopair
         base16-theme
         bookmark+
         bookmark+-1
         bookmark+-bmu
         bookmark+-doc
         bookmark+-key
         bookmark+-mac
         bookmark+-lit
         boxquote
         ; breadcrumb
         calfw

;(el-get-emacswiki-refresh)

(setq el-get-sources '(
		       (:name bookmark-plus :type github :pkgname "emacsmirror/bookmark-plus")
                       (:name icicles :type emacswiki)
                       (:name icicles-mac :type emacswiki)
                       (:name icicles-face :type emacswiki)
