1 files changed, 22 insertions, 14 deletions

diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
index 22f4f3233..8824a8b50 100644
--- a/lib/puppet/util/log.rb
+++ b/lib/puppet/util/log.rb
@@ -244,23 +244,31 @@ class Puppet::Util::Log
     newdesttype :console do
                 
         
-        PINK = {:console => "", :html => "FFA0A0"}
-        GREEN = {:console => "", :html => "00CD00"}
-        YELLOW = {:console => "", :html => "FFFF60"}
-        SLATE = {:console => "", :html => "80A0FF"}
-        ORANGE = {:console => "", :html => "FFA500"}
-        BLUE = {:console => "", :html => "40FFFF"}
-        RESET = {:console => "", :html => ""}
+        RED 	= {:console => "", :html => "FFA0A0"}
+        GREEN 	= {:console => "", :html => "00CD00"}
+        YELLOW 	= {:console => "", :html => "FFFF60"}
+        BLUE 	= {:console => "", :html => "80A0FF"}
+        PURPLE 	= {:console => "", :html => "FFA500"}
+        CYAN 	= {:console => "", :html => "40FFFF"}
+        WHITE	= {:console => "", :html => "FFFFFF"}
+        HRED	= {:console => "", :html => "FFA0A0"}
+        HGREEN 	= {:console => "", :html => "00CD00"}
+        HYELLOW	= {:console => "", :html => "FFFF60"}
+        HBLUE 	= {:console => "", :html => "80A0FF"}
+        HPURPLE	= {:console => "", :html => "FFA500"}
+        HCYAN 	= {:console => "", :html => "40FFFF"}
+        HWHITE	= {:console => "", :html => "FFFFFF"}
+        RESET 	= {:console => "", :html => ""}
 
         @@colormap = {
-            :debug => SLATE,
+            :debug => WHITE,
             :info => GREEN,
-            :notice => PINK,
-            :warning => ORANGE,
-            :err => YELLOW,
-            :alert => BLUE,
-            :emerg => RESET,
-            :crit => RESET
+            :notice => CYAN,
+            :warning => YELLOW,
+            :err => HPURPLE,
+            :alert => RED,
+            :emerg => HRED,
+            :crit => HRED
         }
         
         def colorize(level, str)