diff --git a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 8fa0cea04..b9889f8c9 100644
--- a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -26,7 +26,7 @@
 	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10" max_val="10" min_val="0.5" name="fog" width="202"/>
 	<text bottom_delta="-50" height="40" left="10" name="note">
 		Note: the Gamma and Fog Distance Ratio settings are	unavailable
-		(since useless) when the Atmospheric Shaders are enabled.
+        (since useless) when the Atmospheric Shaders are enabled.
 	</text>
 	<button bottom="10" height="20" label="OK" label_selected="OK" left="-110" name="OK" scale_image="true" width="90"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index b9877c8bf..735359ee6 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,60 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" follows="left|top|right|bottom" height="160"
-     label="Audio &amp; Video" name="Media panel" width="175">
-	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Master"
-	     label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
-	     name="System Volume" show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Music"
-	     label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
-	     show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Media"
-	     label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
-	     show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Voice"
-	     label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
-	     show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Sounds"
-	     label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
-	     show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Ambient"
-	     label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
-	     show_text="false" volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
-	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
-	     left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
-	     volume="true" width="180" />
-	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
-	     left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
+<panel border="false" height="160" label="Audio &amp; Video" name="Media panel" width="175">
+	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_audio" toggle="true" width="25"/>
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_music" toggle="true" width="25"/>
+	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_media" toggle="true" width="25"/>
+	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_voice" tab_stop="false" toggle="true" width="25"/>
+	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25"/>
+	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_wind" toggle="true" width="25"/>
+	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="218"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_ui" toggle="true" width="25"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index f5897c16d..fe846b3e6 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -1,209 +1,54 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
-  border="true" label="Vanity" name="ascvan" enabled="true" mouse_opaque="true">
-  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" left="0"
-    name="Ascent Vanity" tab_min_width="90" tab_position="top">
-    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-        follows="left|top|right|bottom" label="General" name="General">
-      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Where applicable, save Vanity settings per-account." left="10"
-        tool_tip="Saves settings per-account, allowing easier customization for alts."
-        mouse_opaque="true" name="use_account_settings_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Hide the Teleport progress screens" left="10"
-        tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs."
-        mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Play the Teleport sound when moving between sims" left="10"
-        tool_tip="Viewer will play the wooshing TP noise on teleport."
-        mouse_opaque="true" name="tp_sound_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Hide the Login/Logout progress screens" left="10"
-        tool_tip="If checked, the viewer will hide the login/logout progress screen."
-        mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
-        width="400" />
+<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
+  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Main  (General)" name="General">
+      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Where applicable, save Vanity settings per-account." left="10" tool_tip="Saves settings per-account, allowing easier customization for alts." name="use_account_settings_check"/>
+      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Hide the Teleport progress screens" tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
+      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Play the Teleport sound when moving between sims" tool_tip="Viewer will play the wooshing TP noise on teleport." name="tp_sound_check"/>
+      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Hide the Login/Logout progress screens" tool_tip="If checked, the viewer will hide the login/logout progress screen." name="disable_logout_screen_check"/>
     </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Tags/Colors" name="TagsColors">
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
       <!-- Client tag options -->
-      <check_box bottom_delta="-25" control_name="AscentUseTag" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Use Client Tag:" left="10"
-        tool_tip="Enabling this will show your client tag on your avatar name locally."
-        mouse_opaque="true" name="show_my_tag_check" radio_style="false"
-        width="400" />
-      <combo_box allow_text_entry="false" enabled="true" follows="left|top"
-        bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
-        tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
-        name="tag_spoofing_combobox" width="130">
-        <combo_item type="string" length="1" enabled="true" name="Ascent" 
-          value="f25263b7-6167-4f34-a4ef-af65213b2e39">
-Singularity
-        </combo_item>
+      <check_box bottom_delta="-25" control_name="AscentUseTag" follows="top" height="16" initial_value="true" label="Use Client Tag:" left="10" tool_tip="Enabling this will show your client tag on your avatar name locally." name="show_my_tag_check"/>
+      <combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color." name="tag_spoofing_combobox" width="130">
+        <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
       </combo_box>
-      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Display client tag to self" left_delta="-24"
-        tool_tip="Choose whether others see that you enjoy Singularity."
-        mouse_opaque="true" name="show_self_tag_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Display client tag color to self" left_delta="0"
-        tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
-        mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Display friend client tags as (Friend)" left_delta="0"
-        tool_tip="Enabling this changes your friends' client tags to (Friend)."
-        mouse_opaque="true" name="show_friend_tag_check" radio_style="false"
-        width="400" />
+      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" follows="top" height="16" initial_value="true" label="Display client tag to self" left_delta="-24" tool_tip="Choose whether others see that you enjoy Singularity." name="show_self_tag_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" follows="top" height="16" initial_value="true" label="Display client tag color to self" tool_tip="Enabling this set your avatar name color to your client tag color or custom set color." name="show_self_tag_color_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" follows="top" height="16" initial_value="true" label="Display friend client tags as (Friend)" tool_tip="Enabling this changes your friends' client tags to (Friend)." name="show_friend_tag_check"/>
       <!-- End of Left Side -->
