diff --git a/gitprompt.fish b/gitprompt.fish
index d50ffb6..6a34f63 100644
--- a/gitprompt.fish
+++ b/gitprompt.fish
@@ -22,7 +22,7 @@ set IBlack (set_color -o black)        # Black
 set Magenta (set_color -o purple)      # Purple
 
 # Various variables you might want for your PS1 prompt instead
-set Time (date +%X)
+set Time (date +%R)
 
 # Default values for the appearance of the prompt. Configure at will.
 set GIT_PROMPT_PREFIX "["
@@ -32,13 +32,13 @@ set GIT_PROMPT_BRANCH "$Magenta"
 set GIT_PROMPT_STAGED "$Red}● "
 set GIT_PROMPT_CONFLICTS "$Red✖ "
 set GIT_PROMPT_CHANGED "$Blue✚ "
-set GIT_PROMPT_REMOTE " "
+set GIT_PROMPT_REMOTE ""
 set GIT_PROMPT_UNTRACKED "…"
 set GIT_PROMPT_CLEAN "$BGreen✔"
 
 #Not applied two lines conention from https://github.com/magicmonty/bash-git-prompt/pull/5/files
 
-set PROMPT_END " \n$WHITE$Time$ResetColor \$ "
+set PROMPT_END " \n$WHITE$Time$ResetColor  \$ "
 
 function fish_prompt
     set -e __CURRENT_GIT_STATUS
@@ -53,7 +53,7 @@ function fish_prompt
 
     if not test "0" -eq $__CURRENT_GIT_STATUS_PARAM_COUNT
         set GIT_BRANCH $__CURRENT_GIT_STATUS[1]
-        set GIT_REMOTE "$__CURRENT_GIT_STATUS[2]"
+        set GIT_REMOTE "$GIT_PROMPT_REMOTE$__CURRENT_GIT_STATUS[2]"
         if [ "." = "$GIT_REMOTE" ]
             set -e GIT_REMOTE
         end
@@ -67,8 +67,8 @@ function fish_prompt
 	if test -n "$__CURRENT_GIT_STATUS"
         set STATUS " $GIT_PROMPT_PREFIX$GIT_PROMPT_BRANCH$GIT_BRANCH$ResetColor"
 
-        if test -n $GIT_REMOTE
-            set STATUS "$STATUS$GIT_PROMPT_REMOTE$GIT_REMOTE$ResetColor"
+        if set -q $GIT_REMOTE
+            set STATUS "$STATUS$GIT_REMOTE$ResetColor"
         end
 
         set STATUS "$STATUS$GIT_PROMPT_SEPARATOR"
@@ -95,9 +95,9 @@ function fish_prompt
 
         set STATUS "$STATUS$ResetColor$GIT_PROMPT_SUFFIX"
 
-        set PS1 "$PROMPT_START"(prompt_pwd)"$STATUS$PROMPT_END"
+        set PS1 "$PROMPT_START"(pwd|sed "s=$HOME=~=")"$STATUS$PROMPT_END"
 	else
-        set PS1 "$PROMPT_START"(prompt_pwd)"$ResetColor$PROMPT_END"
+        set PS1 "$PROMPT_START"(pwd|sed "s=$HOME=~=")"$ResetColor$PROMPT_END"
 	end
     echo -e $PS1
 end