diff --git a/indra/newview/skins/starlight/colors.xml b/indra/newview/skins/starlight/colors.xml
index cf753f9481..9ca9033aa7 100644
--- a/indra/newview/skins/starlight/colors.xml
+++ b/indra/newview/skins/starlight/colors.xml
@@ -390,13 +390,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -432,34 +432,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -480,10 +480,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -598,15 +598,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -769,6 +760,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -868,6 +862,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -944,7 +941,16 @@
 	 name="AvatarListItemBeyondShoutRange"
 	 reference="LtYellow" />
 	 
-    <!-- Colours for Firestorm - same for all themes -->	
+    <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />	
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />		
@@ -972,6 +978,15 @@
     <color
      name="ObjectIMColor"
      reference="EmphasisColor" />
+    <color
+     name="NameTagChatDistanceColor"
+     reference="Green" />
+    <color
+     name="NameTagShoutDistanceColor"
+     reference="Yellow" />
+    <color
+     name="NameTagBeyondShoutDistanceColor"
+     reference="BrightRed" />
 	 
     <!-- for FS legacy profiles -->
     <color
diff --git a/indra/newview/skins/starlight/themes/mono_teal/colors.xml b/indra/newview/skins/starlight/themes/mono_teal/colors.xml
index ad4a3cc383..a74c720fff 100644
--- a/indra/newview/skins/starlight/themes/mono_teal/colors.xml
+++ b/indra/newview/skins/starlight/themes/mono_teal/colors.xml
@@ -391,13 +391,13 @@
      reference="White_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -433,34 +433,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -481,10 +481,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -599,15 +599,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -770,6 +761,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -869,6 +863,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -946,6 +943,15 @@
 	 reference="Red" />
 	 
     <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />	
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
index de3a04c8f5..c9e0125249 100644
--- a/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/nostalgia_blue/colors.xml
@@ -390,13 +390,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -432,34 +432,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -480,10 +480,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -598,15 +598,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -769,6 +760,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -868,6 +862,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -945,7 +942,16 @@
 	 name="AvatarListItemBeyondShoutRange"
 	 reference="LtYellow" />
 	 
-    <!-- Colours for Firestorm - same for all themes -->	
+    <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />	
diff --git a/indra/newview/skins/starlight/themes/original_orange/colors.xml b/indra/newview/skins/starlight/themes/original_orange/colors.xml
index a0a64bb4b6..9ca9033aa7 100644
--- a/indra/newview/skins/starlight/themes/original_orange/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_orange/colors.xml
@@ -390,13 +390,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -432,34 +432,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -480,10 +480,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -598,15 +598,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -769,6 +760,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -868,6 +862,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -944,7 +941,16 @@
 	 name="AvatarListItemBeyondShoutRange"
 	 reference="LtYellow" />
 	 
-    <!-- Colours for Firestorm - same for all themes -->	
+    <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />	
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />		
diff --git a/indra/newview/skins/starlight/themes/original_teal/colors.xml b/indra/newview/skins/starlight/themes/original_teal/colors.xml
index 4c1663c12e..5d6ea54857 100644
--- a/indra/newview/skins/starlight/themes/original_teal/colors.xml
+++ b/indra/newview/skins/starlight/themes/original_teal/colors.xml
@@ -390,13 +390,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -432,34 +432,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -480,10 +480,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -598,15 +598,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -769,6 +760,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -868,6 +862,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -928,7 +925,7 @@
     name="blue"
     value="0 0 1 1"/>
 		    
-   <!-- Colours for Firestorm - change for each theme as necessary -->	
+   <!-- Colours for Firestorm - change for each theme as necessary -->
 	<color
      name="ScriptDialog"
      reference="Black" />
@@ -945,7 +942,16 @@
 	 name="AvatarListItemBeyondShoutRange"
 	 reference="LtYellow" />
 	 
-    <!-- Colours for Firestorm - same for all themes -->	 
+    <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />	
 	<color
      name="SchemeLightest"
      reference="EmphasisColor" />
diff --git a/indra/newview/skins/starlight/themes/silver_blue/colors.xml b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
index a7f9d82e3d..4a0a7d974d 100644
--- a/indra/newview/skins/starlight/themes/silver_blue/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_blue/colors.xml
@@ -392,13 +392,13 @@
      reference="White_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -434,34 +434,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -482,10 +482,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -600,15 +600,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -771,6 +762,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -870,6 +864,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -947,6 +944,15 @@
 	 reference="Red" />
 	 
     <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />	
