diff --git a/05prog-mode.el b/05prog-mode.el
index 5c0a091..14646e7 100644
--- a/05prog-mode.el
+++ b/05prog-mode.el
@@ -6,6 +6,7 @@
 ;;; Show trailing whitespace and remove whitespace on save
 (require 'whitespace)
 (add-hook 'prog-mode-hook 'whitespace-mode)
+(add-hook 'text-mode-hook 'whitespace-mode)
 (setq whitespace-style '(face trailing empty))
 
 ;;; Cleanup whitespace on save
@@ -22,9 +23,11 @@
 
 ;;; Rainbow parenthesis
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+(add-hook 'text-mode-hook 'rainbow-delimiters-mode)
 
 ;;; Show hex colors as colors
 (add-hook 'prog-mode-hook 'rainbow-mode)
+(add-hook 'text-mode-hook 'rainbow-mode)
 
 ;;; When pasting/writing over a selection, replace it.
 (delete-selection-mode 1)
diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index 07711a6..cc2d162 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -40,3 +40,6 @@
 ;;; Yasnippet configuration
 (define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
 (define-key prog-mode-map (kbd "<f13>") 'company-yasnippet)
+
+(define-key text-mode-map (kbd "C-c y") 'company-yasnippet)
+(define-key text-mode-map (kbd "<f13>") 'company-yasnippet)