diff --git a/home/user/.config/git/config b/home/user/.config/git/config
index 3bbc833..b126563 100644
--- a/home/user/.config/git/config
+++ b/home/user/.config/git/config
@@ -1,6 +1,7 @@
 [core]
     excludesfile = ~/.config/git/ignore
-    editor = nvim
+    editor = $EDITOR
+    pager = $PAGER
     fileMode = false
     hooksPath = ~/.config/git/hooks
 
@@ -22,9 +23,9 @@
     ui = auto
 
 [alias]
-    a = "!git status --short | peco | awk '{print $2}' | xargs git add"
-    d = "!git diff --color=always | $PAGER"
-    ds = "!git diff --staged --color=always | $PAGER"
+    a = "!git status --short | fzf | awk '{print $2}' | xargs git add"
+    d = "!git diff --color=always | bash -c \"$PAGER\""
+    ds = "!git diff --staged --color=always | bash -c \"$PAGER\""
     dno = diff --name-only
     co = checkout
     ci = commit
diff --git a/home/user/.subbash/export b/home/user/.subbash/export
index ee7bd36..b61e6b7 100644
--- a/home/user/.subbash/export
+++ b/home/user/.subbash/export
@@ -3,7 +3,7 @@ umask 022
 
 export EDITOR="nvim"
 export VISUAL="nvim"
-export PAGER="less -R"
+export PAGER="less -niSR"
 export CDPATH=:~:~/code
 
 export HISTSIZE=10000
diff --git a/home/user/.subzsh/aliases b/home/user/.subzsh/aliases
index 600af83..452e129 100644
--- a/home/user/.subzsh/aliases
+++ b/home/user/.subzsh/aliases
@@ -1,4 +1,4 @@
-alias -g L="| less -R"
+alias -g L='| bash -c "$PAGER"'
 alias -g HL='| highlight -O ansi -S '
 alias -g CL=" --color=always | less -R"
 alias -g OUT="1>/dev/null"  # stdOUT