diff --git a/README.md b/README.md
index dabbab5..b8a96c3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
-# Jeff's dotfiles
+# My dotfiles
 
 My dotfiles for awesome, emacs, vim, zsh, tmux,...
 
 ## Externals / Librairies used
   * [dotbot](https://github.com/anishathalye/dotbot/)
+  * [editorconfig](https://editorconfig.org/)
   * [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
   * [vim-plug](https://github.com/junegunn/vim-plug)
diff --git a/confs/abcde.conf b/confs/abcde.conf
index 3d5be05..19e4a8b 100644
--- a/confs/abcde.conf
+++ b/confs/abcde.conf
@@ -1,3 +1,7 @@
+#########################
+#   abcde config file   #
+#########################
+
 # System defaults for abcde version 2.7.1
 # Nothing in this file is uncommented by default.
 #
@@ -219,10 +223,10 @@ CONVERT=convert
 #LAMEOPTS=
 #GOGOOPTS=
 # Bladeenc still works with abcde in 2015, and the last release of bladeenc
-# was in 2001! Settings that will produce a great encode are: '-br 192' 
+# was in 2001! Settings that will produce a great encode are: '-br 192'
 #BLADEENCOPTS=
-# L3enc still works with abcde in 2015, pretty amazing when you realise 
-# that the last release of l3enc was in 1997! Settings that will produce 
+# L3enc still works with abcde in 2015, pretty amazing when you realise
+# that the last release of l3enc was in 1997! Settings that will produce
 # a great encode are: '-br 256000 -hq -crc'
 #L3ENCOPTS=
 #XINGMP3ENCOPTS=
@@ -237,7 +241,7 @@ CONVERT=convert
 
 # FLAC:
 # The flac option is a workaround for an error where flac fails
-# to encode with error 'floating point exception'. This is flac 
+# to encode with error 'floating point exception'. This is flac
 # error in get_console_width(), corrected in flac 1.3.1
 #FLACOPTS="--silent"
 
@@ -250,12 +254,12 @@ CONVERT=convert
 #MPCENCOPTS=
 
 # WavPack:
-# Look at 'wavpack --help' for detailed options, consider using '-hx3' 
+# Look at 'wavpack --help' for detailed options, consider using '-hx3'
 # for a good quality encode
 #WAVENCOPTS=
-# For Wavpack replay gain we set both the default of 'track gain' 
+# For Wavpack replay gain we set both the default of 'track gain'
 # as well as this option for 'album gain'. Better media players
-# such as vlc can select either or neither.    
+# such as vlc can select either or neither.
 #WVGAINOPTS='-a'
 
 # Monkey's Audio (ape)
@@ -274,9 +278,9 @@ CONVERT=convert
 #  2. neroAacEnc: see 'neroAacEnc -help' and
 #     consider using '-q 0.65' for a good quality encode.
 #NEROAACENCOPTS=
-#  3. fdkaac: see 'fdkaac --help' and consider using 
+#  3. fdkaac: see 'fdkaac --help' and consider using
 #     '--profile 2 --bitrate-mode 5 --afterburner 1'
-#     for a good quality encode. 
+#     for a good quality encode.
 #FDKAACENCOPTS='--bitrate 192k'
 #  4. qaac: simply run 'wine qaac.exe' to see all options and
 #     consider using '--tvbr 100' for a good quality
@@ -439,7 +443,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE} - ${YEAR} - ${ALBUMFILE}.m3u'
 #(some hardware players insist on CR-LF line-endings)
 #DOSPLAYLIST=n
 
-# album art download options (see glyrc's help for details with more detailed 
+# album art download options (see glyrc's help for details with more detailed
 # examples here: https://github.com/sahib/glyr/wiki/Commandline-arguments).
 # For example use '--formats jpg;jpeg' to only search for JPEG images
 # These options: '--from <provider>' and '--lang <langcode>' might also be useful
@@ -462,9 +466,9 @@ ALBUMARTALWAYSCONVERT="y"
 # 1. Delete any dots preceding the title (first sed command)
 # 2. Replace all spaces with an underscore (second sed command). Simply remove
 #   this if you prefer spaces.
-# 3. Delete a grab bag of characters which variously Windows and Linux do not permit 
+# 3. Delete a grab bag of characters which variously Windows and Linux do not permit
 #   (tr command). Remove any of these from the list if you wish to actually use them.
-#   
+#
 #mungefilename ()
 #{
 #	echo "$@" | sed -e 's/^\.*//' -e 's/ /_/g' | tr -d ":><|*/\"'?[:cntrl:]"
diff --git a/confs/ansiweatherrc b/confs/ansiweatherrc
index 26a6b4f..342f342 100644
--- a/confs/ansiweatherrc
+++ b/confs/ansiweatherrc
@@ -1,3 +1,7 @@
+###############################
+#   ANsiweather config file   #
+###############################
+
 location:Mauguio,FR
 forecast:3
 dateformat:%a %d %b
diff --git a/confs/editorconfig b/confs/editorconfig
new file mode 100644
index 0000000..ddc081c
--- /dev/null
+++ b/confs/editorconfig
@@ -0,0 +1,30 @@
+################################
+#   EditorConfig config file   #
+################################
+
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[{*,.*}]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+max_line_length = 80
+charset = utf-8
+
+[*.py]
+indent_style = space
+indent_size = 4
+max_line_length = 79
+
+[{Makefile,makefile,*.mk}]
+indent_style = tab
+
+[*.md]
+indent_style = space
+
+[*.sh]
+max_line_length = 0
diff --git a/confs/tmux.conf b/confs/tmux.conf
index df88ad7..5243b4d 100644
--- a/confs/tmux.conf
+++ b/confs/tmux.conf
@@ -1,3 +1,7 @@
+########################
+#   TMux config file   #
+########################
+
 # Defini le shell par defaut lance par tmux
 set-option -g default-shell "/bin/zsh"
 
diff --git a/confs/wgetrc b/confs/wgetrc
index 0ec86c2..d901f7e 100644
--- a/confs/wgetrc
+++ b/confs/wgetrc
@@ -1,3 +1,7 @@
+########################
+#   wget config file   #
+########################
+
 #recursive = on
 dirstruct = off
 no_parent = on
diff --git a/emacs/emacs b/emacs/emacs
index 606146b..5df51de 100644
--- a/emacs/emacs
+++ b/emacs/emacs
@@ -218,6 +218,12 @@
 ;; Ditaa
 (setq org-ditaa-jar-path "/usr/bin/ditaa")
 
+;; EditorConfig
+(use-package editorconfig
+  :ensure t
+  :config
+    (editorconfig-mode 1))
+
 ;; Elpy
 (use-package elpy
   :ensure t
diff --git a/libs/configs/editorconfig.yaml b/libs/configs/editorconfig.yaml
new file mode 100644
index 0000000..fad9d93
--- /dev/null
+++ b/libs/configs/editorconfig.yaml
@@ -0,0 +1,2 @@
+- link:
+    ~/.editorconfig.conf: confs/editorconfig.conf
diff --git a/vim/vim/plug.vim b/vim/vim/plug.vim
index 21fed8d..a3f41b2 100644
--- a/vim/vim/plug.vim
+++ b/vim/vim/plug.vim
@@ -11,7 +11,7 @@
 if empty(glob('~/.vim/autoload/plug.vim'))
   silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
 " Specify a directory for plugins