1 files changed, 6 insertions, 4 deletions
diff --git a/js/color.js b/js/color.js
index 42ae6b0..738ad02 100644
--- a/js/color.js
+++ b/js/color.js
@@ -1,13 +1,14 @@
 
 var color_names = ("white black dark-blue green red dark-red purple orange " +
                    "yellow lime dark-cyan cyan blue magenta dark-gray light-gray").split(" ");
-var color_hue_order = ("black dark-blue purple dark-red red orange " +
-                       "yellow lime green dark-cyan cyan blue magenta dark-gray light-gray white").split(" ");
+var all_color_hue_order = ("black dark-blue purple dark-red red orange " +
+                           "yellow lime green dark-cyan cyan blue magenta dark-gray light-gray white").split(" ");
+var color_hue_order = "dark-red red orange yellow lime cyan dark-cyan blue dark-blue purple magenta".split(" ");
 var gray_names = ("black dark-gray light-gray white").split(" ")
 
 var fire_names = ("black dark-red red orange yellow white cyan").split(" ")
 var red_names = ("black dark-red red").split(" ")
-var yellow_names = ("orange yellow cyan white").split(" ")
+var yellow_names = ("black orange yellow white").split(" ")
 var green_names = ("dark-cyan green lime").split(" ")
 var blue_names = ("black dark-blue blue").split(" ")
 var purple_names = ("dark-blue purple magenta red").split(" ")
@@ -17,7 +18,8 @@ var colors = {}
 color_names.forEach(function(name, i){ colors[name] = i })
 
 
-function hue (n) { return colors[color_hue_order[mod(n, 16)|0]] }
+function all_hue (n) { return colors[color_hue_order[mod(n, 16)|0]] }
+function hue (n) { return colors[color_hue_order[mod(n, 11)|0]] }
 function gray (n) { return colors[gray_names[mod(n, 4)|0]] }
 function fire (n) { return colors[fire_names[mod(n, 7)|0]] }
 function red (n) { return colors[red_names[mod(n, 3)|0]] }