diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index 8a05110..07711a6 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -3,7 +3,7 @@
 
 ;; Company configuration
 (setq-default company-minimum-prefix-length 2   ; minimum prefix character number for auto complete.
-              company-idle-delay 0.3
+              company-idle-delay 0.1
               company-echo-delay 0
               ;; company-show-numbers t
               company-tooltip-align-annotations t ; align annotations to the right tooltip border.
@@ -29,9 +29,14 @@
                                  company-elisp ; Emacs Lisp
                                  company-clang company-cmake ;; C
                                  company-robe ;; Ruby
+                                 company-ansible ;; Ansible
                                  alchemist-company ;; Elixir
                                  company-racer ;; Rust
-                                 company-dabbrev-code company-dabbrev company-abbrev ;; abbrev
+                                 company-web-html ;; HTML
+                                 (company-dabbrev-code company-dabbrev company-abbrev) ;; abbrev
                                  company-files ; files & directory
-                                 company-ispell ; Ispell
                                  ))
+
+;;; Yasnippet configuration
+(define-key prog-mode-map (kbd "C-c y") 'company-yasnippet)
+(define-key prog-mode-map (kbd "<f13>") 'company-yasnippet)
diff --git a/init.el b/init.el
index 1ed60fe..46e2373 100644
--- a/init.el
+++ b/init.el
@@ -20,10 +20,7 @@
 		                 rainbow-mode ;; Make color symbols like #FFF colorfull
 
 				             magit ;; Git interface for Emacs
-		                 diff-hl ;; Highlight diff (also useful for git)
-
                      column-enforce-mode ;; Enforce column length of X
-
                      window-purpose ;; Make sure that windows are of grouped by
                      ;; purpose.
 
@@ -68,6 +65,7 @@
 
                      ;; Web
                      web-mode
+                     company-web
 
                      ;; Infrastructure files
                      dockerfile-mode
@@ -112,7 +110,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell))))
+    (company-web visual-regexp enh-ruby-mode counsel-projectile counsel ivy flycheck-rust flycheck racer rust-mode hydra markdown-mode solarized-theme company-ansible alchemist window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode rvm dash-at-point robe base16-theme exec-path-from-shell))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.