diff --git a/lua/lualine/components/branch.lua b/lua/lualine/components/branch.lua
index 3732438..abadb19 100644
--- a/lua/lualine/components/branch.lua
+++ b/lua/lualine/components/branch.lua
@@ -18,7 +18,7 @@ Branch.new = function(self, options, child)
   -- run watch head on load so branch is present when component is loaded
   Branch.update_branch()
   -- update branch state of BufEnter as different Buffer may be on different repos
-  vim.cmd [[autocmd BufEnter * lua require'lualine.components.branch'.update_branch()]]
+  vim.cmd [[autocmd lualine BufEnter * lua require'lualine.components.branch'.update_branch()]]
   return new_branch
 end
 
diff --git a/lua/lualine/init.lua b/lua/lualine/init.lua
index 531475a..64cfd8f 100644
--- a/lua/lualine/init.lua
+++ b/lua/lualine/init.lua
@@ -167,33 +167,25 @@ end
 local function tabline() return statusline(config.tabline, true) end
 
 local function setup_theme()
-  local async_loader
-  async_loader = vim.loop.new_async(vim.schedule_wrap(
-                                        function()
-        local function get_theme_from_config()
-          local theme_name = config.options.theme
-          if type(theme_name) == 'string' then
-            package.loaded['lualine.themes.'..theme_name] = nil
-            local ok, theme = pcall(require, 'lualine.themes.' .. theme_name)
-            if ok then return theme end
-          elseif type(theme_name) == 'table' then
-            -- use the provided theme as-is
-            return config.options.theme
-          end
-          vim.api.nvim_err_writeln('theme ' .. tostring(theme_name) ..
-                                       ' not found, defaulting to gruvbox')
-          return require 'lualine.themes.gruvbox'
-        end
-        local theme = get_theme_from_config()
-        highlight.create_highlight_groups(theme)
-        vim.api.nvim_exec([[
-          augroup lualine
-            autocmd ColorScheme * lua require'lualine.utils.utils'.reload_highlights()
-          augroup END
-          ]], false)
-        async_loader:close()
-      end))
-  async_loader:send()
+  local function get_theme_from_config()
+    local theme_name = config.options.theme
+    if type(theme_name) == 'string' then
+      package.loaded['lualine.themes.'..theme_name] = nil
+      local ok, theme = pcall(require, 'lualine.themes.' .. theme_name)
+      if ok then return theme end
+    elseif type(theme_name) == 'table' then
+      -- use the provided theme as-is
+      return config.options.theme
+    end
+    vim.api.nvim_err_writeln('theme ' .. tostring(theme_name) ..
+                                 ' not found, defaulting to gruvbox')
+    return require 'lualine.themes.gruvbox'
+  end
+  local theme = get_theme_from_config()
+  highlight.create_highlight_groups(theme)
+  vim.cmd [[
+    autocmd lualine ColorScheme * lua require'lualine.utils.utils'.reload_highlights()
+    ]]
 end
 
 local function set_tabline()
@@ -207,16 +199,21 @@ local function set_statusline()
   if next(config.sections) ~= nil or next(config.inactive_sections) ~= nil then
     vim.o.statusline = '%!v:lua.require\'lualine\'.statusline()'
     vim.api.nvim_exec([[
-      augroup lualine
-        autocmd!
-        autocmd WinLeave,BufLeave * lua vim.wo.statusline=require'lualine'.statusline()
-        autocmd BufWinEnter,WinEnter,BufEnter,SessionLoadPost * set statusline<
-        autocmd VimResized * redrawstatus
-      augroup END
+      autocmd lualine WinLeave,BufLeave * lua vim.wo.statusline=require'lualine'.statusline()
+      autocmd lualine BufWinEnter,WinEnter,BufEnter,SessionLoadPost * set statusline<
+      autocmd lualine VimResized * redrawstatus
     ]], false)
   end
 end
 
+local function setup_augroup()
+  vim.cmd [[
+    augroup lualine
+      autocmd!
+    augroup END
+  ]]
+end
+
 local function setup(user_config)
   if user_config then
     config = config_module.apply_configuration(user_config)
@@ -229,6 +226,7 @@ local function setup(user_config)
   else
     config = config_module.apply_configuration({})
   end
+  setup_augroup()
   setup_theme()
   loader.load_all(config)
   set_statusline()
diff --git a/lua/lualine/utils/loader.lua b/lua/lualine/utils/loader.lua
index 50b80f6..a46c927 100644
--- a/lua/lualine/utils/loader.lua
+++ b/lua/lualine/utils/loader.lua
@@ -24,24 +24,18 @@ local function component_loader(component)
 end
 
 local function load_sections(sections, options)
-  local async_loader
-  async_loader = vim.loop.new_async(vim.schedule_wrap(
-                                        function()
-        for section_name, section in pairs(sections) do
-          for index, component in pairs(section) do
-            if type(component) == 'string' or type(component) == 'function' then
-              component = {component}
-            end
-            component.self = {}
-            component.self.section = section_name
-            -- apply default args
-            component = vim.tbl_extend('keep', component, options)
-            section[index] = component_loader(component)
-          end
-        end
-        async_loader:close()
-      end))
-  async_loader:send()
+  for section_name, section in pairs(sections) do
+    for index, component in pairs(section) do
+      if type(component) == 'string' or type(component) == 'function' then
+        component = {component}
+      end
+      component.self = {}
+      component.self.section = section_name
+      -- apply default args
+      component = vim.tbl_extend('keep', component, options)
+      section[index] = component_loader(component)
+    end
+  end
 end
 
 local function load_components(config)