diff --git a/.vimrc.bundles b/.vimrc.bundles
index 56ba981..a2e1f63 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -49,8 +49,12 @@
         " {
         Plug 'mg979/vim-visual-multi'
         " }
+    "if has('nvim') && str2float(g:nvim_version) >= 0.5 
+    "    Plug 'nvim-lualine/lualine.nvim'
+    "else
         Plug 'vim-airline/vim-airline'
         Plug 'vim-airline/vim-airline-themes'
+    "endif
 
         " For nvim-bufferline
         " {
@@ -83,6 +87,18 @@
         endif
     call plug#end()
 
+" Helper functions
+" {
+
+    function! SetAirlineTheme(theme)
+        if has('nvim') && str2float(g:nvim_version) >= 0.5
+        else
+            execute("AirlineTheme " . a:theme)
+        endif
+    endfunction
+
+" }
+
 " Plugin Preferences
 " {
     " xiyaowong/nvim-transparent {
@@ -114,6 +130,11 @@
             
         endif
     " }
+     
+    "if has('nvim') && str2float(g:nvim_version) >= 0.5 && isdirectory(expand(plugin_dir . "/lualine.nvim"))
+    " nvim-lualine/lualine.nvim {
+    " }
+    "else
     " vim-airline {
         " Set configuration options for the statusline plugin vim-airline.
         " Use the powerline theme and optionally enable powerline symbols.
@@ -129,7 +150,8 @@
             "let g:airline_theme = 'solarized'
         endif
     " }
-        
+    "endif
+
     " junegunnjunegunn/fzf {
         " [Buffers] Jump to the existing window if possible
         let g:fzf_buffers_jump = 1
@@ -174,10 +196,12 @@
                 " Inversion
                 if g:colors_name == "github_light"
                     colorscheme github_dark
-                    :AirlineTheme afterglow
+                    call SetAirlineTheme("afterglow")
+                    ":AirlineTheme afterglow
                 else
                     colorscheme github_light
-                    :AirlineTheme silver
+                    call SetAirlineTheme("silver")
+                    ":AirlineTheme silver
                 endif
             endfunction
 
@@ -199,11 +223,13 @@
                 if g:colors_name == "afterglow"
                     set background=light
                     colorscheme PaperColor
-                    :AirlineTheme silver
+                    call SetAirlineTheme("silver")
+                    ":AirlineTheme silver
                 else
                     set background=dark
                     colorscheme afterglow
-                    :AirlineTheme afterglow
+                    call SetAirlineTheme("afterglow")
+                    ":AirlineTheme afterglow
                 endif
             endfunction