diff --git a/.config/nvim/after/plugin/luasnip.lua b/.config/nvim/after/plugin/luasnip.lua
index 9173298..3d05bb8 100644
--- a/.config/nvim/after/plugin/luasnip.lua
+++ b/.config/nvim/after/plugin/luasnip.lua
@@ -3,7 +3,7 @@ require("luasnip.loaders.from_snipmate").load({ path = { "$HOME/.config/nvim/sni
 local ls = require("luasnip")
 vim.keymap.set({"i"}, "<C-K>", function() ls.expand() end, {silent = true})
 vim.keymap.set({"i", "s"}, "<C-D>", function() ls.jump( 1) end, {silent = true})
-vim.keymap.set({"i", "s"}, "<C-S>", function() ls.jump(-1) end, {silent = true})
+vim.keymap.set({"i", "s"}, "<C-C>", function() ls.jump(-1) end, {silent = true})
 
 vim.keymap.set({"i", "s"}, "<C-E>", function()
 	if ls.choice_active() then
diff --git a/.config/nvim/lua/tiagorg/remap.lua b/.config/nvim/lua/tiagorg/remap.lua
index c118005..73ee3d1 100644
--- a/.config/nvim/lua/tiagorg/remap.lua
+++ b/.config/nvim/lua/tiagorg/remap.lua
@@ -1,6 +1,6 @@
 --vim.keymap.set("n", "<leader>e", vim.cmd.E)
 vim.keymap.set("n", "<leader>w", vim.cmd.w)
-vim.keymap.set({ "n", "i" }, "<C-s>", vim.cmd.w)
+vim.keymap.set({ "n", "i" }, "<C-S>", vim.cmd.w)
 
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index ec84e16..82599fe 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -302,14 +302,6 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: aerial.nvim
-time([[Config for aerial.nvim]], true)
-try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0", "config", "aerial.nvim")
-time([[Config for aerial.nvim]], false)
--- Config for: monokai-pro.nvim
-time([[Config for monokai-pro.nvim]], true)
-try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim")
-time([[Config for monokai-pro.nvim]], false)
 -- Config for: nvim-surround
 time([[Config for nvim-surround]], true)
 try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
@@ -318,10 +310,18 @@ time([[Config for nvim-surround]], false)
 time([[Config for tabset.nvim]], true)
 try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vtabset\frequire\0", "config", "tabset.nvim")
 time([[Config for tabset.nvim]], false)
+-- Config for: monokai-pro.nvim
+time([[Config for monokai-pro.nvim]], true)
+try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\16monokai-pro\frequire\0", "config", "monokai-pro.nvim")
+time([[Config for monokai-pro.nvim]], false)
 -- Config for: wrapping.nvim
 time([[Config for wrapping.nvim]], true)
 try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rwrapping\frequire\0", "config", "wrapping.nvim")
 time([[Config for wrapping.nvim]], false)
+-- Config for: aerial.nvim
+time([[Config for aerial.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vaerial\frequire\0", "config", "aerial.nvim")
+time([[Config for aerial.nvim]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/.vimrc b/.vimrc
index ac131b6..26be7fd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -39,9 +39,3 @@ augroup SearchHighlight
     autocmd CmdlineLeave /,\? :nnoremap <buffer> <Esc> :nohls<CR>
 augroup END
 
-augroup CursorShape
-    autocmd!
-    autocmd VimEnter,InsertEnter * set guicursor=n-v-c:block-Cursor/lCursor
-    autocmd InsertLeave * set guicursor=n-v-c:ver25-Cursor/lCursor
-augroup END
-
diff --git a/.zsh/.zshrc b/.zsh/.zshrc
index 2043240..9c6bbd7 100644
--- a/.zsh/.zshrc
+++ b/.zsh/.zshrc
@@ -283,7 +283,7 @@ alias zshrc='vim /home/tiagorg/.zsh/.zshrc && ref'
 
 # improved system commands
 alias update='yay -Syu && flatpak update -y'
-alias autoremove='yay -Qqd | yay -Runs --noconfirm - && flatpak remove --delete-data --unused -y'
+alias autoremove='yay -Qqd | yay -Runs - && flatpak remove --delete-data --unused'
 alias clear='echo "y" > ~/.zsh/.zsh_clear && source ~/.zsh/.zshrc'
 alias c='clear'
 alias ref='echo -e -n "\x1b[\x35 q"'
@@ -299,16 +299,27 @@ alias core='echo "core.%e.%p" | sudo tee /proc/sys/kernel/core_pattern'
 alias ua='cd /home/tiagorg/repos/uaveiro-leci'
 alias ua-gi='nvim /home/tiagorg/repos/uaveiro-leci/.git/info/exclude'
 alias aed='/home/tiagorg/repos/uaveiro-leci/2ano/1semestre/aed/setup.sh'
+alias pclean='ls | grep -P "^.+\.(o|elf|map|sym)$" | xargs -d"\n" rm'
 
 # ua vpn/ssh server
 alias vpn='sudo snx -s go.ua.pt -u tiago.rgarcia@ua.pt'
 alias vpnd='sudo snx -d'
 
-alias liveshare-nvim='/home/tiagorg/.local/share/nvim/site/pack/packer/start/liveshare.nvim'
-
 source /home/tiagorg/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 source /home/tiagorg/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=#999999'
 
-# Set up path to check dotfiles bin directory
-export PATH=$HOME/.local/bin:$PATH
+
+if [ -d /opt/pic32mx/bin ] ; then
+    export PATH=$PATH:/opt/pic32mx/bin
+fi
+
+eval "$(zoxide init --cmd cd zsh)"
+
+# Set up path to check personal bin, include and lib directory
+export PATH=/home/tiagorg/.local/bin:$PATH
+export CPATH=/home/tiagorg/.local/include:/opt/pic32mx/include:$CPATH
+# For C only: C_INCLUDE_PATH
+# For C++ only: CPLUS_INCLUDE_PATH
+# For Obj-C: OBJC_INCLUDE_PATH
+export LIBRARY_PATH=/home/tiagorg/.local/lib:$LIBRARY_PATH