-      <check_box bottom_delta="87" control_name="AscentUseCustomTag" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Use a custom color and label (Local only)" left_delta="230"
-        tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
-        mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
-        width="400" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" 
-        mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
-Label:
-      </text>
-      <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
-        height="18" left_delta="35" name="custom_tag_label_box"
-        tool_tip="The custom string you would like to replace your client tag with (Local only)"
-        width="100" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" 
-        mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
-Color:
-      </text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
-        can_apply_immediately="false" color="1 1 1 1"
-        enabled="true" follows="left|top" height="34" label="" left_delta="35"
-        mouse_opaque="true" name="custom_tag_color_swatch" control_name="AscentCustomTagColor"
-        tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
-      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Display client tag for others" left_delta="-205"
-        tool_tip="Enabling this will show client tag names on others' avatar names."
-        mouse_opaque="true" name="show_other_tag_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Display client tag color for others" left_delta="0"
-        tool_tip="Enabling this sets others' avatar name color to their client's color."
-        mouse_opaque="true" name="show_client_tag_color_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Show Idle Time" left_delta="0"
-        tool_tip="Enabling this will show the amount of time an avatar has been idle."
-        mouse_opaque="true" name="show_idle_time_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Automatically check website for updates to client definitions" left_delta="-230"
-        tool_tip="Enabling this will allow Singularity to download fresh definitions when needed."
-        mouse_opaque="true" name="update_tags_check" radio_style="false"
-        width="400" />
-      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="left|top" 
-        label="Manual Update" height="18" left_delta="340" width="110"/>
+      <check_box bottom_delta="87" control_name="AscentUseCustomTag" follows="top" height="16" initial_value="true" label="Use a custom color and label (Local only)" left_delta="230" tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself." name="customize_own_tag_check"/>
+      <text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">Label:</text>
+      <line_editor bottom_delta="-6" follows="top" font="SansSerif" height="18" left_delta="35" name="custom_tag_label_box" tool_tip="The custom string you would like to replace your client tag with (Local only)" width="100"/>
+      <text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Color:</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"        can_apply_immediately="false" color="1 1 1 1" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" control_name="AscentCustomTagColor" tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
+      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Display client tag for others" left_delta="-205" tool_tip="Enabling this will show client tag names on others' avatar names." name="show_other_tag_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Display client tag color for others" left_delta="0" tool_tip="Enabling this sets others' avatar name color to their client's color." name="show_client_tag_color_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Show Idle Time" tool_tip="Enabling this will show the amount of time an avatar has been idle." name="show_idle_time_check"/>
+      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Automatically check website for updates to client definitions" left_delta="-230" tool_tip="Enabling this will allow Singularity to download fresh definitions when needed." name="update_tags_check"/>
+      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="Manual Update" height="18" left_delta="340" width="110"/>
       <!-- End of Client Tag settings -->
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-        mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-Color For My Effects:
-      </text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
-         can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor"
-         enabled="true" follows="left|top" height="47" label="Effects" left_delta="138"
-         mouse_opaque="true" name="effect_color_swatch" width="44" />
-      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Use user status colors (Friend, Linden, etcetera below)" left="10"
-        tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below."
-        mouse_opaque="true" name="use_status_check" radio_style="false"
-        width="400" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="10"
-        mouse_opaque="true" name="friends_color_textbox" v_pad="0" width="394">
-Color For:
-(Radar, Tag, Minimap)
-      </text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34"
-         can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor"
-         enabled="true" follows="left|top" height="47" label="Friends" left_delta="138"
-         mouse_opaque="true" name="friend_color_swatch" width="44" tool_tip="Color of Friends" />
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-         can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor"
-         enabled="true" follows="left|top" height="47" label="Estate" left_delta="54"
-         mouse_opaque="true" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers" />
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-         can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor"
-         enabled="true" follows="left|top" height="47" label="Lindens" left_delta="54"
-         mouse_opaque="true" name="linden_color_swatch" width="44" tool_tip="Color of Lindens" />
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
-         can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor"
-         enabled="true" follows="left|top" height="47"  label="Muted" left_delta="54"
-         mouse_opaque="true" name="muted_color_swatch" width="44" tool_tip="Color of Muted" />
+      <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Color For My Effects:</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor" follows="top" height="47" label="Effects" left_delta="138" name="effect_color_swatch" width="44"/>
+      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" follows="top" height="16" initial_value="true" label="Use user status colors (Friend, Linden, etcetera below)" left="10" tool_tip="Enabling this will show people who match specific criteria (Lindens, Estate owners, friends, muted people) with the color you've set below." name="use_status_check"/>
+      <text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Color For:
+(Radar, Tag, Minimap)</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor" follows="top" height="47" label="Friends" left_delta="138" name="friend_color_swatch" width="44" tool_tip="Color of Friends"/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip="Color of Estate Managers"/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip="Color of Lindens"/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Muted" left_delta="54" name="muted_color_swatch" width="44" tool_tip="Color of Muted"/>
     </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Body Dynamics" name="Body Dynamics">
