 (use-package travis
   :ensure t)
 
+(use-package ws-butler
+  :ensure t
+  :config (ws-butler-global-mode))
+
 (use-package editorconfig
-  :ensure t
+  :ensure ws-butler
+  :init
+  (setq editorconfig-trim-whitespaces-mode
+         'ws-butler-mode)
   :config
-  (editorconfig-mode 1))
-
-;; Always use recentf
+  (editorconfig-mode 1)
+  (add-to-list 'editorconfig-indentation-alist
+               '(f90-mode
+                 f90-associate-indent f90-continuation-indent
+                 f90-critical-indent f90-do-indent f90-if-indent
+                 f90-program-indent f90-type-indent))
+  ;; Always use tabs for Makefiles
+  (add-hook 'editorconfig-hack-properties-functions
+	    '(lambda (props)
+	       (when (derived-mode-p 'makefile-mode)
+		 (puthash 'indent_style "tab" props)))))
 
 ;; misc variables
 (setq f90-smart-end-names nil)

    :defer t
    :commands (cmake-font-lock-activate)
    :hook (cmake-mode . (lambda ()
                          (message "\nActivating font lock?\n")
                          (cmake-font-lock-activate)))
    )
  )

    ("#CC9393" "#DFAF8F" "#F0DFAF" "#7F9F7F" "#BFEBBF" "#93E0E3" "#94BFF3" "#DC8CC3")))
 '(package-selected-packages
   (quote
    (ws-butler markdown-toc docker dockerfile-mode ein elpy cmake-font-lock travis smart-tab highlight-parentheses auctex zenburn-theme exec-path-from-shell)))
 '(pdf-view-midnight-colors (quote ("#DCDCCC" . "#383838")))
 '(vc-annotate-background "#2B2B2B")
 '(vc-annotate-color-map
