diff --git a/core/core-defuns.el b/core/core-defuns.el
index 00a88ea0d..1816f6b61 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -201,24 +201,6 @@ Examples:
 (defun narf|enable-hard-wrap ()
   (turn-on-auto-fill))
 
-(defun narf|enable-tab-width-2 ()
-  (setq tab-width 2 evil-shift-width 2))
-
-(defun narf|enable-tab-width-4 ()
-  (setq tab-width 4 evil-shift-width 4))
-
-(defun narf|enable-tab-width-8 ()
-  (setq tab-width 8 evil-shift-width 8))
-
-(defun narf|disable-final-newline ()
-  (set (make-local-variable 'require-final-newline) nil))
-
-(defun narf|enable-tabs ()
-  (setq indent-tabs-mode t))
-
-(defun narf|disable-tabs ()
-  (setq indent-tabs-mode nil))
-
 (defun narf|disable-delete-trailing-whitespace ()
   (remove-hook 'before-save-hook 'delete-trailing-whitespace))
 
diff --git a/core/core-editor.el b/core/core-editor.el
index bdb894192..0e94ca6d9 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -69,10 +69,10 @@ enable multiple minor modes for the same regexp.")
 (associate! emacs-lisp-mode     :match "\\(/Cask\\|\\.\\(el\\|gz\\)\\)$")
 (associate! makefile-gmake-mode :match "/Makefile$")
 (associate! nxml-mode           :match "\\.plist$")
+(associate! conf-mode           :match "/\\.?editorconfig$")
 
 (add-hook! help-mode      'visual-line-mode)
 (add-hook! special-mode   (setq truncate-lines nil))
-(add-hook! before-save    'delete-trailing-whitespace)
 (add-hook! python-mode    'electric-indent-local-mode)
 (add-hook! change-major-mode-hook
   (when indent-tabs-mode (whitespace-mode +1)))
@@ -134,7 +134,10 @@ enable multiple minor modes for the same regexp.")
                 aw-background t))
 
 (use-package editorconfig
-  :config (editorconfig-mode +1))
+  :config
+  ;; Don't affect lisp indentation (just `tab-width')
+  (setq editorconfig-indentation-alist (delq (assq 'emacs-lisp-mode editorconfig-indentation-alist) editorconfig-indentation-alist))
+  (editorconfig-mode +1))
 
 (use-package emr
   :commands (emr-initialize emr-show-refactor-menu emr-declare-command)
diff --git a/core/core-evil.el b/core/core-evil.el
index aa9729a0d..b76d708ed 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -14,8 +14,6 @@
   (add-hook! evil-operator-state-entry  'show-paren-mode)
   (add-hook! evil-operator-state-exit   'show-paren-mode-off)
 
-  ;; Always ensure evil-shift-width is consistent with tab-width
-  (add-hook! evil-local-mode (setq evil-shift-width tab-width))
   ;; Disable highlights on insert-mode
   (add-hook! evil-insert-state-entry 'evil-ex-nohighlight)
   :config
diff --git a/core/core-yasnippet.el b/core/core-yasnippet.el
index 10d0f0ff3..597ac87f0 100644
--- a/core/core-yasnippet.el
+++ b/core/core-yasnippet.el
@@ -12,7 +12,6 @@
              yas-visit-snippet-file)
   :init
   (add-hook! (text-mode prog-mode snippet-mode markdown-mode org-mode) 'yas-minor-mode-on)
-  (add-hook! snippet-mode 'narf|disable-final-newline)
 
   (setq yas-verbosity 0
         yas-indent-line 'auto
diff --git a/modules/module-data.el b/modules/module-data.el
index 56f8281a1..1b224ce76 100644
--- a/modules/module-data.el
+++ b/modules/module-data.el
@@ -1,7 +1,5 @@
 ;;; module-data.el --- dbs 'n data formats
 
-(add-hook! (yaml-mode toml-mode) 'narf|enable-tab-width-2)
-
 (use-package yaml-mode :mode "\\.ya?ml$")
 
 (use-package json-mode :mode "\\.js\\(on\\|hintrc\\)$")
diff --git a/modules/module-go.el b/modules/module-go.el
index 1764b3a4e..6f7e7c299 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -4,10 +4,7 @@
   :mode "\\.go$"
   :interpreter "go"
   :init
-  (add-hook! go-mode '(emr-initialize
-                       narf|flycheck-enable-maybe
-                       narf|enable-tabs
-                       narf|enable-tab-width-4))
+  (add-hook! go-mode '(emr-initialize narf|flycheck-enable-maybe))
   :config
   (define-builder! go-mode "go build")
 
diff --git a/modules/module-js.el b/modules/module-js.el
index b035f6d8d..32220d903 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -101,10 +101,8 @@
 
 (use-package coffee-mode
   :mode "\\.coffee$"
-  :init (add-hook! coffee-mode 'narf|enable-tab-width-2)
   :config
   (setq-default
-   coffee-tab-width 2
    coffee-indent-like-python-mode t))
 
 (use-package nodejs-repl :defer t)
diff --git a/modules/module-lisp.el b/modules/module-lisp.el
index 29760a55d..3fd7600f4 100644
--- a/modules/module-lisp.el
+++ b/modules/module-lisp.el
@@ -12,7 +12,6 @@
   (when (narf/is-recompilable-p)
     (narf:compile-el)))
 
-(add-hook! emacs-lisp-mode 'narf|enable-tab-width-8)
 (add-hook! emacs-lisp-mode
   (add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
   (add-hook 'after-save-hook 'narf-elisp-auto-compile nil t)
diff --git a/modules/module-lua.el b/modules/module-lua.el
index 2cc3bc447..7f3127a11 100644
--- a/modules/module-lua.el
+++ b/modules/module-lua.el
@@ -5,11 +5,9 @@
   :interpreter "lua"
   :init
   (define-repl! lua-mode narf-inf-lua)
-  (setq-default lua-indent-level tab-width)
+  (add-hook! lua-mode 'flycheck-mode)
   ;; (after! company-dict
   ;;   (add-to-list 'company-dict-minor-mode-alist 'love-mode))
-  (add-hook! lua-mode '(narf|enable-tab-width-4 flycheck-mode))
-  (add-hook! lua-mode (setq lua-indent-level 4))
 
   (defun narf-inf-lua ()
     (lua-start-process "lua" "lua")
diff --git a/modules/module-nim.el b/modules/module-nim.el
index f827b3d67..8c340791d 100644
--- a/modules/module-nim.el
+++ b/modules/module-nim.el
@@ -3,7 +3,7 @@
 (use-package nim-mode
   :mode "\\.nim$"
   :init
-  (add-hook! nim-mode '(narf|enable-tab-width-2 flycheck-mode))
+  (add-hook! nim-mode 'flycheck-mode)
   :config
   (require 'flycheck-nim)
   (require 'company-nim)
diff --git a/modules/module-python.el b/modules/module-python.el
index a7bbc9404..611b4eaf5 100644
--- a/modules/module-python.el
+++ b/modules/module-python.el
@@ -5,7 +5,7 @@
   :interpreter ("python"   . python-mode)
   :commands python-mode
   :init
-  (add-hook! python-mode '(narf|enable-tab-width-4 emr-initialize narf|flycheck-enable-maybe))
+  (add-hook! python-mode '(emr-initialize narf|flycheck-enable-maybe))
   (setq-default
    python-indent-offset 4
    python-environment-directory narf-temp-dir
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 0a216ef4f..f6ba6ad8c 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -8,7 +8,7 @@
          "/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
   :interpreter "ruby"
   :init
-  (add-hook! ruby-mode '(narf|enable-tab-width-2 flycheck-mode))
+  (add-hook! ruby-mode 'flycheck-mode)
   :config
   (define-builder! ruby-mode "rake %s" "Rakefile")
   (define-env-command! ruby-mode "ruby --version | cut -d' ' -f2")
diff --git a/modules/module-web.el b/modules/module-web.el
index f4a348432..773c80217 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -1,6 +1,6 @@
 ;;; module-web.el
 
-(add-hook! (sass-mode scss-mode) '(rainbow-mode narf|enable-tab-width-2 flycheck-mode))
+(add-hook! (sass-mode scss-mode) '(rainbow-mode flycheck-mode))
 
 (use-package sass-mode
   :mode "\\.sass$"
@@ -41,13 +41,11 @@
 
 (use-package jade-mode
   :mode "\\.jade$"
-  :init (add-hook! jade-mode 'narf|enable-tab-width-2)
   :config (require 'sws-mode))
 
 (use-package web-mode
   :mode ("\\.\\(p\\)?htm\\(l\\)?$" "\\.tpl\\(\\.php\\)?$" "\\.erb$" "wp-content/themes/.+/.+\\.php$")
   :init
-  (add-hook! web-mode 'narf|enable-tab-width-2)
   (setq web-mode-markup-indent-offset  2
         web-mode-code-indent-offset    2
         web-mode-css-indent-offset     2