diff --git a/i3/config b/i3/config
index 42fbaad..9c5e04f 100644
--- a/i3/config
+++ b/i3/config
@@ -67,6 +67,13 @@ bindsym Scroll_Lock exec amixer -q sset Master toggle
 # bindsym XF86MonBrightnessUp exec "xbacklight -inc 10; notify-send 'brightness up'"
 # bindsym XF86MonBrightnessDown exec "xbacklight -dec 10; notify-send 'brightness down'"
 
+# enable / disable caps->escape bind
+bindsym $mod+F10 exec "setxkbmap -layout no -variant nodeadkeys -option"
+bindsym $mod+F11 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:backspace'"
+bindsym $mod+F12 exec "setxkbmap -layout no -variant nodeadkeys -option 'caps:escape'"
+bindsym $mod+F9 exec "xrandr --output DP-4 --primary --output DP-2 --auto --rotate left --right-of DP-4 --output DP-0 --auto --rotate left --left-of DP-4"
+bindsym $mod+Shift+F9 exec "xrandr --output DP-4 --primary --output DP-2 --off --output DP-0 --off"
+
 # Start Applications
 bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
 bindsym $mod+F2 exec chromium
@@ -296,12 +303,12 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id nm-applet
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id xfce4-power-manager
-exec --no-startup-id pamac-tray
-exec --no-startup-id clipit
-exec --no-startup-id start_conky_live_green
+#exec --no-startup-id pamac-tray
+#exec --no-startup-id clipit
+#exec --no-startup-id start_conky_live_green
 exec --no-startup-id xautolock -time 10 -locker blurlock
 exec_always --no-startup-id sbxkb
-exec_always --no-startup-id ff-theme-util
+#exec_always --no-startup-id ff-theme-util
 exec_always --no-startup-id fix_xcursor
 exec --no-startup-id xrandr --output $display2 --primary --output $display3 --auto --rotate left --right-of $display2 --output $display1 --auto --rotate left --left-of $display2
 
@@ -311,7 +318,6 @@ exec --no-startup-id redshift-gtk
 exec --no-startup-id dropbox start &
 exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60
 
-
 # Color palette used for the terminal ( ~/.Xresources file )
 # Colors are gathered based on the documentation:
 # https://i3wm.org/docs/userguide.html#xresources
diff --git a/nvim/init.vim b/nvim/init.vim
index a16ef68..550d37b 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -232,12 +232,12 @@ inoremap <C-d> <Delete>
 nmap <M-n> <Plug>(coc-diagnostic-prev)
 nmap <M-m> <Plug>(coc-diagnostic-next)
 " GoTo code navigation
-nnoremap gj <Plug>(coc-git-prevchunk)
-nnoremap gk <Plug>(coc-git-nextchunk)
-nnoremap gd <Plug>(coc-definition)
-nnoremap gy <Plug>(coc-type-definition)
-nnoremap gi <Plug>(coc-implementation)
-nnoremap gr <Plug>(coc-references)
+nmap <M-,> <Plug>(coc-git-prevchunk)
+nmap <M-.> <Plug>(coc-git-nextchunk)
+nmap gd <Plug>(coc-definition)
+nmap gy <Plug>(coc-type-definition)
+nmap gi <Plug>(coc-implementation)
+nmap gr <Plug>(coc-references)
 
 " *****************************
 " WINDOWS / BUFFERS
@@ -264,8 +264,8 @@ nnoremap <C-j> <C-w>-
 nnoremap <C-k> <C-w>+
 nnoremap <C-l> <C-w>>
 " quickfix window
-nmap <M-N> :cn<cr>
-nmap <M-M> :cp<cr>
+nmap <C-n> :cp<cr>
+nmap <C-m> :cn<cr>
 " remove buffer
 nmap <M-d> :bp<bar>bd#<cr>
 nmap <M-D> :bp<bar>bd!#<cr>
@@ -290,8 +290,6 @@ map <C-g> :vertical Git<cr>:vertical resize 60<cr>
 
 " *****************************
 " POPUPS
-command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, {'options': '--delimiter : --nth 4..'}, <bang>0)
-nmap          <M-w> :Ag<cr>
 nmap <silent> <M-x> :CocFzfList<cr>
 nmap <silent> <M-v> :CocFzfList symbols --kind Variable<cr>
 nmap <silent> <M-u> :CocFzfList symbols --kind Function<cr>
@@ -308,6 +306,17 @@ let g:fzf_preview_grep_cmd='rg --smart-case --line-number --no-heading --color=n
 nmap <silent> <M-g> :GFiles?<cr>
 nmap <silent> <M-c> :Commits<cr>
 nmap <silent> <M-C> :BCommits<cr>