diff --git a/indra/newview/skins/starlight/themes/silver_pink/colors.xml b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
index c68f40c527..2e017cdbf6 100644
--- a/indra/newview/skins/starlight/themes/silver_pink/colors.xml
+++ b/indra/newview/skins/starlight/themes/silver_pink/colors.xml
@@ -392,13 +392,13 @@
      reference="White_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -434,34 +434,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -482,10 +482,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -600,15 +600,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -771,6 +762,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -870,6 +864,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -947,6 +944,15 @@
 	 reference="Red" />
 	 
     <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />	
diff --git a/indra/newview/skins/starlightcui/colors.xml b/indra/newview/skins/starlightcui/colors.xml
index cf753f9481..75f9ac2b6f 100644
--- a/indra/newview/skins/starlightcui/colors.xml
+++ b/indra/newview/skins/starlightcui/colors.xml
@@ -4,13 +4,13 @@
 	<!-- Named Colors -->
 	<color
 	 name="EmphasisColor"
-	 value="1.00 0.549 0.267 1" />
+	 value="1 1 1 1" />
 	<color
 	 name="EmphasisColor_13"
-	 value="1.00 0.549 0.267 0.13" />
+	 value="1 1 1 0.13" />
 	<color
 	 name="EmphasisColor_35"
-	 value="1.00 0.549 0.267 0.35" />
+	 value="1 1 1 0.35" />
 	<color
 	 name="White"
 	 value="1 1 1 1" />
@@ -107,18 +107,38 @@
 	<color
 	name="LtOrange"
 	value="1 .85 .73 1" />
-
-  <!-- Skin and Theme Colors -->
-
-      <color
-	 name="SL-White"
+	
+  <!-- Customisable StarLight Colors -->	
+	<color
+	 name="SL-CustomMain"
+	 value="0.38 0.694 0.573 1" />
+    <color
+	 name="SL-ButtonNormal"
 	 value="1 1 1 1" />
-      <color
-	 name="SL-Black"
-	 value="0 0 0 1" />
+    <color
+	 name="SL-EmphasisColor"
+	 value="0.7 0.7 0.7 1" /> 
 	<color
 	 name="SL-Normal"
-	 value="0.25 0.100 0.225 1" />
+	 value="0 0 0 1" />
+	<color
+	 name="SL-ButtonSelect"
+	 value="1 1 1 1" />
+	<color
+	 name="SL-CustomBackground"
+	 value="0.125 0.125 0.125 1" />
+	<color
+	 name="SL-CustomBackground_Light"
+	 value="0.125 0.125 0.125 1" />
+	 
+  <!-- Skin and Theme Colors -->
+
+	<color
+	 name="SL-White"
+	 value="1 1 1 1" />
+	<color
+	 name="SL-Black"
+	 value="0 0 0 1" />
 	<color
 	 name="SL-Dark"
 	 value="0.150 0.70 0.290 1" />
@@ -139,13 +159,13 @@
 	 value="0.125 0.125 0.125 0.86" />
 	<color
 	 name="SL-Foreground"
-	 value="0.375 0.120 0.400 1" />
+	 value="1 1 1 1" />
 	<color
 	 name="SL-Foreground_50"
-	 value="0.375 0.120 0.400 0.50" />
+	 value="1 1 1 0.50" />
 	<color
 	 name="SL-Foreground_66"
-	 value="0.375 0.120 0.400 0.66" />
+	 value="1 1 1 0.66" />
 	<color
 	 name="SL-Silver"
 	 value="0.75 0.75 0.75 1" />
@@ -219,7 +239,7 @@
 
     <color
      name="ChicletFlashColor"
-     reference="EmphasisColor" />
+     value="0.114 0.65 0.1" />
     <color
      name="GroupNotifyBoxColor"
      value="0.3344 0.5456 0.5159 1" />
@@ -313,7 +333,7 @@
     <color
      name="AgentLinkColor"
      reference="White" />
-    <color
+	 <color
      name="AvatarListItemIconDefaultColor"
      reference="SL-White" />
     <color
@@ -381,7 +401,7 @@
      reference="Unused?" />
     <color
      name="ChatHistoryBgColor"
-     reference="DkGray_66" />
+     reference="FloaterFocusBackgroundColor" />
     <color
      name="ChatHistoryTextColor"
      reference="LtGray" />
@@ -390,13 +410,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -432,34 +452,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -480,10 +500,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -492,7 +512,7 @@
      reference="Black" />
     <color
      name="ContextSilhouetteColor"
-     reference="EmphasisColor" />
+     reference="Yellow" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -552,7 +572,7 @@
      reference="DkGray" />
     <color
      name="HTMLLinkColor"
