diff --git a/colorscheme.lua b/colorscheme.lua
index a893d37..6f6f3a0 100644
--- a/colorscheme.lua
+++ b/colorscheme.lua
@@ -1,2 +1,2 @@
 -- Set colorscheme to use
-return "astronvim"
+return "astrodark"
diff --git a/heirline/colors.lua b/heirline/colors.lua
index 887313d..8d22abb 100644
--- a/heirline/colors.lua
+++ b/heirline/colors.lua
@@ -1,5 +1,6 @@
 -- Customize colors for each element each element has a `_fg` and a `_bg`
 return function(colors)
-  colors.git_branch_fg = astronvim.get_hlgroup("Conditional").fg
+  local get_hlgroup = require("astronvim.utils").get_hlgroup
+  colors.git_branch_fg = get_hlgroup("Conditional").fg
   return colors
 end
diff --git a/lsp/mason.lua b/plugins/mason.lua
similarity index 100%
rename from lsp/mason.lua
rename to plugins/mason.lua