diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..62c29d8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
\ No newline at end of file
diff --git a/emacs/.emacs.d/emacs.org b/emacs/.emacs.d/emacs.org
index efe0ede..7dc55ba 100644
--- a/emacs/.emacs.d/emacs.org
+++ b/emacs/.emacs.d/emacs.org
@@ -4,6 +4,7 @@
   I've manly been following the [[https://github.com/danielmai/.emacs.d][Daniel Mai's approach]] to bootstrap the config.
 
 * Looks
+
   #+BEGIN_SRC emacs-lisp
   (use-package doom-themes
     :ensure t
@@ -14,6 +15,7 @@
     :ensure t
     :hook (after-init . doom-modeline-mode))
   #+END_SRC
+
 * Functions
 
   #+BEGIN_SRC emacs-lisp
@@ -38,15 +40,21 @@
   #+END_SRC
 
 * Editor
-  #+BEGIN_SRC emacs-lisp
-  (setq-default tab-width 4
-                tab-always-indent t
-                indent-tabs-mode nil
-                fill-column 80)
 
+  #+BEGIN_SRC emacs-lisp
+    (setq-default tab-width 4
+                  tab-always-indent t
+                  indent-tabs-mode nil
+                  fill-column 80)
+
+    (use-package editorconfig
+      :ensure t
+      :config
+      (editorconfig-mode 1))
   #+END_SRC
 
 * Word wrapping
+
   #+BEGIN_SRC emacs-lisp
   (setq-default word-wrap t
                 truncate-lines t
@@ -60,6 +68,7 @@
 
 * Keybindings
   - [ ] figure out how to define mode keybindings with general
+
   #+BEGIN_SRC emacs-lisp
     (use-package general
       :ensure t
@@ -90,6 +99,7 @@
   #+END_SRC
 
 * evil
+
   #+BEGIN_SRC emacs-lisp
   (use-package evil
     :ensure t
@@ -97,7 +107,7 @@
     (setq evil-want-keybinding nil)
     :config
     (evil-mode 1))
-  
+
   (use-package evil-escape
     :ensure t
     :config
@@ -117,6 +127,7 @@
   #+END_SRC
 
 * which-key
+
   #+BEGIN_SRC emacs-lisp
   (use-package which-key
     :ensure t
@@ -128,12 +139,15 @@
   #+END_SRC
 
 * Completion
+
   #+BEGIN_SRC emacs-lisp
   (use-package company
     :ensure t
     :init (add-hook 'after-init-hook 'global-company-mode))
   #+END_SRC
+
 * ivy
+
   #+BEGIN_SRC emacs-lisp
   (use-package ivy
     :ensure t
@@ -182,6 +196,7 @@
   #+END_SRC
 
 * Projectile
+
   #+BEGIN_SRC emacs-lisp
   (use-package projectile
     :ensure t
@@ -190,6 +205,7 @@
   #+END_SRC
 
 * Git
+
   #+BEGIN_SRC emacs-lisp
   (use-package magit
     :ensure t
@@ -203,6 +219,7 @@
   #+END_SRC
 
 * Org-Mode
+
   #+BEGIN_SRC emacs-lisp
   (use-package f
     :ensure t)
@@ -218,9 +235,11 @@
   #+END_SRC
 
 * Restart
+
   #+BEGIN_SRC emacs-lisp
   (use-package restart-emacs :ensure t)
   #+END_SRC
+
 * Customize settings
   Set up the customize file to its own separate file, instead of saving customize settings in init.el.