-     reference="EmphasisColor" />
+     value="0.38 0.694 0.573 1" />
     <color
      name="HealthTextColor"
      reference="White" />
@@ -598,15 +618,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="White" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -672,13 +683,13 @@
      reference="BrickBrown" />
     <color
      name="MenuBarBgColor"
-     reference="DkGray" />
+     reference="SL-CustomBackground" />
     <color
      name="MenuBarGodBgColor"
      reference="FrogGreen" />
     <color
      name="MenuDefaultBgColor"
-     reference="DkGray2" />
+     reference="SL-CustomBackground" />
     <color
      name="MenuItemDisabledColor"
 	 reference="LtGray_50" />
@@ -687,16 +698,16 @@
      reference="LtGray" />
     <color
      name="MenuItemHighlightBgColor"
-     reference="EmphasisColor_35" />
+     reference="White_25" />
     <color
      name="MenuItemHighlightFgColor"
-     reference="White" />
+     reference="EmphasisColor" />
     <color
      name="MenuNonProductionBgColor"
-     reference="Black" />
+     reference="SL-CustomBackground" />
     <color
      name="MenuPopupBgColor"
-	 reference="DkGray2" />
+	 reference="SL-CustomBackground" />
 	<color
      name="ModelUploaderLabels"
      value="1 0.6 0 1" />
@@ -756,7 +767,7 @@
      reference="DkGray_66" />
     <color
      name="ObjectChatColor"
-     reference="EmphasisColor" />
+     value="0.38 0.694 0.573 1" />
     <color
      name="OverdrivenColor"
      reference="Red" />
@@ -769,6 +780,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -795,10 +809,10 @@
      reference="Unused?" />
     <color
      name="ScrollHoveredColor"
-     reference="EmphasisColor_13" />
+     reference="LtGray_35" />
     <color
      name="ScrollSelectedBGColor"
-     reference="EmphasisColor_35" />
+     reference="LtGray_50" />
     <color
      name="ScrollSelectedFGColor"
      reference="White" />
@@ -825,10 +839,10 @@
      reference="White_25" />
     <color
      name="SliderThumbCenterColor"
-     reference="White" />
+     reference="SL-CustomMain" />
     <color
      name="SliderThumbOutlineColor"
-     reference="White" />
+     reference="SL-CustomMain" />
     <color
      name="SliderTrackColor"
      reference="Unused?" />
@@ -868,6 +882,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -905,10 +922,11 @@
       value="0.2 0.8 1 1"/>
     <color
      name="DirectChatColor"
-     reference="LtOrange" /> 
+     reference="LtOrange" />
 	<color
      name="ToolbarDropZoneColor"
      value=".48 .69 1 .5" />
+  
 	    
     <!-- Generic colour names (legacy) -->
   <color
@@ -927,16 +945,16 @@
     name="blue"
     value="0 0 1 1"/>
 		    
-    <!-- Colours for Firestorm - change for each theme as necessary -->	
+   <!-- Colours for Firestorm - change for each theme as necessary -->	
 	<color
      name="ScriptDialog"
-     value="0.81 0.325 0 1" />
+     reference="Black" />
     <color
      name="ScriptDialogFg"
      reference="White" />
     <color
      name="AlertTextColor"
-     reference="LtOrange" />
+     reference="White" />
 	<color
 	 name="AvatarListItemShoutRange"
 	 reference="Lime" />
@@ -944,10 +962,19 @@
 	 name="AvatarListItemBeyondShoutRange"
 	 reference="LtYellow" />
 	 
-    <!-- Colours for Firestorm - same for all themes -->	
+    <!-- Colours for Firestorm - same for all themes -->	 
     <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
+	<color
      name="SchemeLightest"
-     reference="EmphasisColor" />		
+     reference="EmphasisColor" />
 	<color
 	 name="HintTitle"
 	 reference="EmphasisColor" />
@@ -972,7 +999,16 @@
     <color
      name="ObjectIMColor"
      reference="EmphasisColor" />
-	 
+    <color
+     name="NameTagChatDistanceColor"
+     reference="Green" />
+    <color
+     name="NameTagShoutDistanceColor"
+     reference="Yellow" />
+    <color
+     name="NameTagBeyondShoutDistanceColor"
+     reference="BrightRed" />
+
     <!-- for FS legacy profiles -->
     <color
      name="StatusUserOnline"
@@ -981,8 +1017,8 @@
     <color
      name="StatusUserOffline"
      reference="BrightRed" />
-	 
-    <!-- Colours for Kirstens Viewer - all themes -->	
+	
+	    <!-- Colours for Kirstens Viewer - all themes -->	
      <color
      name="MapChatRingColor"
      value="0.6 0.2 0.8 0.3" />
