diff --git a/.gitmodules b/.gitmodules
index 51eec28..0ccfe26 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,9 @@
 [submodule "bundle/vim-sensible"]
 	path = bundle/vim-sensible
 	url = https://github.com/tpope/vim-sensible
-[submodule "bundle/vim-airline"]
-	path = bundle/vim-airline
-	url = https://github.com/vim-airline/vim-airline
-[submodule "bundle/vim-airline-themes"]
-	path = bundle/vim-airline-themes
-	url = https://github.com/vim-airline/vim-airline-themes.git
+[submodule "bundle/lightline.vim"]
+	path = bundle/lightline.vim
+	url = https://github.com/itchyny/lightline.vim.git
+[submodule "bundle/editorconfig-vim"]
+	path = bundle/editorconfig-vim
+	url = https://github.com/editorconfig/editorconfig-vim.git
diff --git a/bundle/editorconfig-vim b/bundle/editorconfig-vim
new file mode 160000
index 0000000..3078cd1
--- /dev/null
+++ b/bundle/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit 3078cd10b28904e57d878c0d0dab42aa0a9fdc89
diff --git a/bundle/lightline.vim b/bundle/lightline.vim
new file mode 160000
index 0000000..b06d921
--- /dev/null
+++ b/bundle/lightline.vim
@@ -0,0 +1 @@
+Subproject commit b06d921023cf6536bcbee5754071d122296e8942
diff --git a/bundle/vim-airline b/bundle/vim-airline
deleted file mode 160000
index 2e29ab9..0000000
--- a/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e29ab965625d1315f0ad070c928794baea3d66f
diff --git a/bundle/vim-airline-themes b/bundle/vim-airline-themes
deleted file mode 160000
index 97cf3e6..0000000
--- a/bundle/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
diff --git a/vimrc b/vimrc
index fa0eb59..bc5054f 100644
--- a/vimrc
+++ b/vimrc
@@ -6,6 +6,9 @@ execute pathogen#infect()
 let g:spacegray_use_italics=1
 colorscheme spacegray
 let g:airline_theme='distinguished'
+let g:lightline = {
+\	'colorscheme': 'Tomorrow_Night',
+\}
 
 " custom settings
 set number
@@ -47,8 +50,6 @@ let g:header_field_author_email='steinsset@gmail.com'
 let g:header_field_license_id='GNU'
 nmap <silent> <F4> :AddHeader<CR>
 
-" allow project-specific configs
-if filereadable("./.project.vim")
-    source ./.project.vim
-endif
+set autochdir
+let g:EditorConfig_verbose=1