diff --git a/init.el b/init.el
index 9f0fe42..7a426c3 100644
--- a/init.el
+++ b/init.el
@@ -23,7 +23,7 @@
 (global-display-line-numbers-mode +1)
 
 ;; Highlight current line
-(global-hl-line-mode 1)
+(global-hl-line-mode +1)
 
 ;; Replace yes/no prompts with y/n prompts
 (fset #'yes-or-no-p #'y-or-n-p)
@@ -65,7 +65,7 @@
 
 ;; Use-Package
 (straight-use-package 'use-package)
-(setq straight-use-package-by-default +1)
+(setq straight-use-package-by-default t)
 
 ;; Avy (jump to char)
 (use-package avy
@@ -78,3 +78,10 @@
 
 ;; Rainbow-Mode (show hex strings in color)
 (use-package rainbow-mode)
+
+;; Evil (Vim Emulation)
+(use-package evil)
+(setq evil-move-beyond-eol t)
+(setq evil-want-fine-undo t) ;; multi step undo in insert mode
+(add-hook 'prog-mode-hook (lambda () (evil-mode +1)))
+(add-hook 'change-major-mode-hook (lambda () (evil-mode -1)))