diff --git a/bashrc b/bashrc
index f3fc748..7987a41 100644
--- a/bashrc
+++ b/bashrc
@@ -26,121 +26,10 @@ stty -ixon
 # Enable Vi editing mode
 set -o vi
 
-git__fetch() {
-	if [ -n "$BASH_AUTOFETCH_TIMEOUT" ]; then
-		timeout=$BASH_AUTOFETCH_TIMEOUT
-	else
-		timeout=60
-	fi
-	if [ -f $1/.git/FETCH_HEAD ]; then
-		diff=$(($(date +%s) - $(stat -c %Y $1/.git/FETCH_HEAD)))
-	else
-		diff=9999
-	fi
-	if [ $diff -gt $timeout ]
-	then run=1
-	else run=0
-	fi
-	if [ $run -gt 0 ]; then
-		touch $1/.git/FETCH_HEAD
-		nohup git fetch > /dev/null 2>&1 &
-	fi
-	echo $run
-}
-
-git__prompt () {
-	top=$(git rev-parse --show-toplevel 2>/dev/null)
-	if [ -n "$top" ]
-	then
-		if [ $BASH_AUTOFETCH -gt 0 ]; then
-			autofetch=$(git__fetch $top)
-			f=$((2-$autofetch))
-		else
-			f=3
-		fi
-		echo -ne " \033[00;3${f}mδ\033[00;33m"
-		status=`git status --short 2>/dev/null`
-		branch=`git branch | grep -Po '(?<=\* )[[:alnum:]_.-]*'`
-		modif=`echo "$status" | grep -Po '^\s*M' | wc -l`
-		untracked=`echo "$status" | grep -Po '^\?\?' | wc -l`
-		added=`echo "$status" | grep -Po '^\s*[A]' | wc -l`
-		deleted=`echo "$status" | grep -Po '^\s*[D]' | wc -l`
-		renamed=`echo "$status" | grep -Eo '^\s*R' | wc -l`
-		stat=`git branch -vv | grep -P '^\*' | grep -Po '\[.*\]'`
-		ahead=`echo $stat | grep -Po '(?<=ahead )\d*'`
-		behind=`echo $stat | grep -Po '(?<=behind )\d*'`
-		gray='\033[01;30m'
-		blue='\033[01;34m'
-		yellow='\033[01;33m'
-		red='\033[01;31m'
-		green='\033[01;32m'
-		purple='\033[01;35m'
-
-		# SYNC
-		if [ -z $ahead ] && [ -z $behind ]
-		then
-			echo -ne "" # Nothing to do here
-		elif [ -z $ahead ]
-		then
-			echo -ne " ${yellow}↓${behind}"
-		elif [ -z $behind ]
-		then
-			echo -ne " ${green}↑${ahead}"
-		else
-			echo -ne " ${red}↓${behind}${red}↑${ahead}"
-		fi
-
-		# BRANCH
-		if [ -z $branch ]
-		then
-			head=`git rev-parse --short HEAD 2>&1`
-			if [[ "$head" =~ fatal* ]]
-			then
-				branch='{no commits}'
-			else
-				branch='#'"$head"
-			fi
-		fi
-		if [ "$branch" = 'master' ]
-		then
-			echo -ne " $blue$branch"
-		elif [ "${branch:0:1}" = '#' ]
-		then
-			echo -ne " $red$branch"
-		else
-			echo -ne " $yellow$branch"
-		fi
-
-		# CHANGES
-		if [ $modif = 0 ]
-		then
-			echo -ne # "${gray}:\033[01;36m$modif" # No modified files
-		else
-			echo -ne "${gray}:\033[01;33m$modif" # Modified files
-		fi
-		if [ $added -ne 0 ]
-		then
-			echo -ne " ${green}+$added"
-		fi
-		if [ $deleted -ne 0 ]
-		then
-			echo -ne " ${red}-$deleted"
-		fi
-		if [ $renamed -ne 0 ]
-		then
-			echo -ne " ${yellow}$renamed→$renamed"
-		fi
-		if [ $untracked -ne 0 ]
-		then
-			echo -ne " ${purple}+$untracked"
-		fi
-	fi
-}
-
-PS1n='\[\033[00;34m\]┌─╼ \[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00m\]`git__prompt`
+PS1n='\[\033[00;34m\]┌─╼ \[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00m\] $(gitprompt)
 \[\033[00;34m\]└╼ \[\033[00m\]'
 
-PS1c='\[\033[00;34m\]┌─╼ \[\033[00;33m\]\$ \[\033[01;35m\]\u`git__prompt` \[\033[01;35m\]`basename \`dirs +0\`` \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00m\]
+PS1c='\[\033[00;34m\]┌─╼ \[\033[00;33m\]\$ \[\033[01;35m\]\u`gitprompt` \[\033[01;35m\]`basename \`dirs +0\`` \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00m\]
 \[\033[00;34m\]└╼ \[\033[00m\]'
 
 PS1=$PS1n
diff --git a/bin/gitprompt b/bin/gitprompt
new file mode 100755
index 0000000..d61f2d2
--- /dev/null
+++ b/bin/gitprompt
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+git__fetch() {
+	if [ -n "$BASH_AUTOFETCH_TIMEOUT" ]; then
+		timeout=$BASH_AUTOFETCH_TIMEOUT
+	else
+		timeout=60
+	fi
+	if [ -f $1/.git/FETCH_HEAD ]; then
+		diff=$(($(date +%s) - $(stat -c %Y $1/.git/FETCH_HEAD)))
+	else
+		diff=9999
+	fi
+	if [ $diff -gt $timeout ]
+	then run=1
+	else run=0
+	fi
+	if [ $run -gt 0 ]; then
+		touch $1/.git/FETCH_HEAD
+		nohup git fetch > /dev/null 2>&1 &
+	fi
+	echo $run
+}
+
+git__prompt () {
+	top=$(git rev-parse --show-toplevel 2>/dev/null)
+	if [ -n "$top" ]
+	then
+		if [ $BASH_AUTOFETCH -gt 0 ]; then
+			autofetch=$(git__fetch $top)
+			f=$((2-$autofetch))
+		else
+			f=3
+		fi
+		echo -ne "\033[00;3${f}mδ\033[00;33m"
+		status=`git status --short 2>/dev/null`
+		branch=`git branch | grep -Po '(?<=\* )[[:alnum:]_.-]*'`
+		modif=`echo "$status" | grep -Po '^\s*M' | wc -l`
+		untracked=`echo "$status" | grep -Po '^\?\?' | wc -l`
+		added=`echo "$status" | grep -Po '^\s*[A]' | wc -l`
+		deleted=`echo "$status" | grep -Po '^\s*[D]' | wc -l`
+		renamed=`echo "$status" | grep -Eo '^\s*R' | wc -l`
+		stat=`git branch -vv | grep -P '^\*' | grep -Po '\[.*\]'`
+		ahead=`echo $stat | grep -Po '(?<=ahead )\d*'`
+		behind=`echo $stat | grep -Po '(?<=behind )\d*'`
+		gray='\033[01;30m'
+		blue='\033[01;34m'
+		yellow='\033[01;33m'
+		red='\033[01;31m'
+		green='\033[01;32m'
+		purple='\033[01;35m'
+
+		# SYNC
+		if [ -z $ahead ] && [ -z $behind ]
+		then
+			echo -ne "" # Nothing to do here
+		elif [ -z $ahead ]
+		then
+			echo -ne " ${yellow}↓${behind}"
+		elif [ -z $behind ]
+		then
+			echo -ne " ${green}↑${ahead}"
+		else
+			echo -ne " ${red}↓${behind}${red}↑${ahead}"
+		fi
+
+		# BRANCH
+		if [ -z $branch ]
+		then
+			head=`git rev-parse --short HEAD 2>&1`
+			if [[ "$head" =~ fatal* ]]
+			then
+				branch='{no commits}'
+			else
+				branch='#'"$head"
+			fi
+		fi
+		if [ "$branch" = 'master' ]
+		then
+			echo -ne " $blue$branch"
+		elif [ "${branch:0:1}" = '#' ]
+		then
+			echo -ne " $red$branch"
+		else
+			echo -ne " $yellow$branch"
+		fi
+
+		# CHANGES
+		if [ $modif = 0 ]
+		then
+			echo -ne # "${gray}:\033[01;36m$modif" # No modified files
+		else
+			echo -ne "${gray}:\033[01;33m$modif" # Modified files
+		fi
+		if [ $added -ne 0 ]
+		then
+			echo -ne " ${green}+$added"
+		fi
+		if [ $deleted -ne 0 ]
+		then
+			echo -ne " ${red}-$deleted"
+		fi
+		if [ $renamed -ne 0 ]
+		then
+			echo -ne " ${yellow}$renamed→$renamed"
+		fi
+		if [ $untracked -ne 0 ]
+		then
+			echo -ne " ${purple}+$untracked"
+		fi
+	fi
+}
+
+git__prompt
+echo