+" Grep
+function! RipgrepFzf(query, fullscreen)
+  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true'
+  let initial_command = printf(command_fmt, shellescape(a:query))
+  let reload_command = printf(command_fmt, '{q}')
+  let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
+  call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen)
+endfunction
+command! -nargs=* -bang RG call RipgrepFzf(<q-args>, <bang>0)
+"command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, {'options': '--delimiter : --nth 4..'}, <bang>0)
+nmap          <M-w> :RG<cr>
 
 " *****************************
 " COC CONFIGS
diff --git a/root/.tmux.conf b/root/.tmux.conf
index 6c0d150..2a8372f 100644
--- a/root/.tmux.conf
+++ b/root/.tmux.conf
@@ -164,12 +164,14 @@ bind-key -T copy-mode-vi M-l select-pane -R
 set -g @tmux-fzf-launch-key 'f'
 
 ######################
-### DESIGN CHANGES ###
+###    PLUGINS     ###
 ######################
 
 # various plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'sainnhe/tmux-fzf'
 # note: fzf bound to 'F'
 #set -g @plugin 'odedlaz/tmux-onedark-theme'
diff --git a/windows terminal settings.json b/windows terminal settings.json
new file mode 100644
index 0000000..17afd64
--- /dev/null
+++ b/windows terminal settings.json	
@@ -0,0 +1,96 @@
+// This file was initially generated by Windows Terminal Preview 1.2.2234.0
+// It should still be usable in newer versions, but newer versions might have additional
+// settings, help text, or changes that you will not see unless you clear this file
+// and let us generate a new one for you.
+
+// To view the default settings, hold "alt" while clicking on the "Settings" button.
+// For documentation on these settings, see: https://aka.ms/terminal-documentation
+{
+    "$schema": "https://aka.ms/terminal-profiles-schema",
+
+    "defaultProfile": "{07b52e3e-de2c-5db4-bd2d-ba144ed6c273}",
+
+    // You can add more global application settings here.
+    // To learn more about global settings, visit https://aka.ms/terminal-global-settings
+
+    // If enabled, selections are automatically copied to your clipboard.
+    "copyOnSelect": false,
+
+    // If enabled, formatted data is also copied to your clipboard
+    "copyFormatting": false,
+
+    // A profile specifies a command to execute paired with information about how it should look and feel.
+    // Each one of them will appear in the 'New Tab' dropdown,
+    //   and can be invoked from the commandline with `wt.exe -p xxx`
+    // To learn more about profiles, visit https://aka.ms/terminal-profile-settings
+    "profiles":
+    {
+        "defaults":
+        {
+            // Put settings here that you want to apply to all profiles.
+            "colorScheme": "One Half Dark",
+            "fontSize": 10,
+            "fontFace": "Anonymous Pro for Powerline"
+        },
+        "list":
+        [
+            {
+                // Make changes here to the powershell.exe profile.
+                "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                "name": "Windows PowerShell",
+                "commandline": "powershell.exe",
+                "hidden": false
+            },
+            {
+                // Make changes here to the cmd.exe profile.
+                "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                "name": "Command Prompt",
+                "commandline": "cmd.exe",
+                "hidden": false
+            },
+            {
+                "guid": "{c6eaf9f4-32a7-5fdc-b5cf-066e8a4b1e40}",
+                "hidden": false,
+                "name": "Ubuntu-18.04",
+                "source": "Windows.Terminal.Wsl"
+            },
+            {
+                "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+                "hidden": false,
+                "name": "Azure Cloud Shell",
+                "source": "Windows.Terminal.Azure"
+            },
+            {
+                "guid": "{07b52e3e-de2c-5db4-bd2d-ba144ed6c273}",
+                "hidden": false,
+                "name": "Ubuntu-20.04",
+                "source": "Windows.Terminal.Wsl"
+            }
+        ]
+    },
+
+    // Add custom color schemes to this array.
+    // To learn more about color schemes, visit https://aka.ms/terminal-color-schemes
+    "schemes": [],
+
+    // Add custom keybindings to this array.
+    // To unbind a key combination from your defaults.json, set the command to "unbound".
+    // To learn more about keybindings, visit https://aka.ms/terminal-keybindings
+    "keybindings":
+    [
+        // Copy and paste are bound to Ctrl+Shift+C and Ctrl+Shift+V in your defaults.json.
+        // These two lines additionally bind them to Ctrl+C and Ctrl+V.
+        // To learn more about selection, visit https://aka.ms/terminal-selection
+        { "command": {"action": "copy", "singleLine": false }, "keys": "ctrl+c" },
+        { "command": "paste", "keys": "ctrl+shift+v" },
+
+        // Press Ctrl+Shift+F to open the search box
+        { "command": "find", "keys": "ctrl+shift+f" },
+
+        // Press Alt+Shift+D to open a new pane.
+        // - "split": "auto" makes this pane open in the direction that provides the most surface area.
+        // - "splitMode": "duplicate" makes the new pane use the focused pane's profile.
+        // To learn more about panes, visit https://aka.ms/terminal-panes
+        { "command": { "action": "splitPane", "split": "auto", "splitMode": "duplicate" }, "keys": "alt+shift+d" }
+    ]
+}