diff --git a/.config/Thunar/uca.xml b/.config/Thunar/uca.xml
index f4952ea..0bee3f1 100644
--- a/.config/Thunar/uca.xml
+++ b/.config/Thunar/uca.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actions>
 <action>
-	<icon>terminal</icon>
+	<icon>lxterminal</icon>
 	<name>Open Terminal Here</name>
 	<unique-id>1616480070297418-1</unique-id>
 	<command>alacritty --working-directory %f</command>
@@ -25,4 +25,18 @@
 	<text-files/>
 	<video-files/>
 </action>
+<action>
+	<icon>application-x-generic</icon>
+	<name>Open in New Window</name>
+	<unique-id>1661833144579749-1</unique-id>
+	<command>thunar %f</command>
+	<description>Opens the selected folder in a new thunar window.</description>
+	<patterns>*</patterns>
+	<directories/>
+	<audio-files/>
+	<image-files/>
+	<other-files/>
+	<text-files/>
+	<video-files/>
+</action>
 </actions>
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index e2083ae..d0d5cc9 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -146,7 +146,8 @@ map <c-s> set hidden!
 map <enter> shell
 map x $$f
 map X !$f
-map o &mimeopen $f
+map oo &mimeopen $f
+map ot !thunar .
 map O $mimeopen --ask $f
 
 map t
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5a5308d..ea2f5aa 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -14,14 +14,13 @@ require("user.comment")
 require("user.gitsigns")
 require("user.nvim-tree")
 require("user.bufferline")
-require("user.toggleterm") -- Need to look into this and how it's configured.
+require("user.toggleterm") -- TODO Need to work out something other than ALT for this :D
 require("user.project")
 require("user.impatient")
 require("user.indentline")
 require("user.alpha")
 require("user.whichkey")
--- Not sure I want to use this yet.
--- require "user.hop"
+-- require "user.hop" -- Not sure I want to use this yet.
 require("user.matchup")
 require("user.numb")
 require("user.colorizer")
@@ -29,21 +28,20 @@ require("user.spectre")
 require("user.zen-mode")
 require("user.neoscroll")
 require("user.todo-comments")
-require("user.symbol-outline") -- not working? look into further...
+require("user.symbol-outline") -- TODO not working? look into further...
 require("user.notify")
 require("user.ts-context")
--- I can look at this in Chritian Chiarulli's config if I wish, for now I can't be bothered.
--- require("user.copilot")
+-- require("user.copilot") -- I can look at this in Chritian Chiarulli's config if I wish, for now I can't be bothered.
 require("user.functions")
 require("user.illuminate")
-require("user.dap") -- Need to work this one out.
+require("user.dap") -- TODO Need to work this one out.
 -- require("user.lir")
-require("user.winbar")
+require("user.winbar") -- TODO The NAVIC integration here isn't working?
 require("user.nvim-webdev-icons")
 require("user.fidget")
 require("user.dressing")
 require("user.browse")
-require("user.surround") -- This need reconfiguration and fixing
+require("user.surround") -- TODO This need reconfiguration and fixing
 require("user.harpoon") -- mark files and navigate them through a nice ui or with keys (good for large codebases)
 require("user.vim-slash")
 require("user.lualine")
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index f67a95a..322a073 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -55,7 +55,7 @@ keymap("v", "P", '"_dP', opts)
 keymap("n", "<leader>o", ":setlocal spell! spelllang=en_us<CR>", opts)
 
 -- Tree
-keymap("n", "<leader>n", ":NvimTreeToggle<CR>", opts)
+-- keymap("n", "<leader>n", ":NvimTreeToggle<CR>", opts)
 
 -- Goyo
 -- keymap("n", "<leader>f", ":Goyo<CR>", opts)
@@ -65,12 +65,11 @@ keymap("n", "<C-c>", '"+y', opts)
 keymap("n", "<C-p", '"+p', opts)
 
 -- Replace All is S
