diff --git a/laptop/config/globals.lua b/laptop/config/globals.lua
index 9a91f4a..23a6ae0 100644
--- a/laptop/config/globals.lua
+++ b/laptop/config/globals.lua
@@ -36,7 +36,7 @@ set.spell = true
 -- Enable mouse support
 set.mouse = 'n'
 -- Enable programming dictionary
-set.spelllang = { "en", "programming" }
+set.spelllang = { "en", "programming", "en-academic" }
 
 -- Disable unused plugins
 g.loaded_perl_provider = 0
diff --git a/laptop/config/plugins.lua b/laptop/config/plugins.lua
index a1b0156..bda067d 100644
--- a/laptop/config/plugins.lua
+++ b/laptop/config/plugins.lua
@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 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)
 
 -- Load plugin via paq-nvim
-require("lazy").setup(
-    {
+require("lazy").setup({
+    spec = {
         -- Use lualine for statusbar
         "nvim-lualine/lualine.nvim",
         "nvim-tree/nvim-web-devicons",
@@ -49,6 +52,8 @@ require("lazy").setup(
         "SirVer/ultisnips", -- For snippets
         -- Support programming terms
         { "psliwka/vim-dirtytalk",     build = ":DirtytalkUpdate" },
+        -- Support academic terms
+        { "ficcdaf/academic.nvim",     build = ":AcademicBuild" },
         -- vim-moonfly theme
         { "bluz71/vim-moonfly-colors", as = "moonfly" },
         -- Rust tools
@@ -77,14 +82,12 @@ require("lazy").setup(
         },
         {
             "felpafel/inlay-hint.nvim",
-            version = "1",
             event = "LspAttach",
             config = true,
         },
         "dvrlabs/takeout.nvim",
     },
-    {
-        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
-    }
-)
+    lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+    install = { missing = true, colorscheme = { "habamax" } },
+    checker = { enabled = true },
+})
diff --git a/server/config/plugins.lua b/server/config/plugins.lua
index 23cc163..35d2237 100644
--- a/server/config/plugins.lua
+++ b/server/config/plugins.lua
@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 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)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup(
-    {
+require("lazy").setup({
+    spec = {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -52,9 +55,8 @@ require("lazy").setup(
     "ibhagwan/fzf-lua",
     "karb94/neoscroll.nvim",
     },
-    {
-        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
-    }
-)
+    lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+    install = { missing = true, colorscheme = { "habamax" } },
+    checker = { enabled = true },
+})
 
diff --git a/vps/config/plugins.lua b/vps/config/plugins.lua
index 0077405..30cde33 100644
--- a/vps/config/plugins.lua
+++ b/vps/config/plugins.lua
@@ -1,20 +1,23 @@
 -- Automatically bootstrap lazy.nvim
 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)
 
 -- Load plugins via lazy.nvim
-require("lazy").setup(
-    {
+require("lazy").setup({
+    spec = {
     -- Use lualine for statusbar
     "nvim-lualine/lualine.nvim",
     "nvim-tree/nvim-web-devicons",
@@ -52,9 +55,8 @@ require("lazy").setup(
     "ibhagwan/fzf-lua",
     "karb94/neoscroll.nvim",
     },
-    {
-        lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
-        install = { missing = true },
-    }
-)
+    lockfile = vim.fn.stdpath("config") .. "/config/lazy-lock.json",
+    install = { missing = true, colorscheme = { "habamax" } },
+    checker = { enabled = true },
+})