diff --git a/bash/.bashrc b/bash/.bashrc
index a837c44..9c954f7 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -87,10 +87,38 @@ fi
 # fedoras stupid command-not-found shit
 unset command_not_found_handle
 
+
 if [ -f /usr/share/fzf/shell/key-bindings.bash ]; then
     source /usr/share/fzf/shell/key-bindings.bash
 fi
 
+n ()
+{
+    # Block nesting of nnn in subshells
+    if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then
+        echo "nnn is already running"
+        return
+    fi
+
+    # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set)
+    # To cd on quit only on ^G, remove the "export" as in:
+    #     NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+    # NOTE: NNN_TMPFILE is fixed, should not be modified
+    export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+
+    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+    # stty start undef
+    # stty stop undef
+    # stty lwrap undef
+    # stty lnext undef
+
+    nnn "$@"
+
+    if [ -f "$NNN_TMPFILE" ]; then
+            . "$NNN_TMPFILE"
+            rm -f "$NNN_TMPFILE" > /dev/null
+    fi
+}
 
 ex() {
     local c e i
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 9a9777b..3e43ffe 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -73,8 +73,10 @@ set-option -g status-right-length 40
 set-option -g status-right " #[fg=brightwhite,bg=black] %a, %d %b %H:%M #[fg=colour18,bg=colour4] #(whoami)@#h "
 
 # Pane border
-set-option -g pane-border-style bg=brightblack,fg=brightblack
-set-option -g pane-active-border-style bg=default,fg=white
+#set-option -g pane-border-style bg=brightblack,fg=brightblack
+set-option -g pane-border-style fg=colour238,bg=default
+#set-option -g pane-active-border-style bg=default,fg=white
+set-option -g pane-active-border-style fg=colour4,bg=default
 
 # Pane number indicator
 set-option -g display-panes-colour brightblack