From b137eb1bdcb72502b060f56c7d39da6d481030c5 Mon Sep 17 00:00:00 2001
From: LambdaLord <kaminskybenj@gmail.com>
Date: Wed, 2 Mar 2016 05:23:45 +0000
Subject: [PATCH 1/4] Replace some constants with existing greys

---
 fish_prompt.fish | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index 3def47e..b421115 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -318,7 +318,7 @@ function __bobthefish_prompt_hg -S -a current_dir -d 'Display the actual hg stat
   set -l project_pwd  (__bobthefish_project_pwd $current_dir)
   if [ "$project_pwd" ]
     if [ -w "$PWD" ]
-      __bobthefish_start_segment 333 999
+      __bobthefish_start_segment $__bobthefish_dk_grey $__bobthefish_med_grey
     else
       __bobthefish_start_segment $__bobthefish_med_red $__bobthefish_lt_red
     end
@@ -368,7 +368,7 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
   set -l project_pwd (__bobthefish_project_pwd $current_dir)
   if [ "$project_pwd" ]
     if [ -w "$PWD" ]
-      __bobthefish_start_segment 333 999
+      __bobthefish_start_segment $__bobthefish_dk_grey $__bobthefish_med_grey
     else
       __bobthefish_start_segment $__bobthefish_med_red $__bobthefish_lt_red
     end

From 10170cb8565f9e6bbb5b113dee81f7922384e2c6 Mon Sep 17 00:00:00 2001
From: LambdaLord <kaminskybenj@gmail.com>
Date: Wed, 2 Mar 2016 05:44:05 +0000
Subject: [PATCH 2/4] Replaced some color values with new variable

---
 fish_prompt.fish | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index b421115..820d234 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -167,7 +167,7 @@ function __bobthefish_path_segment -S -a current_dir -d 'Display a shortened for
   end
 
   [ "$parent" ]; and echo -n -s "$parent"
-  set_color fff --bold
+  set_color $__bobthefish_dk_blue --bold
   echo -n "$directory "
   set_color normal
 end
@@ -222,7 +222,7 @@ function __bobthefish_prompt_vagrant_vbox -S -d 'Display VirtualBox Vagrant stat
   end
   [ -z "$vagrant_status"]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant fff --bold
+  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_dk_blue --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -238,7 +238,7 @@ function __bobthefish_prompt_vagrant_vmware -S -d 'Display VMWare Vagrant status
   end
   [ -z "$vagrant_status" ]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant fff --bold
+  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_dk_blue --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -264,7 +264,7 @@ function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a
   end
 
   if [ "$nonzero" -o "$superuser" -o "$bg_jobs" ]
-    __bobthefish_start_segment fff 000
+    __bobthefish_start_segment $__bobthefish_dk_blue 000
     if [ "$nonzero" ]
       set_color $__bobthefish_med_red --bold
       echo -n $__bobthefish_nonzero_exit_glyph
@@ -303,7 +303,7 @@ function __bobthefish_prompt_hg -S -a current_dir -d 'Display the actual hg stat
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg fff
+    set flag_fg $__bobthefish_dk_blue
   end
 
   __bobthefish_path_segment $current_dir
@@ -353,7 +353,7 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" -o "$staged" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg fff
+    set flag_fg $__bobthefish_dk_blue
   else if [ "$stashed" ]
     set flag_bg $__bobthefish_lt_orange
     set flag_fg $__bobthefish_dk_orange
@@ -534,6 +534,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
 
   set -l __bobthefish_slate_blue 255e87
   set -l __bobthefish_med_blue   005faf
+  set -l __bobthefish_dk_blue   fff
 
   set -l __bobthefish_lt_orange  f6b117
   set -l __bobthefish_dk_orange  3a2a03

From ed0eb02dfbf57e48ceab911bc9baaa4f9b34af25 Mon Sep 17 00:00:00 2001
From: LambdaLord <kaminskybenj@gmail.com>
Date: Wed, 2 Mar 2016 06:04:16 +0000
Subject: [PATCH 3/4] Quick rename for new variable

---
 fish_prompt.fish | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index 820d234..11e09c2 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -167,7 +167,7 @@ function __bobthefish_path_segment -S -a current_dir -d 'Display a shortened for
   end
 
   [ "$parent" ]; and echo -n -s "$parent"
-  set_color $__bobthefish_dk_blue --bold
+  set_color $__bobthefish_blue --bold
   echo -n "$directory "
   set_color normal
 end
