diff --git a/bundles-init/vim-airline-themes.load.vim b/bundles-init/vim-airline-themes.load.vim
deleted file mode 100644
index ca1be15..0000000
--- a/bundles-init/vim-airline-themes.load.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-NeoBundle 'vim-airline/vim-airline-themes' , {
-\		'depends' : [ 'bling/vim-airline' ]
-\	}
diff --git a/bundles-init/vim-airline.cfg.vim b/bundles-init/vim-airline.cfg.vim
deleted file mode 100644
index 4f0b8a9..0000000
--- a/bundles-init/vim-airline.cfg.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-let g:airline_powerline_fonts = 1					" Use really lovely patched fonts
-let g:airline#extensions#tabline#enabled = 1				" Show buffers / tabs at the top
-let g:airline#extensions#tabline#formatter = 'unique_tail_improved'	" Buffer name formatter
-let g:airline#extensions#tabline#show_buffers = 1
-let g:airline#extensions#tabline#show_tabs = 1
-set laststatus=2							" Always show status line
diff --git a/bundles-init/vim-airline.load.vim b/bundles-init/vim-airline.load.vim
deleted file mode 100644
index 6622f20..0000000
--- a/bundles-init/vim-airline.load.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-NeoBundle 'bling/vim-airline' , {
-\		'depends' : [ 'ctrlpvim/ctrlp.vim' ]
-\	}
diff --git a/plugins/vim-airline-themes.load.vim b/plugins/vim-airline-themes.load.vim
new file mode 100644
index 0000000..56e110b
--- /dev/null
+++ b/plugins/vim-airline-themes.load.vim
@@ -0,0 +1,4 @@
+call dein#add('vim-airline/vim-airline-themes', #{
+	\	lazy: 1,
+	\	on_event: 'VimEnter',
+	\ })
diff --git a/bundles-init/vim-airline-themes.cfg.vim b/plugins/vim-airline-themes.post.vim
similarity index 100%
rename from bundles-init/vim-airline-themes.cfg.vim
rename to plugins/vim-airline-themes.post.vim
diff --git a/plugins/vim-airline.cfg.vim b/plugins/vim-airline.cfg.vim
new file mode 100644
index 0000000..b8d6dfe
--- /dev/null
+++ b/plugins/vim-airline.cfg.vim
@@ -0,0 +1,12 @@
+" Use powerline fonts
+let g:airline_powerline_fonts = 1
+" Show buffers / tabs at the top
+let g:airline#extensions#tabline#enabled = 1
+" Buffer name formatter
+let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
+" Show the list of buffers
+let g:airline#extensions#tabline#show_buffers = 1
+" Show the list of tabs
+let g:airline#extensions#tabline#show_tabs = 1
+" Always show status line
+set laststatus=2
diff --git a/plugins/vim-airline.load.vim b/plugins/vim-airline.load.vim
new file mode 100644
index 0000000..d14d24f
--- /dev/null
+++ b/plugins/vim-airline.load.vim
@@ -0,0 +1,3 @@
+call dein#add('bling/vim-airline', #{
+	\	lazy: 1,
+	\ })