diff --git a/neovim/init.lua b/neovim/init.lua
index 2ae5129..59bff20 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -1,11 +1,10 @@
-local function_component = require "function_component"
 -- What: Mono-file nvim configuration file
 -- Why: Easy to see through everything without needing to navigate thru files
 -- Features:
 -- - LSP
 -- - Auto-complete (in insert mode: ctrl-space, navigate w/ Tab+S-Tab, confirm: Enter)
 -- - cmd: ":Format" to format
--- -  
+-- - Harpoon marks: Navigate through main files within each project 
 
 -- Basic settings of vim
 vim.cmd([[
@@ -19,8 +18,9 @@ set incsearch
 set scrolloff=15
 set signcolumn=yes
 set colorcolumn=80
-set background=dark
+set background=light
 ]])
+vim.opt.lazyredraw = true
 vim.opt.termguicolors = true
 vim.opt.cursorline = true
 -- some plugins misbehave when we do swap files
@@ -36,6 +36,7 @@ vim.g.mapleader = ' '
 -- basic keymaps
 vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) -- since we're using space for leader
 vim.keymap.set('t', '<Esc>', '<C-\\><C-n>)') -- make :terminal escape out
+vim.keymap.set({'n','i','v'}, '<c-l>', '<Cmd>:mode<Cr>') -- redraw on every mode
 
 -- diagnostics (errors/warnings to be shown)
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
@@ -75,6 +76,7 @@ Plug('lewis6991/gitsigns.nvim') -- add git info to sign columns
 Plug('tpope/vim-fugitive') -- git commands in nvim
 Plug('williamboman/mason.nvim') -- LSP, debuggers,... package manager
 Plug('williamboman/mason-lspconfig.nvim') -- lsp config for mason
+Plug('ThePrimeagen/harpoon') -- 1-click through marked files per project
 
 -- UI & colorscheme
 Plug('gruvbox-community/gruvbox')
@@ -171,11 +173,6 @@ require('nvim-treesitter.configs').setup {
       },
     },
   },
-  text = function ()
-    
-  end(),
-  CanWinBeReordered,
-
 }
 
 -- LSP settings
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
new file mode 100644
index 0000000..5f2db16
--- /dev/null
+++ b/tmux/.tmux.conf
@@ -0,0 +1,14 @@
+# Configuration for tmux
+set -g default-terminal "screen-256color" # more colors
+set -ga terminal-overrides ",xterm-256color*:Tc" # more colors
+set -s escape-time 0
+
+bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf"
+set -g base-index 1 # rebind to start from 0
+setw -g pane-base-index 1
+set-option -g renumber-windows on
+
+# status bar
+set -g status-style 'bg=#333333 fg=#5eacd3'
+
+