diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua
index 4a1742f..6d18d94 100644
--- a/.config/nvim/lua/user/plugins.lua
+++ b/.config/nvim/lua/user/plugins.lua
@@ -140,9 +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"
+  -- 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 031ddc1..0777094 100644
--- a/.config/nvim/lua/user/whichkey.lua
+++ b/.config/nvim/lua/user/whichkey.lua
@@ -109,7 +109,8 @@ local m_mappings = {
 
 local mappings = {
   a = { "<cmd>lua vim.lsp.buf.code_action()<cr>", "Action" },
-  n = { "<cmd>NERDTreeToggle<cr>", "Explorer" },
+  n = { "<cmd>NvimTreeToggle<cr>", "Explorer" },
+  -- n = { "<cmd>NERDTreeToggle<cr>", "Explorer" },
   v = { "<cmd>vsplit<cr>", "vsplit" },
   h = { "<cmd>split<cr>", "split" },
   w = { "<cmd>w<CR>", "Write" },
@@ -229,8 +230,8 @@ 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>lua vim.lsp.buf.definition()<cr>", "Definition"},
+    d = { "<cmd>TroubleToggle<cr>", "Diagnostics" },
+    D = { "<cmd>lua vim.lsp.buf.definition()<cr>", "Definition"},
     w = {
       "<cmd>Telescope lsp_workspace_diagnostics<cr>",
       "Workspace Diagnostics",
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index 64860bf..c13d4a4 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -15,25 +15,25 @@ redshift-gtk -l 34.92866:138.59863 &
 xsetroot -cursor_name left_ptr
 
 # modmap because xinit won't do it
-xmodmap -pke $HOME/.config/x11/.Xmodmap
+xmodmap -pke "$HOME"/.config/x11/.Xmodmap
 
 # start thunar daemon so it doesn't take years to load
 thunar --daemon &
 
 # handle some nvidia stuff for archmetabox
 HOST=$(cat /etc/hostname)
-if [ "$HOST" == "archmetabox" ] ; then
+if [ "$HOST" = "archmetabox" ] ; then
         # this is specifically for the laptop so check hostname
         xrandr --setprovideroutputsource modesetting NVIDIA-G0
         xrandr --auto
 fi
 
-if [ "$HOST" == "archdesktop" ] ; then
-	$HOME/.screenlayout/normal_3_screen.sh
+if [ "$HOST" = "archdesktop" ] ; then
+	"$HOME"/.screenlayout/normal_3_screen.sh
 fi
 
 autostart=""
 
 for program in $autostart; do
-	pidof -s "$progam" || "$program" &
+	pidof -s "$program" || "$program" &
 done >/dev/null 2>&1
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 3dbad39..1bd9bfe 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -71,7 +71,7 @@ import XMonad.Util.SpawnOnce
 -- A simple way to switch between desktop and laptop related things
 -- Don't forget this exists, I have previously confused myself by doing so.
 isLaptop :: Bool
-isLaptop = False
+isLaptop = True
 
 
 --THEME
@@ -281,7 +281,7 @@ myStandardEZKeys =
 
 --START_KEYS
     --NOTE xmonad
-    [ ("M-'", spawn "xmonad --recompile && xmonad --restart") -- recompile and restart xmonad
+    [ ("M-S-'", spawn "xmonad --recompile && xmonad --restart") -- recompile and restart xmonad
 
     --NOTE launchers
     , ("M-a", spawn "dmenu_run -bw 3 -c -l 15 -h 26") -- open dmenu
@@ -295,24 +295,26 @@ myStandardEZKeys =
     , ("C-l n", spawn (myFileManager ++ " $HOME/nextcloud")) -- open my nextcloud folder
     , ("C-l u", spawn (myFileManager ++ " $HOME/nextcloud/university")) -- open my nextcloud university folder
     , ("C-l p", spawn (myFileManager ++ " $HOME/nextcloud/personal")) -- open my nextcloud personal folder
-    , ("C-l r", spawn (myFileManager ++ " $HOME/Repos")) -- open my repos folder
+    , ("C-l r", spawn (myFileManager ++ " $HOME/repos")) -- open my repos folder
     , ("C-l d", spawn (myFileManager ++ " $HOME/Downloads")) -- open downloads
 
     --NOTE wm controls
-    , ("M-S-j", kill1) -- kill focused windown
-    , ("M-<Space>", sendMessage NextLayout) -- rotate through layouts
+    , ("M-/ d", spawn ("setxkbmap dvorak")) -- switch keyboard to dvorak input
+    , ("M-/ u", spawn ("setxkbmap us")) -- switch keyboard to us input
+    , ("M-'", kill1) -- kill focused windown
+    , ("M-S-<Space>", sendMessage NextLayout) -- rotate through layouts
     -- , ("M-S-<space>", setLayout $ Xmonad.layoutHook   conf) -- reset layout to default
     , ("M-S-y", refresh) -- reset current window to correct size
     , ("M-<Tab>", windows W.focusDown) -- focus next window
     , ("M-S-<Tab>", windows W.focusUp) -- focus previous window
     , ("M-m", windows W.focusMaster) -- focus master window
     , ("M-<Return>", windows W.swapMaster) -- swap window with master
-    , ("M-S-<Up>", windows W.swapUp) -- swap window with next window
+    , ("M-S-k", windows W.swapUp) -- swap window with next window
     , ("M-S-<Down>", windows W.swapDown) -- swap window with previous window
-    , ("M-S-<Right>", shiftTo Next nonNSP >> moveTo Next nonNSP) -- shift window to next workspace
-    , ("M-S-<Left>", shiftTo Prev nonNSP >> moveTo Prev nonNSP) -- shift window to previous workspace
-    , ("M-C-<Right>", nextScreen) -- shift window to next workspace
-    , ("M-C-<Left>", prevScreen) -- shift window to previous workspace
+    , ("M-S-l", shiftTo Next nonNSP >> moveTo Next nonNSP) -- shift window to next workspace
+    , ("M-S-h", shiftTo Prev nonNSP >> moveTo Prev nonNSP) -- shift window to previous workspace
+    , ("M-C-l", nextScreen) -- shift view to next screen
+    , ("M-C-h", prevScreen) -- shift view to previous screen
     , ("M-<Left>", sendMessage Shrink) -- shrink master area
     , ("M-<Right>", sendMessage Expand) -- grow master area
     , ("M-<Down>", sendMessage MirrorShrink) -- shrink master area
@@ -320,7 +322,7 @@ myStandardEZKeys =
     , ("M-y", withFocused $ windows . W.sink) -- push floating window back into tiling
     , ("M-w", sendMessage (IncMasterN 1)) -- increment windows in master
     , ("M-v", sendMessage (IncMasterN (-1))) -- decrement windows in master
-    , ("M-<F11>", sendMessage ToggleStruts) -- toggle bar
+    , ("M-S-f", sendMessage ToggleStruts) -- toggle bar
 
         -- NOTE Scratchpads
         -- NOTE Toggle show/hide these programs.  They run on a hidden workspace.