diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index a3ce22a..cf66969 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -1,65 +1,111 @@
 # name: Integral
+# fork by: Froloket
+
+# Colors
+set blue (set_color blue)
+set yellow (set_color yellow)
+set normal (set_color normal)
+set green (set_color green)
+set dark_gray (set_color 222)
+
+set arrow_symbol "∫"
+
+# Overwrite mode prompt as we use another approach
+function fish_mode_prompt
+end
+
 function _git_branch_name
-  echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
+    echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
 end
 
 function _upstream_count
-  echo (command git rev-list --count --left-right origin/(_git_branch_name)...HEAD 2> /dev/null)
+    echo (command git rev-list --count --left-right origin/(_git_branch_name)...HEAD 2> /dev/null)
+end
+
+function set_arrow -a symbol
+    set arrow_symbol $symbol
 end
 
 function _git_up_info
-  if [ (_upstream_count) ]
-    set -l count (_upstream_count)
-
-    switch $count
-      case "" # no upstream
-        echo ''
-      case "0?0" # equal to upstream
-        echo ''
-      case "0??" # ahead of upstream
-        echo 'u+'(echo $count | cut -f2)
-      case "??0" # behind upstream
-        echo 'u-'(echo $count | cut -f1)
-      case '???'      # diverged from upstream
-        echo $count 'u+'(echo $count | cut -f2)'-'(echo $count | cut -f1)
-      case '*'
-        echo ''
+    if [ (_upstream_count) ]
+        set -l count (_upstream_count)
+
+        switch $count
+            case "" # no upstream
+                echo ''
+            case "0?0" # equal to upstream
+                echo ''
+            case "0??" # ahead of upstream
+                echo 'u+'(echo $count | cut -f2)
+            case "??0" # behind upstream
+                echo 'u-'(echo $count | cut -f1)
+            case '???'      # diverged from upstream
+                echo $count 'u+'(echo $count | cut -f2)'-'(echo $count | cut -f1)
+            case '*'
+                echo ''
+        end
     end
-  end
 end
 
 function _is_git_dirty
-  echo (command git status -s --ignore-submodules=dirty 2> /dev/null)
+    echo (command git status -s --ignore-submodules=dirty 2> /dev/null)
+end
+
+function charrow -a mode
+    switch $mode
+        case "default"
+            set arrow_symbol "∫"
+        case "haskell" "lambda"
+            set arrow_symbol "λ"
+        case "arrow"
+            set arrow_symbol ">"
+        case "*"
+            charrow default
+    end
 end
 
 function fish_prompt
-  set -l blue (set_color blue)
-  set -l yellow (set_color yellow)
-  set -l normal (set_color normal)
-  set -l green (set_color green)
-
-  set -l arrow "∫"
-  set -l cwd $blue(prompt_pwd)
-
-  if [ (_git_branch_name) ]
-    set -l git_branch (_git_branch_name)
-    set -l git_vs_upstream (_git_up_info)
-
-    if [ (_is_git_dirty) ]
-      set git_info $yellow'('$git_branch "±" "$git_vs_upstream"')' $normal
-    else if [ (_git_up_info) ]
-      set git_info $yellow'('$git_branch "$git_vs_upstream"')' $normal
+    if [ (prompt_pwd) != "~" ]
+        set cwd $blue(prompt_pwd) $normal
+    end
+
+    if [ (_git_branch_name) ]
+        set git_branch (_git_branch_name)
+        set git_vs_upstream (_git_up_info)
+
+        if [ (_is_git_dirty) ]
+            set git_info $yellow'('$git_branch "±" "$git_vs_upstream"')' $normal
+        else if [ (_git_up_info) ]
+            set git_info $yellow'('$git_branch "$git_vs_upstream"')' $normal
+        else
+            set git_info $green'('$git_branch')' $normal
+        end
+    end
+
+    # Set $arrow color depending on mode (when in vi mode)
+    if test "$fish_key_bindings" = fish_vi_key_bindings
+        or test "$fish_key_bindings" = fish_hybrid_key_bindings
+        switch $fish_bind_mode
+            case default
+                set arrow_color (set_color brblack)
+            case insert
+                set arrow_color (set_color brwhite)
+            case replace_one
+                set arrow_color (set_color green)
+            case replace
+                set arrow_color (set_color yellow)
+            case visual
+                set arrow_color (set_color magenta)
+        end
     else
-      set git_info $green'('$git_branch')' $normal
+        set arrow_color $normal
     end
-  end
 
-  echo -n -s $cwd' '"$git_info" $normal $arrow ' '
+    set arrow $arrow_color$arrow_symbol$normal
+
+    printf " $cwd$git_info$arrow "
 end
 
 function fish_right_prompt
-  set -l dark_gray (set_color 222)
-
-  echo -n -s $dark_gray ' ['(date +%H:%M:%S)'] '
-
+    echo -n -s $dark_gray ' ['(date +%H:%M:%S)'] ' $normal
 end