-vim.cmd([[nnoremap S :%s//g<Left><Left>]])
 -- keymap('n', '<S-s>', ':%s//g<Left><Left>', opts)
 
 -- Compile the document with default compiler script
-vim.cmd([[map <leader>c :w! \| !compiler "<c-r>%"<CR>]])
--- keymap('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', opts)
+-- vim.cmd([[map <leader>c :w! \| !compiler "<c-r>%"<CR>]])
+keymap('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', opts)
 
 -- Open compiled document
 keymap("n", "<leader>p", ":!opout <c-r>%<CR><CR>", opts)
diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 88045bc..4a1742f 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -140,8 +140,9 @@ return packer.startup(function(use)
   use "lukas-reineke/indent-blankline.nvim"
 
   -- File Explorer
-  use "kyazdani42/nvim-tree.lua"
+  -- use "kyazdani42/nvim-tree.lua"
   -- use "christianchiarulli/lir.nvim"
+  use "preservim/nerdtree"
 
   -- Comment
   use "numToStr/Comment.nvim"
diff --git a/.config/nvim/lua/user/whichkey.lua b/.config/nvim/lua/user/whichkey.lua
index ad8e39a..031ddc1 100644
--- a/.config/nvim/lua/user/whichkey.lua
+++ b/.config/nvim/lua/user/whichkey.lua
@@ -109,15 +109,13 @@ local m_mappings = {
 
 local mappings = {
   a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
-  b = { "<cmd>Telescope buffers<cr>", "Buffers" },
-  e = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
+  n = { "<cmd>NERDTreeToggle<cr>", "Explorer" },
   v = { "<cmd>vsplit<cr>", "vsplit" },
   h = { "<cmd>split<cr>", "split" },
   w = { "<cmd>w<CR>", "Write" },
   -- h = { "<cmd>nohlsearch<CR>", "No HL" },
   q = { '<cmd>lua require("user.functions").smart_quit()<CR>', "Quit" },
   ["/"] = { '<cmd>lua require("Comment.api").toggle.linewise.current()<CR>', "Comment" },
-  c = { "<cmd>Bdelete!<CR>", "Close Buffer" },
 
   -- :lua require'lir.float'.toggle()
   -- ["f"] = {
@@ -138,6 +136,15 @@ local mappings = {
     m = { "<cmd>BrowseMdnSearch<cr>", "Mdn" },
   },
 
+  b = {
+    name = "Buffer",
+    b = { "<cmd>Telescope buffers<cr>", "Telescope" },
+    c = { "<cmd>Bdelete!<cr>", "Close Buffer" },
+    h = { "<cmd>BufferLineCyclePrev<cr>", "Cycle Previous" },
+    l = { "<cmd>BufferLineCycleNext<cr>", "Cycle Next" },
+    p = { "<cmd>BufferLinePickClose", "Pick Close" },
+  },
+
   p = {
     name = "Packer",
     c = { "<cmd>PackerCompile<cr>", "Compile" },
@@ -222,17 +229,18 @@ local mappings = {
     name = "LSP",
     a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action" },
     c = { "<cmd>lua require('user.lsp').server_capabilities()<cr>", "Get Capabilities" },
-    d = { "<cmd>TroubleToggle<cr>", "Diagnostics" },
+    D = { "<cmd>TroubleToggle<cr>", "Diagnostics" },
+    d = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Definition"},
     w = {
       "<cmd>Telescope lsp_workspace_diagnostics<cr>",
       "Workspace Diagnostics",
     },
     f = { "<cmd>lua vim.lsp.buf.format({ async = true })<cr>", "Format" },
     F = { "<cmd>LspToggleAutoFormat<cr>", "Toggle Autoformat" },
-    i = { "<cmd>LspInfo<cr>", "Info" },
+    i = { "<cmd>lua vim.lsp.buf.implementation()<cr>", "Implementation" },
     h = { "<cmd>lua require('lsp-inlayhints').toggle()<cr>", "Toggle Hints" },
     H = { "<cmd>IlluminationToggle<cr>", "Toggle Doc HL" },
-    I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
+    I = { "<cmd>LspInfo<cr>", "Info" },
     j = {
       "<cmd>lua vim.diagnostic.goto_next({buffer=0})<CR>",
       "Next Diagnostic",
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index faf00d4..64860bf 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # keyboard layout
-setxkbmap dvorak &
+setxkbmap us &
 
 # wallpaper
 nitrogen --restore &
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index c8bcc9c..3dbad39 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -562,7 +562,7 @@ myLogHook = fadeInactiveLogHook fadeAmount
 -- By default, do nothing.
 myStartupHook = do
     -- System apps also in .xprofile
-    spawnOnce "setxkbmap dvorak &"
+    spawnOnce "setxkbmap us &"
     spawnOnce "$HOME/.screenlayout/normal_3_screens.sh"
     spawnOnce "picom --experimental-backend &"
     spawnOnce "numlockx"