diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 7cc2a3c..60436a9 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -339,7 +339,7 @@
      (setq whitespace-line-column 80)))
 
 
-(setq-default c-basic-offset 4)           ;; NASA Style Guide says 4 spaces is optimal
+(setq-default c-basic-offset 2)           ;; Default 2 spaces
 (setq-default c++-basic-offset 4)         ;;
 (setq-default c-default-style "linux")    ;; Use Linux code style
 (setq-default c++-default-style "linux")  ;;
@@ -412,10 +412,13 @@
 (global-set-key (kbd "C-h C-k") nil)
 
 ;; Pane navigation
-(global-set-key (kbd "M-h") 'windmove-left)
-(global-set-key (kbd "M-j") 'windmove-down)
-(global-set-key (kbd "M-k") 'windmove-up)
-(global-set-key (kbd "M-l") 'windmove-right)
+;; Adjusted 8/4/2019 to move to arrow keys
+;; Vim is good for Vim but since there is no stigma to arrow
+;; keys in Emacs, why not use them?
+(global-set-key (kbd "M-<left>") 'windmove-left)
+(global-set-key (kbd "M-<down>") 'windmove-down)
+(global-set-key (kbd "M-<up>") 'windmove-up)
+(global-set-key (kbd "M-<right>") 'windmove-right)
 
 ;; Git utility
 (global-set-key (kbd "C-x g s") 'magit-status)