diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 4436abb..3e6b420 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -99,14 +99,15 @@ setq org-log-done t)
                                     (filename . "emacs.d")))
          ("Org" (or (mode . org-mode)
                     (filename . "OrgMode")))
-         ("Magit" (name . "\*magit\*"))
+         ("Magit" (name . "^\\*magit\\*"))
          ("Help" (or (name . "\*Help\*")
                      (name . "\*Apropos\*")
                      (name . "\*info\*")))
          ("Dired" (mode . dired-mode))
          ;; Dev has groups for all languages you program in
-         ("Dev" (or (mode . cc-mode))
-          )
+         ("Dev" (or (mode . cc-mode)
+                    (mode . yaml-mode))
+         )
          ("Emacs" (or (name . "^\\*scratch\\*$")
                       (name . "^\\*Messages\\*$")))
          ("Gnus" (or (mode . message-mode)
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 8840ee2..e0aaae0 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -2,6 +2,7 @@
 
 (defvar my-packages '(ag auto-complete
                          cc-mode
+                         yaml-mode
                          markdown-mode
                          counsel
                          expand-region