diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 6e706f82b6..51bb84c527 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -38,7 +38,7 @@
 
 #include <map>
 #include <set>
-#include <unistd.h>
+//#include <unistd.h> AO: Breaks win32 at the moment
 
 namespace LLAvatarNameCache
 {
diff --git a/indra/newview/skins/metaharper/colors.xml b/indra/newview/skins/metaharper/colors.xml
index c21da8891e..aabc291eb2 100644
--- a/indra/newview/skins/metaharper/colors.xml
+++ b/indra/newview/skins/metaharper/colors.xml
@@ -9,7 +9,9 @@
    var. 4 = #A96641 = rgb(169,102,65) 0.66 0.40 0.25
    var. 5 = #AB7B61 = rgb(171,123,97) 0.76 0.58 0.49
 
-	-->
+	-->
+
+	 
 	<color
 	 name="AccentColor"
 	 value="0.75 0.92 0.49 1.0" />
@@ -220,7 +222,17 @@
      value="0.92 0.92 1 0.78" />
     <color
      name="TextFgColor"
-     value="0.102 0.102 0.102 1" />
+     value="0.102 0.102 0.102 1" />
+     
+	<color
+	 name="HintTitle"
+	 value="EmphasisColor" />
+	<color
+	 name="HintText"
+	 value="SchemeLightest" />
+	<color
+	 name="HintBg"
+	 value="SL-Background" />
 
     <color
      name="ChicletFlashColor"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_hint.xml b/indra/newview/skins/metaharper/xui/en/panel_hint.xml
index e2e9d0aef0..6a38d7b8f6 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_hint.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_hint.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  width="205"
+ background_visible="true"
+ background_opaque="false"
+ bg_alpha_color="DkGray"
  height="100">
   <text name="hint_title"
         font="SansSerifMedium" 
@@ -9,7 +12,7 @@
         top="8"
         bottom="20"
         follows="left|right|top"
-        text_color="Black"
+        text_color="White"
         wrap="false"/>
   <text name="hint_text"
         left="8"
@@ -17,7 +20,7 @@
         top="26"
         bottom="92"
         follows="all" 
-        text_color="Black"
+        text_color="HintText"
         wrap="true"/>
   <button right="197" 
           top="8"