diff --git a/emacs/init.el b/emacs/init.el
index 193e387..2ca43a7 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -34,6 +34,7 @@
   (add-hook 'before-save-hook 'delete-trailing-whitespace))
 
 (add-hook 'prog-mode-hook 'hugot-delete-trailing-whitespace-hook)
+(add-hook 'yaml-mode 'hugot-delete-trailing-whitespace-hook)
 
 (yas-global-mode)
 
@@ -129,6 +130,7 @@
 
 (setq flycheck-emacs-lisp-load-path 'inherit)
 
+(add-to-list 'load-path "~/projects/phpinspect.el")
 
 ;; END GLOBAL MODES
 
@@ -217,10 +219,6 @@
 
   (phpinspect-mode))
 
-(let ((phpinspect-dir "~/projects/phpinspect.el"))
-  (when (file-exists-p phpinspect-dir)
-    (add-to-list 'load-path phpinspect-dir)))
-
 (when (require 'phpinspect nil t)
   (add-hook 'php-mode-hook #'hugot-php-personal-hook))
 
@@ -254,8 +252,19 @@
 
   (global-set-key (kbd "M-p") 'company-select-previous)
   (global-set-key (kbd "M-n") 'company-select-next)
-  (add-to-list 'company-backends 'company-shell)
-  (add-to-list 'company-backends 'company-dabbrev-code))
+  (add-to-list 'company-backends 'company-shell t)
+  (add-to-list 'company-backends 'company-dabbrev-code t)
+  (add-to-list 'company-backends 'company-capf))
+
+(defun hugot-make-capf-dominant-company-backend ()
+  (interactive)
+  (setq company-backends
+        `(company-capf
+          ,@(seq-filter (lambda (elt)
+                         (not (eq 'company-capf elt)))
+                       company-backends))))
+
+
 
 ;; END COMPANY MODE
 
@@ -306,12 +315,7 @@
   (local-set-key (kbd "C-c g") 'hugot-go-run)
 
   (setq gofmt-command "goimports")
-
-  (setq company-backends
-        `(company-capf
-          ,@(seq-filter (lambda (elt)
-                         (not (eq 'company-capf elt)))
-                       company-backends))))
+  (hugot-make-capf-dominant-company-backend))
 
 (add-hook 'go-mode-hook 'hugot-go-mode-hook)