diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d1e3917..3b90d75 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -144,5 +144,6 @@ source "$DOTFILES/aliases"
 # Load some manual plugins
 source "$ZSH_DIR/plugins/sudo.zsh"
 source "$ZSH_DIR/plugins/fish-theme.zsh"
+source "$ZSH_DIR/plugins/git-rprompt.zsh"
 [ -f '/usr/share/fzf/key-bindings.zsh' ] && source /usr/share/fzf/key-bindings.zsh
 [ -f '/usr/share/doc/pkgfile/command-not-found.zsh' ] && source /usr/share/doc/pkgfile/command-not-found.zsh
diff --git a/.config/zsh/plugins/fish-theme.zsh b/.config/zsh/plugins/fish-theme.zsh
index fa94787..5a5570f 100644
--- a/.config/zsh/plugins/fish-theme.zsh
+++ b/.config/zsh/plugins/fish-theme.zsh
@@ -4,57 +4,6 @@ _fishy_collapsed_wd() {
     pwd | sed -E 's|^'$HOME'|~|;s|(.*)/|\1%|;s|((^\|/)\.?[^/%]{1})[^/%]*|\1|g;s|(.*)%|\1/|'
 }
 
-git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
-git_prompt_status() {
-    # Get the status of the working tree
-    INDEX=$(command git status --porcelain -b 2> /dev/null)
-    STATUS=""
-    if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-    elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-    elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-    elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-    elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-    elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-    fi
-    if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-    fi
-    if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-    fi
-    echo $STATUS
-}
-
 # Required for dynamic prompt
 setopt prompt_subst
 
@@ -63,16 +12,4 @@ PROMPT="%n@%m %F{$user_color}\$(_fishy_collapsed_wd)%f%(!.#.>) "
 PROMPT2='%F{red}\ %f'
 
 local return_status="%F{red}%(?..%?)%f"
-RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
-
-ZSH_THEME_GIT_PROMPT_PREFIX=" "
-ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY=""
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"
+RPROMPT='${return_status}%{$reset_color%}'
diff --git a/.config/zsh/plugins/git-rprompt.zsh b/.config/zsh/plugins/git-rprompt.zsh
new file mode 100644
index 0000000..47a544c
--- /dev/null
+++ b/.config/zsh/plugins/git-rprompt.zsh
@@ -0,0 +1,69 @@
+# ZSH RPROMPT containing simple Git status
+
+git_prompt_info() {
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+git_prompt_status() {
+    # Get the status of the working tree
+    INDEX=$(command git status --porcelain -b 2> /dev/null)
+    STATUS=""
+    if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+    elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+    elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+    elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+    elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+    elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+    fi
+    if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
+    fi
+    if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
+      STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
+    fi
+    echo $STATUS
+}
+
+# Required for dynamic prompt
+setopt prompt_subst
+
+RPROMPT="$RPROMPT"'$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" "
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"