-      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Enable enhanced physics on avatar breasts" left="10" mouse_opaque="true" name="EmBreastsToggle"
-        control_name="EmeraldBreastPhysicsToggle" width="126"/>
-      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass"
-        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-        label="Breast mass:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-        show_text="true" width="250" auto_resize="false" tool_tip=""/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness"
-        decimal_di:wqgits="0" enabled="true" follows="left|top" height="18" increment="1"
-        label="Breast rebound:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-        show_text="true" width="250" auto_resize="false" tool_tip=""/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax"
-        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-        label="Breast max vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-        show_text="true" width="250" auto_resize="false" tool_tip=""/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction"
-        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-        label="Breast friction:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-        show_text="true" width="250" auto_resize="false" tool_tip=""/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin"
-        decimal_digits="0" enabled="true" follows="left|top" height="18" increment="1"
-        label="Breast min vel:" label_width="100" max_val="100" min_val="1" mouse_opaque="true"
-        show_text="true" width="250" auto_resize="false" tool_tip=""/>
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
-        mouse_opaque="true" name="av_mod_textbox" v_pad="0" width="394">
-Avatar Offset Modifiers
-      </text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-           label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15"
-           mouse_opaque="true" name="X Modifier" width="128" control_name="AscentAvatarXModifier"
-           tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-         label="Y Modifier" label_width="65" left_delta="0" max_val="0.20" min_val="-0.20"
-         mouse_opaque="true" name="Y Modifier" width="128" control_name="AscentAvatarYModifier"
-         tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.1"
-         label="Z Modifier" label_width="65" left_delta="0" max_val="5.0" min_val="-5.0"
-         mouse_opaque="true" name="Z Modifier" width="128" control_name="AscentAvatarZModifier"
-         tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dynamics" name="Body Dynamics">
+      <check_box bottom_delta="-25" follows="top" height="16" label="Enable enhanced physics on avatar breasts" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip="You must hit apply before these controls will activate or deactivate"/>
+      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass" decimal_digits="0" follows="top" height="18" increment="1" label="Breast mass:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness" decimal_digits="0" follows="top" height="18" increment="1" label="Breast rebound:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax" decimal_digits="0" follows="top" height="18" increment="1" label="Breast max vel:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction" decimal_digits="0" follows="top" height="18" increment="1" label="Breast friction:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin" decimal_digits="0" follows="top" height="18" increment="1" label="Breast min vel:" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Avatar Offset Modifiers</text>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X Modifier" label_width="65" left_delta="5" max_val="0.15" min_val="-0.15" name="X Modifier" width="128" control_name="AscentAvatarXModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y Modifier" label_width="65" max_val="0.20" min_val="-0.20" name="Y Modifier" width="128" control_name="AscentAvatarYModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.1" label="Z Modifier" label_width="65" max_val="5.0" min_val="-5.0" name="Z Modifier" width="128" control_name="AscentAvatarZModifier" tool_tip="Use this to manipulate, to a degree, your avatar bounding box. This can be used to distort orbiters, or to raise you up or down without altering your shape."/>
     </panel>
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 79cd0d0b0..329c013a5 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -1,70 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
-     name="Media panel" width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="muting_text" v_pad="0" width="128">
-		Volume:
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
-		Streaming Preferences:
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
-		Audio Preferences:
-	</text>
-	<panel border="true" bottom="-195" enabled="true" filename="panel_audio.xml"
-	     follows="left|top|right|bottom" height="180" label="Volume" left="148"
-	     mouse_opaque="true" name="Volume Panel" width="260" />
-	<check_box bottom="-220" control_name="AudioStreamingMusic" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Play Streaming Music When Available (uses more bandwidth)"
-	     left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
-	     width="339" />
-	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Play Streaming Media When Available (uses more bandwidth)"
-	     left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
-	     width="338" />
-	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Automatically play media" left="162"
-	     mouse_opaque="true" name="auto_streaming_video" radio_style="false"
-	     width="338" />
-	<check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
-		 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-		 label="Ask for permission (enables filtering)"
-		 left="162" mouse_opaque="true" name="streaming_video" radio_style="false"
-		 width="338" />
-	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"
-	     name="mute_when_minimized" radio_style="false" width="215" />
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
-	     enabled="true" follows="left|top" height="15" increment="0.1"
-	     initial_val="1" label="Doppler Effect" label_width="100" left="148"
-	     max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
-	     show_text="true" width="250" />
-	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
-	     enabled="true" follows="left|top" height="15" increment="0.1"
-	     initial_val="1" label="Rolloff Factor" label_width="100" left="148"
-	     max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
-	     show_text="true" width="250" />
-	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" increment="10"
-	     initial_val="10" label="[CURRENCY] change threshold:" label_width="128" left="148"
-	     max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
-	     width="192" />
-	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="10" initial_val="20" label="Health Change Threshold"
-	     label_width="128" left="148" max_val="10000" min_val="0"
-	     mouse_opaque="true" name="Health Change Threshold" width="192" />
+<panel border="true" bottom="-409" height="408" label="Audio &amp; Video" left="102" name="Media panel" width="517">
+	<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
+	<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
+	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
+	<panel border="true" bottom="-195" filename="panel_audio.xml" height="180" label="Volume" left="148" name="Volume Panel" width="260"/>
+	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
+	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
+	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
+	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
+	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
+	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="100" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="250" />
+	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="100" max_val="2" min_val="0" name="Rolloff Factor" width="250"/>
+	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
+	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 618110725..6bfb517f4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -1,232 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-499" enabled="true" follows="left|top|right|bottom"
-    height="548" label="Text Chat" left="102" mouse_opaque="true" name="chat"
-    width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
-		Chat Font Size:
-	</text>
-	<radio_group bottom="-40" draw_border="true" enabled="true"
-	     follows="left|top" height="30" left="148" mouse_opaque="true"
-	     name="chat_font_size" width="331">
-		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
-		     name="radio" width="98">
-			Small
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
-		     name="radio2" width="98">
-			Medium
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
-		     name="radio3" width="98">
-			Large
-		</radio_item>
+<panel border="true" bottom="-499" height="548" label="Text Chat" left="102" name="chat" width="517">
+	<text bottom="-20" height="10" left="12" name="text_box">Chat Font Size:</text>
+	<radio_group bottom="-40" draw_border="true" height="30" left="148" name="chat_font_size" width="290">
+		<radio_item bottom="-24" height="16" left="0" name="radio" width="98">Small</radio_item>
+		<radio_item bottom="-24" height="16" left="110"	name="radio2" width="98">Medium</radio_item>
+		<radio_item bottom="-24" height="16" left="220"	name="radio3" width="98">Large</radio_item>
 	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-		Chat Color:
