diff --git a/init.el b/init.el
index 8361f41..ed4455b 100644
--- a/init.el
+++ b/init.el
@@ -44,6 +44,7 @@
 (load-user-file "typography.el")
 
 (load-user-dir "pkg")
+(load-user-dir "lang")
 
 
 ;; WARNING: Don't touch anything after this comment!
@@ -54,7 +55,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(yasnippet which-key super-save solaire-mode smartparens rainbow-delimiters magit hl-todo git-gutter flycheck diminish crux)))
+   '(yaml-mode toml-mode markdown-mode yasnippet which-key super-save solaire-mode smartparens rainbow-delimiters magit hl-todo git-gutter flycheck diminish crux)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/lang/markdown.el b/lang/markdown.el
new file mode 100644
index 0000000..ec0d486
--- /dev/null
+++ b/lang/markdown.el
@@ -0,0 +1,8 @@
+;; Markdown
+;; https://github.com/jrblevin/markdown-mode
+(use-package markdown-mode
+  :ensure t
+  :mode
+  ("README\\.md\\'" . gfm-mode)
+  :init
+  (setq markdown-command "multimarkdown"))
diff --git a/lang/toml.el b/lang/toml.el
new file mode 100644
index 0000000..713a9dd
--- /dev/null
+++ b/lang/toml.el
@@ -0,0 +1,5 @@
+;; TOML
+;; https://github.com/dryman/toml-mode.el
+(use-package toml-mode
+  :ensure t
+  :defer  t)
diff --git a/lang/yaml.el b/lang/yaml.el
new file mode 100644
index 0000000..3e66fa5
--- /dev/null
+++ b/lang/yaml.el
@@ -0,0 +1,5 @@
+;; YAML
+;; https://github.com/yoshiki/yaml-mode
+(use-package yaml-mode
+  :ensure t
+  :defer  t)