@@ -222,7 +222,7 @@ function __bobthefish_prompt_vagrant_vbox -S -d 'Display VirtualBox Vagrant stat
   end
   [ -z "$vagrant_status"]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_dk_blue --bold
+  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_blue --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -238,7 +238,7 @@ function __bobthefish_prompt_vagrant_vmware -S -d 'Display VMWare Vagrant status
   end
   [ -z "$vagrant_status" ]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_dk_blue --bold
+  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_blue --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -264,7 +264,7 @@ function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a
   end
 
   if [ "$nonzero" -o "$superuser" -o "$bg_jobs" ]
-    __bobthefish_start_segment $__bobthefish_dk_blue 000
+    __bobthefish_start_segment $__bobthefish_blue 000
     if [ "$nonzero" ]
       set_color $__bobthefish_med_red --bold
       echo -n $__bobthefish_nonzero_exit_glyph
@@ -303,7 +303,7 @@ function __bobthefish_prompt_hg -S -a current_dir -d 'Display the actual hg stat
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg $__bobthefish_dk_blue
+    set flag_fg $__bobthefish_blue
   end
 
   __bobthefish_path_segment $current_dir
@@ -353,7 +353,7 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" -o "$staged" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg $__bobthefish_dk_blue
+    set flag_fg $__bobthefish_blue
   else if [ "$stashed" ]
     set flag_bg $__bobthefish_lt_orange
     set flag_fg $__bobthefish_dk_orange
@@ -534,7 +534,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
 
   set -l __bobthefish_slate_blue 255e87
   set -l __bobthefish_med_blue   005faf
-  set -l __bobthefish_dk_blue   fff
+  set -l __bobthefish_blue   fff
 
   set -l __bobthefish_lt_orange  f6b117
   set -l __bobthefish_dk_orange  3a2a03

From 7c493243819df61019bf9271401cfa7b46917f43 Mon Sep 17 00:00:00 2001
From: LambdaLord <kaminskybenj@gmail.com>
Date: Wed, 2 Mar 2016 06:39:59 +0000
Subject: [PATCH 4/4] Revert unnecessary name change

---
 fish_prompt.fish | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index 11e09c2..b421115 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -167,7 +167,7 @@ function __bobthefish_path_segment -S -a current_dir -d 'Display a shortened for
   end
 
   [ "$parent" ]; and echo -n -s "$parent"
-  set_color $__bobthefish_blue --bold
+  set_color fff --bold
   echo -n "$directory "
   set_color normal
 end
@@ -222,7 +222,7 @@ function __bobthefish_prompt_vagrant_vbox -S -d 'Display VirtualBox Vagrant stat
   end
   [ -z "$vagrant_status"]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_blue --bold
+  __bobthefish_start_segment $__bobthefish_vagrant fff --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -238,7 +238,7 @@ function __bobthefish_prompt_vagrant_vmware -S -d 'Display VMWare Vagrant status
   end
   [ -z "$vagrant_status" ]; and return
 
-  __bobthefish_start_segment $__bobthefish_vagrant $__bobthefish_blue --bold
+  __bobthefish_start_segment $__bobthefish_vagrant fff --bold
   echo -n -s "$vagrant_status "
   set_color normal
 end
@@ -264,7 +264,7 @@ function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a
   end
 
   if [ "$nonzero" -o "$superuser" -o "$bg_jobs" ]
-    __bobthefish_start_segment $__bobthefish_blue 000
+    __bobthefish_start_segment fff 000
     if [ "$nonzero" ]
       set_color $__bobthefish_med_red --bold
       echo -n $__bobthefish_nonzero_exit_glyph
@@ -303,7 +303,7 @@ function __bobthefish_prompt_hg -S -a current_dir -d 'Display the actual hg stat
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg $__bobthefish_blue
+    set flag_fg fff
   end
 
   __bobthefish_path_segment $current_dir
@@ -353,7 +353,7 @@ function __bobthefish_prompt_git -S -a current_dir -d 'Display the actual git st
   set -l flag_fg $__bobthefish_dk_green
   if [ "$dirty" -o "$staged" ]
     set flag_bg $__bobthefish_med_red
-    set flag_fg $__bobthefish_blue
+    set flag_fg fff
   else if [ "$stashed" ]
     set flag_bg $__bobthefish_lt_orange
     set flag_fg $__bobthefish_dk_orange
@@ -534,7 +534,6 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
 
   set -l __bobthefish_slate_blue 255e87
   set -l __bobthefish_med_blue   005faf
-  set -l __bobthefish_blue   fff
 
   set -l __bobthefish_lt_orange  f6b117
   set -l __bobthefish_dk_orange  3a2a03