diff --git a/05prog-mode.el b/05prog-mode.el
index a87e8f3..c8adc15 100644
--- a/05prog-mode.el
+++ b/05prog-mode.el
@@ -42,6 +42,9 @@
 ;; When possible, show code documentation
 (global-eldoc-mode 1)
 
+;; Revert tags automatically
+(setq tags-revert-without-query 1)
+
 ;; Use flycheck globally to check syntax and compile languages
 (global-flycheck-mode 1)
 
diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index 90eb41a..4b1c2f4 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -25,8 +25,10 @@
 
 (setq-default company-backends '(company-capf ;; Backend for default complete-at-point function
                                  company-tern ;; Javascript
-                                 company-keywords ;; Keyword list for all languages
-                                 company-yasnippet ;; Snippets for all programming languages
+                                 (company-keywords ;; Keyword list for all languages
+                                  company-yasnippet ;; Snippets for all programming languages
+                                  company-etags ;; Ctags
+                                  )
                                  company-elisp ; Emacs Lisp
                                  company-clang company-cmake ;; C
                                  company-lsp ;; Language server protocol