diff --git a/lua/absolute/lazy.lua b/lua/absolute/lazy.lua
index 46c1f3e..4ff9ae2 100644
--- a/lua/absolute/lazy.lua
+++ b/lua/absolute/lazy.lua
@@ -1,29 +1,33 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable", -- latest stable release
-        lazypath,
-    })
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+    if vim.v.shell_error ~= 0 then
+        vim.api.nvim_echo({
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { out,                            "WarningMsg" },
+            { "\nPress any key to exit..." },
+        }, true, {})
+        vim.fn.getchar()
+        os.exit(1)
+    end
 end
+
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup({
-    { import = "absolute.plugins" }
-}, {
-    install = {
-        colorscheme = { "nightfly" },
-    },
-    checker = {
-        enabled = true,
-        notify = false,
-    },
-    change_detection = {
-        notify = false
-    }
-})
+require("lazy")
+    .setup({
+            { import = "absolute.plugins" },
+        },
+        {
+            checker = {
+                enabled = true,
+                notify = false,
+            },
+            change_detection = {
+                notify = false,
+            },
+        })
 
-require("absolute.after.colorscheme");
+require("absolute.core.colorscheme")
+require("../current-theme");