diff --git a/.config/nvim/lua/user/autocommands.lua b/.config/nvim/lua/user/autocommands.lua
index 17df3566..0a1775fb 100644
--- a/.config/nvim/lua/user/autocommands.lua
+++ b/.config/nvim/lua/user/autocommands.lua
@@ -2,13 +2,16 @@ vim.cmd([[
     augroup _general_settings
         autocmd!
         autocmd FileType qf,help,man,lspinfo nnoremap <silent> <buffer> q :close<CR>
-        autocmd TextYankPost * silent!lua require('vim.highlight').on_yank({higroup = 'Visual', timeout = 200})
+        autocmd TextYankPost * silent!lua require("vim.highlight").on_yank({higroup = "Visual", timeout = 200})
         autocmd BufWinEnter * :set formatoptions-=cro
         autocmd FileType qf set nobuflisted
+        " Remove following whitespaces
         autocmd BufWritePre * %s/\s\+$//e
+        " Center cursor on insert mode
         autocmd InsertEnter * norm zz
         highlight CursorLine ctermbg=White cterm=bold guibg=#222222
         highlight CursorColumn ctermbg=White cterm=bold guibg=#222222
+        let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
     augroup end
 
     augroup _git
@@ -40,9 +43,9 @@ vim.cmd([[
 
     augroup _run
         autocmd!
-        autocmd FileType python imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec '!python3' shellescape(@%, 1)<CR>
-        autocmd FileType python map <buffer> <C-b> <cmd>w<CR><cmd>exec '!python3' shellescape(@%, 1)<CR>
-        autocmd FileType rust imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec '!cargo run'<CR>
-        autocmd FileType rust map <buffer> <C-b> <cmd>w<CR><cmd>exec '!cargo run'<CR>
+        autocmd FileType python imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "!python3" shellescape(@%, 1)<CR>
+        autocmd FileType python map <buffer> <C-b> <cmd>w<CR><cmd>exec "!python3" shellescape(@%, 1)<CR>
+        autocmd FileType rust imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "!cargo run"<CR>
+        autocmd FileType rust map <buffer> <C-b> <cmd>w<CR><cmd>exec "!cargo run"<CR>
     augroup end
 ]])
diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index 1261e038..0a8f4d23 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -26,8 +26,8 @@ keymap("n", "<C-j>", "<C-w>j", opts)
 keymap("n", "<C-k>", "<C-w>k", opts)
 
 -- Resize with arrows
-keymap("n", "<C-Down>", "<cmd>resize +2<CR>", opts)
-keymap("n", "<C-Up>", "<cmd>resize -2<CR>", opts)
+keymap("n", "<C-Down>", "<cmd>resize -2<CR>", opts)
+keymap("n", "<C-Up>", "<cmd>resize +2<CR>", opts)
 keymap("n", "<C-Left>", "<cmd>vertical resize -2<CR>", opts)
 keymap("n", "<C-Right>", "<cmd>vertical resize +2<CR>", opts)
 
diff --git a/.config/nvim/lua/user/whichkey.lua b/.config/nvim/lua/user/whichkey.lua
index b5403b7e..23a49946 100644
--- a/.config/nvim/lua/user/whichkey.lua
+++ b/.config/nvim/lua/user/whichkey.lua
@@ -85,8 +85,6 @@ local mappings = {
 		"Buffers",
 	},
 	["e"] = { "<cmd>NvimTreeToggle<CR>", "Explorer" },
-	["w"] = { "<cmd>w!<CR>", "Save" },
-	["q"] = { "<cmd>q!<CR>", "Quit" },
 	["c"] = { "<cmd>Bdelete!<CR>", "Close Buffer" },
 	["h"] = { "<cmd>nohlsearch<CR>", "No Highlight" },
 	["f"] = {
@@ -191,6 +189,18 @@ local mappings = {
 		I = { "<cmd>setlocal autoindent<CR>", "Enable autoindent" },
 		i = { "<cmd>setlocal noautoindent<CR>", "Disable autoindent" },
 	},
+	w = {
+		name = "Vimwiki",
+		w = "<Plug>VimwikiIndex",
+		t = "<Plug>VimwikiTabIndex",
+		s = "<Plug>VimwikiUISelect",
+		i = "<Plug>VimwikiDiaryIndex",
+		h = "<Plug>Vimwiki2HTML",
+		H = "<Plug>Vimwiki2HTMLBrowse",
+		n = "<Plug>VimwikiGoto",
+		d = "<Plug>VimwikiDeleteFile",
+		r = "<Plug>VimwikiRenameFile",
+	},
 }
 
 which_key.setup(setup)
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index be4726b0..0d961ed2 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -45,7 +45,7 @@ alias \
     airpods="bluetoothctl connect C8:B1:CD:E0:14:4F" \
     lf="lfrun" \
     weather="curl wttr.in/" \
-    ww="$EDITOR ~/vimwiki/index.wiki" \
+    ww="$EDITOR ~/vimwiki/index.md" \
     day="redshift -PO 6500" \
     night="redshift -PO 4500" \
     z="zathura"