diff --git a/common/.config/nvim/lua/config/keymaps.lua b/common/.config/nvim/lua/config/keymaps.lua
index d98fc82..229563a 100644
--- a/common/.config/nvim/lua/config/keymaps.lua
+++ b/common/.config/nvim/lua/config/keymaps.lua
@@ -1,14 +1,13 @@
 -- Load Keybindings from VIM
 local sep = package.config:sub(1, 1)
-local home = os.getenv("HOME") or os.getenv("USERPROFILE")
-local vim_mappings = home .. sep .. ".vim" .. sep .. "key_maps.vim"
+local vim_mappings = vim.loop.os_homedir() .. sep .. ".vim" .. sep .. "key_maps.vim"
 local util = require("config.util")
 if vim.loop.fs_stat(vim_mappings) and util.is_not_vscode() then
     vim.cmd("source " .. vim_mappings)
 end
 
 vim.keymap.set({ "n" }, "<leader><CR>", function()
-    vim.cmd("source " .. vim.fn.expand(vim.fn.stdpath("config") .. "/init.lua"))
+    vim.cmd("source " .. vim.fn.expand(vim.fn.stdpath("config") .. sep .. "init.lua"))
 end, { desc = "Apply NVIM config changes" })
 
 vim.keymap.set({ "n", "v" }, "<leader>y", '"+y', { desc = "Copy to system clipboard" })
diff --git a/common/.config/nvim/lua/config/options.lua b/common/.config/nvim/lua/config/options.lua
index c3c837b..3ee7739 100644
--- a/common/.config/nvim/lua/config/options.lua
+++ b/common/.config/nvim/lua/config/options.lua
@@ -1,7 +1,6 @@
 -- Load configs from VIM
 local sep = package.config:sub(1, 1)
-local home = os.getenv("HOME") or os.getenv("USERPROFILE")
-local vim_configs = home .. sep .. ".vim" .. sep .. "configs.vim"
+local vim_configs = vim.loop.os_homedir() .. sep .. ".vim" .. sep .. "configs.vim"
 if vim.loop.fs_stat(vim_configs) then
     vim.cmd("source " .. vim_configs)
 end
diff --git a/common/.config/nvim/lua/plugins/formatting.lua b/common/.config/nvim/lua/plugins/formatting.lua
index 1cacfda..f87db00 100644
--- a/common/.config/nvim/lua/plugins/formatting.lua
+++ b/common/.config/nvim/lua/plugins/formatting.lua
@@ -48,7 +48,7 @@ return {
                 markdownlint = {
                     prepend_args = {
                         "--config",
-                        "~/.config/templates/markdownlint.json",
+                        vim.loop.os_homedir() .. "/.config/templates/markdownlint.json",
                     },
                 },
                 ["markdown-toc"] = {
diff --git a/common/.config/nvim/lua/plugins/linting.lua b/common/.config/nvim/lua/plugins/linting.lua
index 976aef8..1885cc8 100644
--- a/common/.config/nvim/lua/plugins/linting.lua
+++ b/common/.config/nvim/lua/plugins/linting.lua
@@ -26,7 +26,7 @@ return {
             local markdownlint = lint.linters.markdownlint
             markdownlint.args = {
                 "--config",
-                "~/.config/templates/markdownlint.json",
+                vim.loop.os_homedir() .. "/.config/templates/markdownlint.json",
                 "--",
             }
 
diff --git a/common/.config/nvim/lua/plugins/utility-plugs.lua b/common/.config/nvim/lua/plugins/utility-plugs.lua
index 7070913..dcee00c 100644
--- a/common/.config/nvim/lua/plugins/utility-plugs.lua
+++ b/common/.config/nvim/lua/plugins/utility-plugs.lua
@@ -174,7 +174,7 @@ return {
             scratch = {
                 enabled = true,
                 ft = "markdown",
-                root = "~/Code/journal/scratch",
+                root = vim.loop.os_homedir() .. "/Code/journal/scratch",
             },
             words = { enabled = true },
             zen = { enabled = true, toggles = { dim = true } },
@@ -283,6 +283,10 @@ return {
     -- Navigate between NVIM & kitty splits
     {
         "knubie/vim-kitty-navigator",
+        enabled = function()
+            -- Kitty isn't available on Windows
+            return vim.loop.os_uname().sysname ~= "Windows_NT"
+        end,
         cond = require("config.util").is_not_vscode(),
         build = "cp ./*.py ~/.config/kitty/",
         keys = {