diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index fb67176..5d2841a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -64,7 +64,7 @@
  '(menu-bar-mode nil)
  '(package-selected-packages
    (quote
-    (evil-org org-bullets counsel powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
+    (company delight evil-org org-bullets counsel powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
  '(scroll-bar-mode nil)
  '(shell-pop-shell-type
    (quote
@@ -81,6 +81,16 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(company-preview ((t (:foreground "black"))))
+ '(company-preview-common ((t (:inherit company-preview))))
+ '(company-preview-search ((t (:inherit company-preview))))
+ '(company-scrollbar-bg ((t (:background "dim gray"))))
+ '(company-scrollbar-fg ((t (:background "gray"))))
+ '(company-template-field ((t (:foreground "dark orange"))))
+ '(company-tooltip ((t (:background "dim gray" :foreground "black"))))
+ '(company-tooltip-annotation ((t (:foreground "gray19"))))
+ '(company-tooltip-common ((t (:inherit company-preview))))
+ '(company-tooltip-selection ((t (:background "dark gray"))))
  '(ivy-current-match ((t (:foreground "gold"))))
  '(minibuffer-prompt ((t (:foreground "dark orange" :weight bold))))
  '(neo-dir-link-face ((t (:foreground "#fce94f"))))
@@ -245,22 +255,30 @@
   (projectile-global-mode t)
   (setq projectile-completion-system 'ivy))
 
-;; Auto-Complete
-(use-package auto-complete
+;; Company mode
+(use-package company
   :ensure t
   :demand t
-  :delight
   :config
-  (require 'auto-complete-config)
-  (setq ac-sources '(ac-source-filename
-                     ac-source-functions
-                     ac-source-yasnippet
-                     ac-source-variables
-                     ac-source-symbols
-                     ac-source-features
-                     ac-source-words-in-all-buffer
-                     ac-source-dictionary))
-  (global-auto-complete-mode))
+  (global-company-mode))
+
+;; Auto-Complete
+;;(use-package auto-complete
+;;  :ensure t
+;;  :demand t
+;;  :delight
+;;  :disabled
+;;  :config
+;;  (require 'auto-complete-config)
+;;  (setq ac-sources '(ac-source-filename
+;;                     ac-source-functions
+;;                     ac-source-yasnippet
+;;                     ac-source-variables
+;;                     ac-source-symbols
+;;                     ac-source-features
+;;                     ac-source-words-in-all-buffer
+;;                     ac-source-dictionary))
+;;  (global-auto-complete-mode))
 
 ;; folding
 (use-package origami