-	</text>
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-	     can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-	     enabled="true" follows="left|top" height="47" label="You" left="148"
-	     mouse_opaque="true" name="user" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-	     can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-	     enabled="true" follows="left|top" height="47" label="Others" left_delta="54"
-	     mouse_opaque="true" name="agent" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-	     can_apply_immediately="true" color="0.6 0.6 1 1"
-	     enabled="true" follows="left|top" height="47" label="IM" left_delta="54"
-	     mouse_opaque="true" name="im" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-	     can_apply_immediately="true" color="0.8 1 1 1"
-	     enabled="true" follows="left|top" height="47"  label="System" left_delta="54"
-             mouse_opaque="true"
-	     name="system" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
-	     can_apply_immediately="true" color="0.82 0.82 0.99 1"
-	     control_name="ScriptErrorColor" enabled="true" follows="left|top"
-	     height="47"  label="Errors" left_delta="54" mouse_opaque="true"
-	     name="script_error" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
-	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
-	     control_name="ObjectChatColor" enabled="true" follows="left|top"
-	     height="47"  label="Objects" left="148" mouse_opaque="true"
-	     name="objects" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
-	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
-	     enabled="true" follows="left|top"
-	     height="47" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
-	     width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
-	     can_apply_immediately="true" color="0 0 0 1"
-	     enabled="true" follows="left|top"
-	     height="47" label="Bubble" left_delta="54" mouse_opaque="true"
-	     name="background" width="44" />
-	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
-	     can_apply_immediately="true" color="0.6 0.6 1 1"
-	     enabled="true" follows="left|top" height="47"
-	     label="URLs" left_delta="54" mouse_opaque="true" name="links" width="44" />
+	<text bottom="-64" height="10" left="12" name="text_box2">Chat Color:</text>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor" follows="top" height="47" label="You" left="148" name="user" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor" follows="top" height="47" label="Others" left_delta="54" name="agent" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.6 0.6 1 1" follows="top" height="47" label="IM" left_delta="54" name="im" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.8 1 1 1" follows="top" height="47" label="System" left_delta="54" name="system" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100" can_apply_immediately="true" color="0.82 0.82 0.99 1" control_name="ScriptErrorColor" enabled="true" follows="top" height="47" label="Errors" left_delta="54" name="script_error" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.7 0.9 0.7 1" control_name="ObjectChatColor" height="47" label="Objects" left="148" mouse_opaque="true" name="objects" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.7 0.9 0.7 1" follows="top" height="47" label="Owner" left_delta="54" name="owner" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0 0 0 1" follows="top" height="47" label="Bubble" left_delta="54" name="background" width="44"/>
+	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150" can_apply_immediately="true" color="0.6 0.6 1 1" follows="top" height="47" label="URLs" left_delta="54" name="links" width="44"/>
 	
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box3" v_pad="0" width="135">
-		Chat Console:
-	</text>
-	<spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" increment="1"
-	     initial_val="10" label="Fade chat after" label_width="80" left="148"
-	     max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
-	     width="130" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="6" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="282" mouse_opaque="false" name="text_box4" v_pad="0"
-	     width="80">
-		(seconds)
-	</text>
-	<spinner bottom_delta="-6" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" increment="1"
-	     initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
-	     name="max_chat_count" width="60" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="6" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="405" mouse_opaque="false" name="text_box5" v_pad="0"
-	     width="60">
-		(# lines)
-	</text>
-	<slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
-	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
-	     min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
-	     value="0.4" width="200" />
-	<check_box bottom_delta="-25" control_name="ChatFullWidth" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Use full screen width  (Requires restart)" left="148"
-	     mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-	     width="239" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	      bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">
-		Chat Options:
-	</text>
-	<check_box bottom_delta="-8" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Close chat bar after hitting return" left="148" mouse_opaque="true"
-	     name="close_chat_on_return_check" radio_style="false" width="237" />
-	<check_box bottom_delta="-20" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Arrow keys always move avatar when chatting" left="148"
-	     mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
-	     width="237" />
-	<check_box bottom_delta="-20" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
-	     name="show_timestamps_check" radio_style="false" width="237" />
-  <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show script errors and warnings as regular chat" left="148"
-	     mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
-	     width="275" />
-	<check_box bottom_delta="-20" enabled="true" control_name="PlayTypingAnim"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Play typing animation when chatting" left="148" mouse_opaque="true"
-	     name="play_typing_animation" radio_style="false" width="237" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-365" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-		Bubble Chat:
-	</text>
-	<check_box bottom="-370" control_name="UseChatBubbles" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show chat bubbles" left="148" mouse_opaque="true"
-	     name="bubble_text_chat" radio_style="false" width="237" />
-	<slider bottom="-386" can_edit_text="false" control_name="ChatBubbleOpacity"
-	     decimal_digits="3" enabled="true" follows="left|top" height="12"
-	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
-	     min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-	     value="0.5" width="200" />
-
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-410" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
-		Translate Chat:
-	</text>
-	<check_box bottom="-417" control_name="TranslateChat" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
-	     name="translate_chat" radio_style="false" width="237" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-432" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
-	     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-		Translate into this language:
-	</text>	
-	<combo_box allow_text_entry="true" bottom="-438" enabled="true"
-	     follows="left|top" height="16" left_delta="183" max_chars="135"
-	     mouse_opaque="true" name="translate_language_combobox" width="146">
-		<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-			System Default
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="English" value="en">
-			English
-		</combo_item>
-		
-		<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
-		
-		<combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-			Dansk (Danish)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-			Deutsch (German)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-			Español (Spanish)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="French" value="fr">
-			Français (French)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-			Italiano (Italian)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-			Magyar (Hungarian)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-			Nederlands (Dutch)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-			Polski (Polish)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-			Portugués (Portuguese)
-		</combo_item>
- 		<combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
- 			Русский (Russian)
- 		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-			Türkçe (Turkish)
-		</combo_item>
- 		<combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
- 			Українська (Ukrainian)
- 		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-			中文 (简体) (Chinese)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-			日本語 (Japanese)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-			한국어 (Korean)
-		</combo_item>
-	</combo_box>
+	<text bottom_delta="-26" follows="top" height="10" left="12" name="text_box3">Chat Console:</text>
+	<spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0" follows="top" height="16" increment="1" initial_val="10" label="Fade chat after" label_width="80" left="148" max_val="60" min_val="2" name="fade_chat_time" width="130"/>
+	<text bottom_delta="6" follows="top" height="10" left="282" name="text_box4">(seconds)</text>
+	<spinner bottom_delta="-6" decimal_digits="0" follows="top" height="16" increment="1" initial_val="10" left="340" max_val="50" min_val="1" name="max_chat_count" width="60"/>
+	<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
+	<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
+	<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
+	<text bottom_delta="-22" height="10" left="12"	     mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
+	<check_box bottom_delta="-8"  follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
+	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
+	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
+	<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>
+	<check_box bottom_delta="-20" control_name="PlayTypingAnim" follows="top" height="16" initial_value="true" label="Play typing animation when chatting" name="play_typing_animation"/>
+	<text bottom="-365" height="10" left="12" name="text_box7">Bubble Chat:</text>
+	<check_box bottom="-370" control_name="UseChatBubbles" height="16" initial_value="false" label="Show chat bubbles" left="148" name="bubble_text_chat"/>
+	<slider bottom="-386" can_edit_text="false" control_name="ChatBubbleOpacity" height="12" increment="0.05" initial_val="1" label="Opacity" max_val="1" min_val="0" name="bubble_chat_opacity" value="0.5" width="200"/>
+<!--
+	<text bottom="-410" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
+	<check_box bottom="-417" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
+	<text bottom="-432" height="10" left="149" name="text_translate_chat">Translate into this language:</text>	
+		<combo_box allow_text_entry="true" bottom="-438" follows="top" height="16" left_delta="183" max_chars="135" name="translate_language_combobox" width="146">
+		<combo_item name="System Default Language" value="default">System Default</combo_item>
+		<combo_item name="English" value="en">English</combo_item>
+		<!- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. ->
+		<combo_item name="Danish" value="da">Dansk (Danish)</combo_item>
+		<combo_item name="Deutsch(German)" value="de">Deutsch (German)</combo_item>
+		<combo_item name="Spanish" value="es">Español (Spanish)</combo_item>
+		<combo_item name="French" value="fr">Français (French)</combo_item>
+		<combo_item name="Italian" value="it">Italiano (Italian)</combo_item>
+		<combo_item name="Hungarian" value="hu">Magyar (Hungarian)</combo_item>
+		<combo_item name="Dutch" value="nl">Nederlands (Dutch)</combo_item>
+		<combo_item name="Polish" value="pl">Polski (Polish)</combo_item>
+		<combo_item name="Portugese" value="pt">Portugués (Portuguese)</combo_item>
+ 		<combo_item name="Russian" value="ru">Русский (Russian)</combo_item>
+		<combo_item name="Turkish" value="tr">Türkçe (Turkish)</combo_item>
+ 		<combo_item name="Ukrainian" value="uk">Українська (Ukrainian)</combo_item>
+		<combo_item name="Chinese" value="zh">中文 (简体) (Chinese)</combo_item>
+		<combo_item name="(Japanese)" value="ja">日本語 (Japanese)</combo_item>
+		<combo_item name="(Korean)" value="ko">한국어 (Korean)</combo_item>
+	</combo_box>-->
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index a637b1843..42b50ad25 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -1,98 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Communication" left="102" mouse_opaque="true" name="im"
-     width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box" v_pad="0" width="128">
-		My Online Status:
-	</text>
-	<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Only my Friends and Groups can see when I am online"
-	     left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
-	     width="350" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-		IM Options:
-	</text>
-	<string name="log_in_to_change">
-		log in to change
-	</string>
-	<check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
-	     left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
-	     width="350" />
-	<check_box bottom="-65" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Include IM in chat console" left="148" mouse_opaque="true"
-	     name="include_im_in_chat_console" radio_style="false" width="237" />
-	<check_box bottom="-85" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in IM" left="148" mouse_opaque="true"
-	     name="show_timestamps_check" radio_style="false" width="237" />
-    <check_box bottom="-105" enabled="true"
-         follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Show online Friend notifications" left="148"
-         mouse_opaque="true" name="friends_online_notify_checkbox"
-         radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-		Busy Mode Response:
-	</text>
-	<text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="70" left="148" max_length="255"
-	     mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box4" v_pad="0" width="128">
-		Logging Options:
-	</text>
-	<check_box bottom="-225" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Save a log of IM on my computer" left="148"
-	     mouse_opaque="true" name="log_instant_messages" radio_style="false"
-	     width="237" />
-	<check_box bottom="-245" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Show timestamps in IM log" left="168"
-	     mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
-	     width="217" />
-	<check_box bottom="-265" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show the end of last IM conversation" left="168" mouse_opaque="true"
-	     name="log_show_history" radio_style="false" width="217" />
-	<check_box bottom="-285" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
-	     left="148" mouse_opaque="true" name="log_chat" radio_style="false"
-	     width="237" />
-	<check_box bottom="-305" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
-	     name="log_chat_timestamp" radio_style="false" width="217" />
-	<check_box bottom="-325" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
-	     name="log_chat_IM" radio_style="false" width="217" />
-	<check_box bottom="-345" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Include date with timestamps" left="148" mouse_opaque="true"
-	     name="log_date_timestamp" radio_style="false" width="237" />
-	<check_box bottom="-365" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Append date to log filename" left="148" mouse_opaque="true"
-	     name="logfile_name_datestamp" radio_style="false" width="237" />
-	<button bottom="-353" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Change Path" label_selected="Change Path" left="70"
-	     mouse_opaque="true" name="log_path_button" width="90" />
-	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-386"
-	     drop_shadow_visible="true" enabled="false" follows="top|left|right"
-	     font="SansSerifSmall" halign="right" height="19" left="148"
-	     max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
+<panel border="true" bottom="-409" height="408" label="Communication" left="102" name="im" width="517">
+	<text bottom="-20" left="12" name="text_box">My Online Status:</text>
+	<check_box bottom="-25" height="16" initial_value="false" label="Only my Friends and Groups can see when I am online" left="148" name="online_visibility"/>
+	<text bottom="-40" height="10" left="12" name="text_box2">IM Options:</text>
+	<string name="log_in_to_change">log in to change</string>
+	<check_box bottom="-45" height="16" initial_value="false" label="Send IM to Email ([EMAIL])" left="148" name="send_im_to_email"/>
+	<check_box bottom="-65" height="16" initial_value="false" label="Include IM in chat console" name="include_im_in_chat_console"/>
+	<check_box bottom="-85" height="16" initial_value="false" label="Show timestamps in IM" name="show_timestamps_check"/>
+    <check_box bottom="-105" height="16" initial_value="false" label="Show online Friend notifications" name="friends_online_notify_checkbox"/>
+	<text bottom="-125" height="10" left="12" name="text_box3">Busy Mode Response:</text>
+	<text_editor font="SansSerifSmall" bottom="-185" follows="top" height="70" left="148" max_length="255" name="busy_response" width="330" word_wrap="true" spell_check="true"/>
+	<text bottom="-218" height="10" left="12" name="text_box4">Logging Options:</text>
+	<check_box bottom="-225" height="16" initial_value="false" label="Save a log of IM on my computer" left="148" name="log_instant_messages" />
+	<check_box bottom="-245" height="16" initial_value="false" label="Show timestamps in IM log" left="168" name="log_instant_messages_timestamp"/>
+	<check_box bottom="-265" height="16" initial_value="false" label="Show the end of last IM conversation" name="log_show_history"/>
+	<check_box bottom="-285" height="16" initial_value="false" label="Save a log of Local Chat on my computer" left="148" name="log_chat"/>
+	<check_box bottom="-305" height="16" initial_value="false" label="Show timestamps in Local Chat log" left="168" name="log_chat_timestamp"/>
+	<check_box bottom="-325" height="16" initial_value="false" label="Show incoming IM in Local Chat log" name="log_chat_IM"/>
+	<check_box bottom="-345" height="16" initial_value="false" label="Include date with timestamps" left="148" name="log_date_timestamp"/>
+	<check_box bottom="-365" height="16" initial_value="false" label="Append date to log filename" name="logfile_name_datestamp"/>
+	<button bottom="-353" follows="right|bottom" height="20" label="Change Path" label_selected="Change Path" left="70" name="log_path_button" width="90" />
+	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-386" drop_shadow_visible="true" follows="top|left|right" height="19" left="148"	max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 6d5f5ffbe..d8d200259 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -1,157 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Network" left="102" mouse_opaque="true" name="network"
-     width="517">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_box" v_pad="0" width="200">
-		Maximum Bandwidth:
-	</text>
-	<slider bottom_delta="-25" can_edit_text="true"
-	     decimal_digits="0" enabled="true" follows="left|top" height="15"
-	     increment="10" initial_val="50" left_delta="0" max_val="5000" min_val="50"
-	     mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
-	     width="180" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="4" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left_delta="186" mouse_opaque="false" name="text_box2"
-	     v_pad="0" width="200">
-		kbps (kilobits per second)
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
-	     v_pad="0" width="200">
-		Disk Cache Size (MB):
-	</text>
-	<slider bottom_delta="-25" can_edit_text="true"
-	     decimal_digits="0" enabled="true" follows="left|top" height="15"
-	     increment="64" initial_val="1024" left_delta="0" max_val="2048" min_val="64"
-	     mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="4" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left_delta="186" mouse_opaque="false" name="text_box5"
-	     v_pad="0" width="40">
-		MB
-	</text>
-	<button bottom="-55" bottom_delta="-8" enabled="true" follows="left|top"
-	     font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
-	     left_delta="30" mouse_opaque="true" name="clear_cache" scale_image="true"
-	     width="100" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="cache_location_label"
-	     v_pad="0" width="200">
-		Disk Cache Location:
-	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
-	     enabled="false" follows="left|top" font="SansSerif"
-	     handle_edit_keys_directly="true" height="20" left_delta="7"
-	     max_length="4096" mouse_opaque="true" name="cache_location"
-	     select_all_on_focus_received="false" width="470" word_wrap="false" />
-	<button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
-	     halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
-	     mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
-	<button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
-	     font="SansSerif" halign="center" height="22" label="Reset"
-	     label_selected="Set" left_delta="103" mouse_opaque="true"
-	     name="reset_cache" scale_image="true" width="100" />
-	<check_box bottom="-173" bottom_delta="-35"
-	     enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Custom Port Connection" left="12"
-	     mouse_opaque="true" name="connection_port_enabled" radio_style="false"
-	     width="256" />
-	<spinner bottom="-193" bottom_delta="-20"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="13000" label="Port Number:" label_width="75"
-	     left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
-	     name="connection_port" width="150" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="socks5_auth_label"
-	     v_pad="0" width="128">
-		Http Proxy:
-	</text>
+<panel border="true" bottom="-409" height="408" label="Network" left="102" name="network" width="517">
+	<text bottom="-20" follows="top" height="10" left="12" name="text_box">Maximum Bandwidth:</text>
+	<slider bottom_delta="-25" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="10" initial_val="50" max_val="5000" min_val="50" name="max_bandwidth" show_text="true" value="500" width="180"/>
+	<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box2">kbps (kilobits per second)</text>
+	<text bottom_delta="-25" follows="top" height="10" left="12" name="cache_size_label_l">Disk Cache Size (MB):</text>
+	<slider bottom_delta="-25" can_edit_text="true" decimal_digits="0" follows="top" height="15" increment="64" initial_val="1024" max_val="2048" min_val="64" name="cache_size" show_text="true" width="180"/>
+	<text bottom_delta="4" follows="top" height="10" left_delta="186" name="text_box5">MB</text>
+	<button bottom_delta="-8" follows="top" height="22" label="Clear Cache" left_delta="30" name="clear_cache" scale_image="true" width="100"/>
+	<text bottom_delta="-17" follows="top" height="10" left="12" name="cache_location_label">Disk Cache Location:</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28" follows="top" handle_edit_keys_directly="true" height="20" left_delta="7" max_length="4096" name="cache_location" width="470"/>
+	<button bottom_delta="-25" follows="top" height="22" label="Set" label_selected="Set" name="set_cache" scale_image="true" width="100"/>
+	<button bottom_delta="0" follows="top" height="22" label="Reset" label_selected="Set" left_delta="103" name="reset_cache" scale_image="true" width="100"/>
+	<check_box bottom_delta="-35" follows="top" height="16" initial_value="false" label="Custom Port Connection" left="12" name="connection_port_enabled"/>
+	<spinner bottom_delta="-20" decimal_digits="0" follows="top" height="16" increment="1" initial_val="13000" label="Port Number:" label_width="75" left_delta="20" max_val="65535" min_val="0" name="connection_port" width="150"/>
+	<text bottom_delta="-24" follows="top" height="10" left="12" name="socks5_auth_label">Http Proxy:</text>
   <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="12"
 	     name="socks5_http_proxy_type" width="380" >
-    <radio_item height="20" bottom="0" left="100" name="None" width="50"
-		  tool_tip="No Http Proxy">
-      None
-    </radio_item>
-	<radio_item height="20" bottom="0" left="170" name="Socks" width="50"
-		  tool_tip="Use Socks for Http Proxy">
-      Socks
-    </radio_item>
-    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
-		  tool_tip="Use web proxy for Http Proxy">
-      Web
-    </radio_item>
+    <radio_item height="20" bottom="0" left="100" name="None" width="50" tool_tip="No Http Proxy">None</radio_item>
+	<radio_item height="20" bottom="0" left="170" name="Socks" width="50" tool_tip="Use Socks for Http Proxy">Socks</radio_item>
+    <radio_item height="20" bottom="0" left="250" name="Web" width="50" tool_tip="Use web proxy for Http Proxy">Web</radio_item>
   </radio_group>
-	<check_box bottom_delta="-24" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Enable SOCKS 5 Proxy" left="6" mouse_opaque="true"
-	     name="socks5_proxy_enabled" radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-26" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="socks5_host_label"
-	     v_pad="0" width="128">
-		Socks 5 Host:
-	</text>
-	<line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
-	     height="20" left="90" name="socks5_proxy_host"
-	     tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
-	     width="200" />
-	<spinner bottom_delta="-30" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" increment="1"
-	     initial_val="80" label="Port Number:" label_width="75" left="12"
-	     max_val="12000" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
-	     width="140" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="socks5_auth_label"
-	     v_pad="0" width="128">
-		Socks5 Authentication:
-	</text>
- <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="12"
-	     name="socks5_auth" width="420">
-	     <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
-		  tool_tip="No authentication">
-      None
-    </radio_item>
-	     <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
-		  tool_tip="Username / Password authentication">
-      Username/Password
-    </radio_item>
-  </radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-22" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="socks5_username_label"
-	     v_pad="0" width="128">
-		Username:
-	</text>
-	<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-	     height="20" left="90" name="socks5_proxy_username"
-	     tool_tip="Username for the Socks5 proxy"
-	     width="200" />
-
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="10" left="12" mouse_opaque="false" name="socks5_password_label"
-	     v_pad="0" width="128">
-		Password:
-	</text>
-	<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-	     height="20" left="90" name="socks5_proxy_password"
-	     tool_tip="Password for the Socks5 proxy"
-	     width="200" />
+	<check_box bottom_delta="-24" follows="top" height="16" initial_value="false" label="Enable SOCKS 5 Proxy" left="6" mouse_opaque="true"	     name="socks5_proxy_enabled" radio_style="false" width="256" />
+	<text bottom_delta="-26" follows="top" height="10" left="12" name="socks5_host_label">Socks 5 Host:</text>
+	<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_host" tool_tip="The name or IP address of the SOCKS5 proxy you would like to use" width="311"/>
+	<spinner bottom_delta="-30" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" max_val="65535" min_val="0" name="socks5_proxy_port" width="140"/>
+	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label">Socks5 Authentication:</text>
+	<radio_group bottom_delta="-6" draw_border="false" follows="top" height="20" name="socks5_auth" width="420">
+		<radio_item bottom="0" height="20" left_delta="80" name="None" tool_tip="No authentication">None</radio_item>
+		<radio_item bottom="0" height="20" left_delta="50" name="UserPass" tool_tip="Username / Password authentication">Username/Password</radio_item>
+	</radio_group>
+	<text bottom_delta="-22" follows="top" height="10" left="12" name="socks5_username_label">Username:</text>
+	<line_editor bottom_delta="-8" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_username" tool_tip="Username for the Socks5 proxy" width="311"/>
+	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_password_label">Password:</text>
+	<line_editor bottom_delta="-8" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_password" tool_tip="Password for the Socks5 proxy" width="311"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 7e26db011..26defbf82 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -4,7 +4,7 @@
      height="28" name="toolbar" width="1024">
     
   <string name="Redock Windows">Redock Windows</string>
-  <!-- panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" /-->
+  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024"/>
   <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
     <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
     <button bottom="0" font="SansSerif" height="24"