diff --git a/.config/htop/htoprc b/.config/htop/htoprc
deleted file mode 100644
index c1c50f3..0000000
--- a/.config/htop/htoprc
+++ /dev/null
@@ -1,39 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
-sort_direction=1
-tree_sort_key=0
-tree_sort_direction=1
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-show_thread_names=0
-show_program_path=0
-highlight_base_name=0
-highlight_megabytes=1
-highlight_threads=1
-highlight_changes=0
-highlight_changes_delay_secs=5
-find_comm_in_cmdline=1
-strip_exe_from_cmdline=1
-show_merged_command=0
-tree_view=0
-tree_view_always_by_pid=0
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_one=1
-show_cpu_usage=1
-show_cpu_frequency=0
-show_cpu_temperature=0
-degree_fahrenheit=0
-update_process_names=0
-account_guest_in_cpu_meter=0
-color_scheme=0
-enable_mouse=1
-delay=15
-left_meters=LeftCPUs2 Memory Swap
-left_meter_modes=1 1 1
-right_meters=RightCPUs2 Tasks LoadAverage Uptime
-right_meter_modes=1 2 2 2
-hide_function_bar=0
diff --git a/.config/nvim/lua/config/ctrlp.lua b/.config/nvim/lua/config/ctrlp.lua
index 2a07eb9..fb7ba53 100644
--- a/.config/nvim/lua/config/ctrlp.lua
+++ b/.config/nvim/lua/config/ctrlp.lua
@@ -1,15 +1,15 @@
 local g = vim.g
 
 g.ctrlp_map = "<leader>t"
-g.ctrlp_use_caching = 1
-g.ctrlp_clear_cache_on_exit = 0
-g.ctrlp_cache_dir = "./.vim/cache/ctrlp"
+-- g.ctrlp_use_caching = 1
+-- g.ctrlp_clear_cache_on_exit = 0
+-- g.ctrlp_cache_dir = "./.vim/cache/ctrlp"
 g.ctrlp_user_command = {
     '.git', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'
 }
 
 --Limit max number of files
 --This prevents me from indexing my entire HOME by accident
-g.ctrlp_max_files = 10000
+g.ctrlp_max_files = 1000
 --Also limit recursion depth
-g.ctrlp_max_depth = 40
+g.ctrlp_max_depth = 10
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 5f946a1..321b013 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -10,7 +10,6 @@ local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
 
 if fn.empty(fn.glob(install_path)) > 0 then
   fn.system({'git', 'clone', 'https://github.com/wbthomason/packer.nvim', install_path})
-  vim.api.nvim_command('packadd packer.nvim')
 end
 
 require('packer').startup(function()
@@ -57,9 +56,6 @@ require('packer').startup(function()
         config = [[require('config.nerdtree')]]
     }
 
-    -- Better support for toml files
-    use "cespare/vim-toml"
-
     use "jiangmiao/auto-pairs"
 
     -- Align text
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 4f0ca72..b3e24e5 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -37,15 +37,18 @@ o.smartcase = true
 -- Don't highlight search results after search is finished
 o.hlsearch = false
 
+local swap_dir = vim.fn.stdpath('data') .. '/swap'
+local undo_dir = vim.fn.stdpath('data') .. '/undo'
+
 -- Create swap files
 o.swapfile = true
 -- Where to store the swap files; I store mine in the current directory
-o.directory = "./.vim/swap//"
+o.directory = swap_dir
 
 o.backup = false
 
 o.undofile = true
-o.undodir = "./.vim/undo//"
+o.undodir = undo_dir
 
 o.updatetime = 250
 
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 57b2676..9818166 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -169,11 +169,6 @@ _G.packer_plugins = {
     path = "/home/jjr/.local/share/nvim/site/pack/packer/start/vim-surround",
     url = "https://github.com/tpope/vim-surround"
   },
-  ["vim-toml"] = {
-    loaded = true,
-    path = "/home/jjr/.local/share/nvim/site/pack/packer/start/vim-toml",
-    url = "https://github.com/cespare/vim-toml"
-  },
   vimtex = {
     loaded = true,
     path = "/home/jjr/.local/share/nvim/site/pack/packer/start/vimtex",
diff --git a/.tmux.conf b/.tmux.conf
index 12845ba..88c4f5e 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,3 @@
-<<<<<<< Updated upstream
-set -s escape-time 0
-=======
 # Change prefix to Ctrl-a
 unbind C-b
 set -g prefix C-a
@@ -24,4 +21,3 @@ bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
->>>>>>> Stashed changes