diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 22b3a9b..377d73e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -95,9 +95,10 @@
  '(powerline-evil-replace-face ((t (:inherit powerline-evil-base-face :background "dark red")))))
 
 ;; Disable unnecessary UI
-(scroll-bar-mode -1)
-(tool-bar-mode -1)
-(menu-bar-mode -1)
+(when window-system
+  (scroll-bar-mode -1)
+  (tool-bar-mode -1)
+  (menu-bar-mode -1))
 
 ;; ensure repo cache is up1date
 (or (file-exists-p package-user-dir)
@@ -254,6 +255,7 @@
 (use-package company
   :ensure t
   :demand t
+  :delight
   :config
   (global-company-mode)
   (setq company-global-modes '(not git-commit-mode))