diff --git a/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml b/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
index 3e58d29492..75f9ac2b6f 100644
--- a/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
+++ b/indra/newview/skins/starlightcui/themes/custom_dark/colors.xml
@@ -410,13 +410,13 @@
      reference="Black_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -452,34 +452,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -500,10 +500,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -572,7 +572,7 @@
      reference="DkGray" />
     <color
      name="HTMLLinkColor"
-     value="0.113 0.210 0.170 1" />
+     value="0.38 0.694 0.573 1" />
     <color
      name="HealthTextColor"
      reference="White" />
@@ -618,15 +618,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="EmphasisColor" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -776,7 +767,7 @@
      reference="DkGray_66" />
     <color
      name="ObjectChatColor"
-     reference="EmphasisColor" />
+     value="0.38 0.694 0.573 1" />
     <color
      name="OverdrivenColor"
      reference="Red" />
@@ -789,6 +780,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -888,6 +882,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -966,6 +963,15 @@
 	 reference="LtYellow" />
 	 
     <!-- Colours for Firestorm - same for all themes -->	 
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
 	<color
      name="SchemeLightest"
      reference="EmphasisColor" />
diff --git a/indra/newview/skins/starlightcui/themes/custom_light/colors.xml b/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
index 479314b6a1..1500ab3a98 100644
--- a/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
+++ b/indra/newview/skins/starlightcui/themes/custom_light/colors.xml
@@ -412,13 +412,13 @@
      reference="White_50" />
     <color
      name="ColorPaletteEntry01"
-     reference="Black" />
+     value="0 0 0 1" />
     <color
      name="ColorPaletteEntry02"
      reference="Gray" />
     <color
      name="ColorPaletteEntry03"
-     value="0.3344 0.5456 0.5159 1" />
+     value="0.5 0 0 1" />
     <color
      name="ColorPaletteEntry04"
      value="0.5 0.5 0 1" />
@@ -454,34 +454,34 @@
      value="0.5 0.25 0 1" />
     <color
      name="ColorPaletteEntry15"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry16"
-     reference="LtYellow" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry17"
-     reference="LtGreen" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry18"
-     reference="LtGray" />
+     value="0.75 0.75 0.75 1" />
     <color
      name="ColorPaletteEntry19"
-     reference="Red" />
+     value="1 0 0 1" />
     <color
      name="ColorPaletteEntry20"
      reference="Yellow" />
     <color
      name="ColorPaletteEntry21"
-     reference="Green" />
+     value="0 1 0 1" />
     <color
      name="ColorPaletteEntry22"
      value="0 1 1 1" />
     <color
      name="ColorPaletteEntry23"
-     reference="Blue" />
+     value="0 0 1 1" />
     <color
      name="ColorPaletteEntry24"
-     reference="Purple" />
+     value="1 0 1 1" />
     <color
      name="ColorPaletteEntry25"
      value="1 1 0.5 1" />
@@ -502,10 +502,10 @@
      value="1 0.5 0 1" />
     <color
      name="ColorPaletteEntry31"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ColorPaletteEntry32"
-     reference="White" />
+     value="1 1 1 1" />
     <color
      name="ComboListBgColor"
      reference="DkGray" />
@@ -620,15 +620,6 @@
     <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
-    <color
-     name="InventoryItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="InventoryItemHighlightBgColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemHighlightFgColor"
-     reference="EmphasisColor" />
     <color
      name="InventoryItemSuffixColor"
      reference="White_25" />
@@ -791,6 +782,9 @@
     <color
      name="PanelFocusBackgroundColor"
      reference="Transparent" />
+    <color
+     name="PanelNotificationBackground"
+     value="1 0.3 0.3 0" />
     <color
      name="ParcelHoverColor"
      reference="White" />
@@ -890,6 +884,9 @@
     <color
      name="TitleBarFocusColor"
      reference="White_10" />
+    <color
+     name="ToastBackground"
+     value="0.3 0.3 0.3 0" />
     <color
      name="ToolTipTextColor"
      reference="SL-White" />
@@ -967,6 +964,15 @@
 	 reference="Red" />
 	 
     <!-- Colours for Firestorm - same for all themes -->
+    <color
+     name="InventoryItemEnabledColor"
+     reference="LtGray" />
+    <color
+     name="InventoryItemHighlightBgColor"
+     reference="EmphasisColor_35" />
+    <color
+     name="InventoryItemHighlightFgColor"
+     reference="White" />
     <color
      name="SchemeLightest"
      reference="EmphasisColor" />