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 62569e0c9..8fa0cea04 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
@@ -1,110 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-400" can_close="true" can_drag_on_left="false" 
-	can_minimize="true" can_resize="false" height="244"
-	left="50" min_height="244" min_width="500" mouse_opaque="true" 
-	name="Hardware Settings Floater" title="Hardware Settings" width="500">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
-		Filtering:
-	</text>
-	<check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Anisotropic Filtering (slower when enabled)" left="148"
-	     mouse_opaque="true" name="ani" radio_style="false" width="256" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="12"
-		left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
-    Antialiasing:
-  </text>
-  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="false"
-		label="Antialiasing" left="148"
-		mouse_opaque="true" name="fsaa" width="64">
-    <combo_item name="FSAADisabled" value="0">
-      Disabled
-    </combo_item>
-    <combo_item name="2x" value="2">
-      2x
-    </combo_item>
-    <combo_item name="4x" value="4">
-      4x
-    </combo_item>
-    <combo_item name="8x" value="8">
-      8x
-    </combo_item>
-    <combo_item name="16x" value="16">
-      16x
-    </combo_item>
+<floater bottom="-400" height="244" left="50" name="Hardware Settings Floater" title="Hardware Settings" width="500">
+	<text bottom="-42" height="12" left="10" name="Filtering:">Filtering:</text>
+	<check_box bottom="-46" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="148" name="ani" width="256"/>
+  <text bottom="-61" height="12" left="10" name="Antialiasing:" width="128">Antialiasing:</text>
+  <combo_box bottom="-65" control_name="RenderFSAASamples" height="16" initial_value="false" label="Antialiasing" left="148" name="fsaa" width="64">
+    <combo_item name="FSAADisabled" value="0">Disabled</combo_item>
+	<combo_item name="2x" value="2">2x</combo_item>
+    <combo_item name="4x" value="4">4x</combo_item>
+    <combo_item name="8x" value="8">8x</combo_item>
+    <combo_item name="16x" value="16">16x</combo_item>
   </combo_box>
-	<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
-	     follows="left|top" height="16" increment="0.01"
-	     initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
-	     min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="12"
-		left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
-		v_pad="0" width="315">
-		(brightness, lower is brighter, 0=use default)
+	<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2" min_val="0.0" name="gamma" width="202"/>
+	<text bottom_delta="2" height="12" left="222" name="(brightness, lower is brighter)">(brightness, lower is brighter, 0=use default)</text>
+	<text bottom_delta="-20" height="12" left="10" name="Enable VBO:">Enable VBO:</text>
+	<check_box bottom_delta="-5" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="148" name="vbo"
+		tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
+	<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" height="16" initial_value="false" label="Enable Streamed VBOs" left="157" name="vbo_stream"
+		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
+  <text bottom_delta="-20" height="12" left="10" name="Enable FBO:">Enable Framebuffer Objects:</text>
+  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="148" name="fbo"
+	  tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
+	<slider bottom_delta="-21" control_name="TextureMemory"	decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="135" left="10" max_val="4096" min_val="0" name="GrapicsCardTextureMemory"
+		tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." 
+		width="300"/>
+	<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.
 	</text>
-	<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="12"
-		left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
-		width="128">
-		Enable VBO:
-	</text>
-	<check_box bottom_delta="-5" control_name="RenderVBOEnable" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="true"
-		label="Enable OpenGL Vertex Buffer Objects" left="148"
-		mouse_opaque="true" name="vbo" radio_style="false"
-		tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
-		width="315" />
-	<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="false"
-		label="Enable Streamed VBOs" left="157"
-		mouse_opaque="true" name="vbo_stream" radio_style="false"
-		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."
-		width="315" />
-  <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="12"
-  left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0"
-  width="140">
-    Enable Framebuffer Objects:
-  </text>
-  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="true"
-		label="Enable OpenGL Frame Buffer Objects" left="148"
-		mouse_opaque="true" name="fbo" radio_style="false"
-		tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."
-		width="315" />
-	<slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
-		decimal_digits="0" enabled="true"
-		follows="left|top" height="16" increment="16"
-		initial_val="32" label="Texture Memory (MB):" label_width="135" left="10"
-		max_val="4096" min_val="0" mouse_opaque="true" name="GrapicsCardTextureMemory"
-		tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
-		width="300" />
-
-	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
-	     follows="left|top" height="16" increment="0.1"
-	     initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10"
-	     max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
-
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="40"
-		left="10" mouse_opaque="true" name="note" v_pad="0"
-		width="480">
-		Note: the Gamma and Fog Distance Ratio settings are unavailable (since useless) when the
-          Atmospheric Shaders are enabled.
-	</text>
-
-	<button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="OK" label_selected="OK"
-	     left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />
+	<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/floater_preview_embedded_texture.xml b/indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
index a213044bc..951708401 100644
--- a/indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="331" left="201" min_height="120"
-     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
-	<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Copy To Inventory" left="105"
-	     mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
-	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
-		Dimensions: [WIDTH] x [HEIGHT]
-	</text>
+<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" height="331" left="201" min_height="120" min_width="300" name="preview_texture" width="300">
+	<button bottom="-325" font="SansSerif" height="20" label="Copy To Inventory" left="105" name="Copy To Inventory" scale_image="true" width="172" />
+	<text bottom="30" font="SansSerifSmall" height="14" left="13" name="dimensions">Dimensions: [WIDTH] x [HEIGHT]</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 7d4d31cea..c34afa98e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -1,302 +1,117 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-  border="true" label="Adv. Chat" name="ascsys" enabled="true" mouse_opaque="true">
-  <tab_container label="Advanced Chat" bottom="0" height="440" width="497" left="0"
-    name="Ascent Chat" tab_min_width="70" tab_position="top">
+<panel top="20" left="10" height="400" width="517" border="true" label="Adv. Chat" name="ascsys">
+  <tab_container label="Advanced Chat" bottom="0" height="440" width="497" left="0" name="Ascent Chat" tab_position="top">
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-          bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-          font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-          left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-          width="300">
-IMs:
-      </text>
-      <check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Use Vertical IMs (Requires a restart)" left="10"
-        mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
-        control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
-        name="quickstart_im_check"
-        tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
-      <check_box bottom_delta="-20" control_name="AscentHideTypingNotification" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Don't send '[name] is typing...' in IMs" left="10"
-        tool_tip="IM partners will not see '______ is typing...' when you're responding."
-        mouse_opaque="true" name="hide_typing_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Show group name in chat" left="10"
-        tool_tip="The name of the group will also be displayed if the IM is from group chat."
-        mouse_opaque="true" name="append_group_name_check" radio_style="false"
-        width="400" />
-      <!-- Left/Right Column split -->
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
-        left="235" name="CmdDivisor" width="0"/>
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-        left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-        width="300">
-Chat:
-      </text>
-      <check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Play the typing sound for local chat" left_delta="-5"
-        tool_tip="Silences the chatting type sound, making it quieter for things like performances."
-        mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Do not echo/log notifications in chat" left_delta="00"
-        mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
-        width="400" />
-      <check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Allow MU pose method." left="10"
-        tool_tip="Allows the use of both /me and : to perform emotes."
-        mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Auto-close OOC comments." left="10"
-        tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
-        mouse_opaque="true" name="close_ooc_check" radio_style="false"
-        width="400" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-        left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
-        width="300">
-Show links on chatting object names in chat history for:
-      </text>
-      <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
-        tool_tip="Enables a link to show you the owner of the speaking object."
-        follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
-        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
-          left_delta="5" mouse_opaque="true" name="no_object" width="48">
-No object
-        </radio_item>
-        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
-          left_delta="45" mouse_opaque="true" name="others_objects" width="48">
-Others' objects
-        </radio_item>
-        <radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
-          left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
-Anyone's objects
-        </radio_item>
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
+      <text bottom="-15" left="15" name="objects_link_text_box">IMs:</text>
+      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
+        label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
+        label="Announce incoming instant messages" tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter." name="quickstart_im_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
+        label="Don't send '[name] is typing...' in IMs" tool_tip="IM partners will not see '______ is typing...' when you're responding." name="hide_typing_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
+        label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
+	  <!-- Left/Right Column split  
+		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
+		left="235" name="CmdDivisor" width="0"/>
+	  -->
+      <text bottom="-15" left="250" name="objects_link_text_box" width="300">Chat:</text>
+      <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
+        label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
+        label="Do not echo/log notifications in chat" name="hide_notifications_in_chat_check"/>
+      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
+        label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
+      <check_box bottom_delta="-20" follows="left|top"
+        label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
+      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box">Show links on chatting object names in chat history for:</text>
+      <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
+        follows="top" height="20" left="20" name="objects_link" width="350">
+        <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
+        <radio_item bottom_delta="0" left_delta="45" name="others_objects" width="48">Others' objects</radio_item>
+        <radio_item bottom_delta="0" left_delta="60" name="anyones_objects" width="48">Anyone's objects</radio_item>
       </radio_group>
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-        left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
-        width="80">
-Time format:
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-        height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-        tool_tip="Show hours in either 12-23 or 12PM-11PM format."
-        name="time_format_combobox" width="130">
-        <combo_item type="string" length="1" enabled="true" name="24hours" value="default">
-24-hour clock
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="12hours" value="default">
-12-hour clock
-        </combo_item>
+      <text bottom_delta="-18" left="10" follows="top" name="time_format_text_box">Time format:</text>
+      <combo_box bottom_delta="-5" left="90" follows="top" height="18" tool_tip="Show hours in either 12-23 or 12PM-11PM format." name="time_format_combobox" width="130">
+        <combo_item name="24hours" value="default">24-hour clock</combo_item>
+        <combo_item name="12hours" value="default">12-hour clock</combo_item>
       </combo_box>
-      <check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Seconds in chat/IMs timestamps" left="240"
-        mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
-        width="260" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-        left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
-        width="80">
-Date format:
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
-        height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
-        name="date_format_combobox" width="130">
-        <combo_item type="string" length="1" enabled="true" name="year_first" value="default">
-YYYY-MM-DD
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="day_first" value="default">
-DD/MM/YYYY
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="month_first" value="default">
-MM/DD/YYYY
-        </combo_item>
+      <check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInChatAndIMs" initial_value="false" label="Seconds in chat/IMs timestamps" name="seconds_in_chat_and_ims_check"/>
+      <text bottom_delta="-18" left="10" follows="top" name="date_format_text_box">Date format:</text>
+      <combo_box bottom_delta="-5" left="90" follows="top" height="18" name="date_format_combobox" width="130">
+        <combo_item name="year_first" value="default">YYYY-MM-DD</combo_item>
+        <combo_item name="day_first" value="default">DD/MM/YYYY</combo_item>
+        <combo_item name="month_first" value="default">MM/DD/YYYY</combo_item>
       </combo_box>
       <!-- Auto-responder -->
-      <view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
-        height="190" left="5" name="GraphicsBorder" width="485" />
-      <check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
-        name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
-        tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
-        name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
-        tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Autorespond to people you have muted" left_delta="0"
-        mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
-        width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
-        name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
-        initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
-        mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
-        width="170"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
-        name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
-      <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Send an item along with the response" left_delta="0"
-        mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
-        width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-        h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
-        name="text_box1" v_pad="0" width="430">
-Response Text:
-      </text>
-      <text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
-        mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
-      <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="18" left_delta="0" mouse_opaque="false"
-        name="text_box1" v_pad="0" width="430">
-Use #f for user's first name, #l for last name,
+      <view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
+      <check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Enable Autoresponse"
+        name="AscentInstantMessageResponseAnyone" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+	  <check_box bottom_delta="-20" follows="left|top" initial_value="false"
+		label="Autorespond to non-friends" name="AscentInstantMessageResponseFriends" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+	  <check_box bottom_delta="-20" follows="left|top" initial_value="false" 
+		label="Autorespond to people you have muted" name="AscentInstantMessageResponseMuted" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send as soon as they start typing" name="AscentInstantMessageShowOnTyping"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Don't show IMs you auto-responsed to" name="AscentInstantMessageShowResponded"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Autorespond to every message" name="AscentInstantMessageResponseRepeat"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send an item along with the response" name="AscentInstantMessageResponseItem" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
+	  <text bottom_delta="120" left_delta="245" follows="left|top" height="18" name="text_box1">Response Text:</text>
+      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true"/>
+      <text bottom_delta="-25" follows="left|top" height="18" name="text_box1">
+#f for user's first name, #l for last name,
 #t for timestamp, #r for SLURL to you,
 #i for your idle time. (e.g. "5 mins")
       </text>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Spam" name="Spam">
-      <check_box left="10" bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-        label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking"
-        height="18" width="100" radio_style="false" mouse_opaque="true"
-        name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
-        label="Chat count" label_width="70" name="AscChatSpamCount" control_name="SGChatSpamCount"
-        tool_tip="Number of items spammed per time set. (Default: 10)"/>
-      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime"
-        tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
-      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="" v_pad="0" width="100">
-seconds
-      </text>
-      <check_box left_delta="-150" enabled="true" follows="left|top" font="SansSerifSmall"
-        label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking"
-        height="16" width="100" radio_style="false" mouse_opaque="true"
-        name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
-      <check_box left_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-        label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking"
-        height="16" width="100" radio_style="false" mouse_opaque="true"
-        name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
-      <spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
-        label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount"
-        tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
-      <spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
-        decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime"
-        tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
-      <text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="" v_pad="0" width="100">
-seconds
-      </text>
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
+      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
+        label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
+      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
+        label="Chat count" label_width="70" tool_tip="Number of items spammed per time set. (Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
+      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
+      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">seconds</text>
+      <check_box left_delta="-150" height="16" follows="top" label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking" name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
+      <check_box height="16" follows="left|top" label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking" name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
+      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
+        label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount" tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
+      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime" tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
+      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="">seconds</text>
     </panel>
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
-      left="1" mouse_opaque="true" name="TextOptions" width="418">
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
-        control_name="SpellDisplay" width="126"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16" left="12"
-        name="EmSpell_txt1" width="512">
-Current language (dictionary):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-        max_chars="200" mouse_opaque="true" name="SpellBase" width="250"
-        control_name="SpellBase" tool_tip=""/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-        name="EmSpell_txt3" width="512">
-Downloaded languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-        max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
-        control_name="EmSpell_Avail" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
-        name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
-        name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-        name="EmSpell_txt2" width="512">
-Additional custom languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
-        max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
-        control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
-        name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" label="Edit Custom dictionary"
-        name="EmSpell_EditCustom" tool_tip="" left="12" width="250"/>
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
-        name="EmSpell_txt4" width="512">
+    <panel border="true" bottom="-580" height="525" label="Text Options" left="1" name="TextOptions" width="418">
+      <check_box bottom="-25" left="12" height="16" label="Show misspelled words in red" name="SpellDisplay" control_name="SpellDisplay"/>
+      <text bottom_delta="-24" follows="left|top" height="16" name="EmSpell_txt1">Current language (dictionary):</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="SpellBase" width="250" control_name="SpellBase"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt3">Downloaded languages (dictionaries):</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Avail" width="250" control_name="EmSpell_Avail"/>
+      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Install" name="EmSpell_Add" tool_tip="" width="80"/>
+      <button bottom_delta="-22" left="12" follows="top" height="20" label="Download More..." name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" width="250"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt2">Additional custom languages (dictionaries):</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Installed" width="250" control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Remove" name="EmSpell_Remove" tool_tip="" width="80"/>
+      <button bottom_delta="-20" left="12" follows="top" height="20" label="Edit Custom dictionary" name="EmSpell_EditCustom" width="250"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt4">
 To use spellcheck, right-click a misspelled word
 (red or otherwise) and select its replacement
       </text>
 
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top|left" height="0"
-        left="5" name="CmdDivisor" width="356"/>
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top" height="0" left="5" name="CmdDivisor" width="356"/>
 
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Highlight messages if any of them contain the terms" left="5" mouse_opaque="true"
-        name="KeywordsOn" radio_style="false" width="270"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
-        name="keyword_txt1" width="512">
-(separated by commas)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="KeywordsList" width="300" />
-      <text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
-        width="100">Is found within:</text>
-      <check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="KeywordsInChat" radio_style="false" width="270"/>
-      <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="KeywordsInIM" radio_style="false" width="270"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="KeywordsChangeColor"
-        radio_style="false" width="270"/>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
-        color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210" mouse_opaque="true"
-        name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
-      <check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="KeywordsPlaySound"
-        radio_style="false" width="270"/>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="KeywordsSound" width="300" />
+      <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+        label="Highlight messages if any of them contain the terms" name="KeywordsOn" width="270"/>
+      <text bottom_delta="-20" follows="top" height="20" left="12" name="keyword_txt1">(separated by commas)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" left_delta="5" max_length="500" name="KeywordsList" width="300"/>
+      <text bottom_delta="-24" follows="top" height="20" left_delta="15" name="EmKeyw">Is found within:</text>
+      <check_box bottom_delta="3" follows="top" height="16" left_delta="100" label="Local Chat Floater" name="KeywordsInChat"/>
+      <check_box bottom_delta="-15" follows="left|top" height="16" label="Instant Message Floater" name="KeywordsInIM"/>
+      <check_box bottom_delta="-24" follows="top" height="16" label="Highlight the message in this color:" left_delta="-110" name="KeywordsChangeColor"/>
+      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top" height="35" left_delta="210" name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
+      <check_box bottom_delta="-10" follows="top" height="16" left_delta="-210" label="Play this sound alert: (UUID)" name="KeywordsPlaySound"/>
+      <line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/>
     </panel>
 
   </tab_container>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index b309fb986..387517415 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -1,320 +1,100 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-  border="true" label="System" name="ascsys" enabled="true" mouse_opaque="true">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-    name="Ascent System" tab_min_width="70" tab_position="top">
+<panel top="20" left="10" height="400" width="517" border="true" label="System" name="ascsys">
+  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0" name="Ascent System" tab_min_width="70" tab_position="top">
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="General" name="User Interface">
-      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Enable teleporting via double-click in-world" left="10"
-        tool_tip="Double-clicking on an object/person will teleport you to that location."
-        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Reset camera after teleporting" left="20"
-        tool_tip="Centers the camera behind you after a local teleport."
-        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Offset TP target by half agent height" left="20"
-        tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for."
-        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Preview animations on the avatar instead on a dummy before uploading" left="10"
-        tool_tip="The Animation upload window will play animations on your avatar when previewing them."
-        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
-        tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object."
-        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Always rez objects as land group when available" left="10"
-        tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag."
-        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Always show Build as enabled" left="10"
-        tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there."
-        mouse_opaque="true" name="always_build_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Always allow Fly" left="10"
-        tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
-        mouse_opaque="true" name="always_fly_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Disable camera minimum distance" left="10"
-        tool_tip="Allows the camera to get reeeaaally close to things."
-        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Enable Power User functionality" left="10"
-        tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
-        mouse_opaque="true" name="power_user_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Confirm Power User functionality" left="20"
-        tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
-        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Enable Ascent System Inventory (Requires Restart)" left="10"
-        tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets."
-        mouse_opaque="true" name="system_folder_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Temporary uploads go in the System Asset folder." left="20"
-        tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
-        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Automatically fetch the inventory in the background after login" left="10"
-        tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search."
-        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Enable Wind Effects" left="10"
-        mouse_opaque="true" name="enable_wind" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Enable Clouds" left="10"
-        mouse_opaque="true" name="enable_clouds" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Enable Classic Clouds" left="10"
-        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Enable speed-rezzing via draw distance stepping" left="10"
-        mouse_opaque="true" name="speed_rez_check" radio_style="false"
-        tool_tip="When active, this will progressively increase your draw distance, which allows closer objects/people to rez first."
-        width="400" />
-      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
-        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
-        label="Draw distance stepping interval:" label_width="180"
-        max_val="60" min_val="5" initial_val="20" increment="5"
-        mouse_opaque="true" name="speed_rez_interval" />
-      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
-seconds
-      </text>
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="General" name="User Interface">
+      <check_box left="10" bottom_delta="-25" control_name="DoubleClickTeleport" follows="top" initial_value="false"
+        label="Enable teleporting via double-click in-world" tool_tip="Double-clicking on an object/person will teleport you to that location." name="double_click_teleport_check"/>
+	<check_box left="20" bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" follows="top" initial_value="false"
+		label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
+      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
+      <check_box left="10" bottom_delta="-20" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
+        label="Preview animations on the avatar instead on a dummy before uploading" tool_tip="The Animation upload window will play animations on your avatar when previewing them." name="preview_anim_in_world_check"/>
+      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" follows="left|top" initial_value="true"
+        label="Save scripts in inventory as Mono scripts instead of LSL2" tool_tip="Scripts will automatically be compiled in Mono when saving - Usually only possible when placed in an object." name="save_scripts_as_mono_check"/>
+      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" follows="left|top" initial_value="true"
+        label="Always rez objects as land group when available" tool_tip="Rez objects with the same group that the object is being rezzed on has, regardless of your active tag." name="always_rez_in_group_check"/>
+      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" follows="left|top" initial_value="true"
+        label="Always show Build as enabled" tool_tip="Allows you to use the Build menu without having to be tricky about it. May not mean you can actually build there." name="always_build_check"/>
+      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" follows="left|top" initial_value="true"
+        label="Always allow Fly" tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should." name="always_fly_check"/>
+      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" follows="left|top" initial_value="true"
+        label="Disable camera minimum distance" tool_tip="Allows the camera to get reeeaaally close to things." name="disable_camera_zoom_check"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="true"
+        label="Enable Power User functionality" tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well." name="power_user_check"/>
+      <check_box bottom_delta="-20" enabled="true" follows="top" left="20" initial_value="true"
+        label="Confirm Power User functionality" tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Singularity devs won't replace anything you break. We recommend having a backup copy of anything to be victim to these powers. Unlike most checkboxes, you must click Apply or OK before this will activate." name="power_user_confirm_check"/>
+      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" follows="top" left="10" initial_value="true"
+        label="Enable Ascent System Inventory (Requires Restart)" tool_tip="Creates a new folder in the inventory for storing settings files and non-permanent assets." name="system_folder_check"/>
+      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" follows="top" left="20" initial_value="false"
+        label="Temporary uploads go in the System Asset folder." tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find." name="temp_in_system_check"/>
+      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" follows="top" left="10" initial_value="true"
+        label="Automatically fetch the inventory in the background after login" tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search." name="fetch_inventory_on_login_check"/>
+      <check_box bottom_delta="-20" control_name="WindEnabled" follows="left|top" initial_value="false" label="Enable Wind Effects" name="enable_wind"/>
+      <check_box bottom_delta="-20" control_name="CloudsEnabled" follows="left|top" initial_value="true" label="Enable Clouds" name="enable_clouds"/>
+      <check_box bottom_delta="-20" left_delta="10" control_name="SkyUseClassicClouds" follows="top" initial_value="true" label="Enable Classic Clouds" name="enable_classic_clouds"/>
+      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" follows="top" initial_value="false" label="Enable speed-rezzing via draw distance stepping" name="speed_rez_check" tool_tip="When active, this will progressively increase your draw distance, which allows closer objects/people to rez first."/>
+      <spinner bottom_delta="-20" left="30" control_name="SpeedRezInterval" decimal_digits="0" follows="top" height="16" width="230"
+        label="Draw distance stepping interval:" label_width="180" max_val="60" min_val="5" initial_val="20" increment="5" name="speed_rez_interval" />
+      <text bottom_delta="0" left_delta="235" follows="left|top" height="16" name="speed_rez_seconds">seconds</text>
     </panel>
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line"
-      left="1" mouse_opaque="true" name="Command Line" width="418">
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Enable usage of chat bar as a command line" left="10"
-        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
-        control_name="AscentCmdLine"/>
-      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_2" width="512">
-Teleport within sim (usage: cmd x y z)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLinePos" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_3" width="512">
-Teleport to ground (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineGround" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_4" width="512">
-Teleport to altitude (usage: cmd z)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineHeight" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_5" width="512">
-Teleport home (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_6" width="512">
-Rez a platform (usage: cmd 0 - 30)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
-      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
-        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-        initial_val="5" label="Default width:" label_width="75" max_val="30" min_val="5"
-        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_8" width="512">
-Calc. expressions (usage: cmd 2 + 2)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineCalc" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_15" width="512">
-Clear the chat history (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
-        name="AscentCmdLineClearChat" width="200"/>
+    <panel border="true" bottom="-580" height="525" label="Command Line" left="1" name="Command Line" width="418">
+      <check_box bottom="-25" left="10" follows="top" initial_value="false" label="Enable usage of chat bar as a command line" name="chat_cmd_toggle" control_name="AscentCmdLine"/>
+      <text bottom_delta="-22" follows="top" height="16" left_delta="10" name="cmd_line_text_2">Teleport within sim (usage: cmd x y z)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLinePos" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" left_delta="0" name="cmd_line_text_3">Teleport to ground (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineGround" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_4" width="512">Teleport to altitude (usage: cmd z)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineHeight" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_5" width="512">Teleport home (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineTeleportHome" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_6">Rez a platform (usage: cmd 0 - 30)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineRezPlatform" width="200"/>
+      <slider bottom_delta="-22" name="AscentPlatformSize" control_name="AscentPlatformSize" decimal_digits="1" follows="top" height="18" increment="0.5"
+        initial_val="5" label="Default width:" label_width="75" max_val="30" min_val="5" width="205" tool_tip="How big do you want the platform to be?"/>
+      <text bottom_delta="-20" follows="top" height="16" name="cmd_line_text_8">Calc. expressions (usage: cmd 2 + 2)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineCalc" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_15">Clear the chat history (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="AscentCmdLineClearChat" width="200"/>
       <!-- Column Split -->
       <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
         left="230" name="CmdDivisor" width="0"/>
-      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_9" width="512">
-Change Draw Distance (usage: cmd meters)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_10" width="512">
-Teleport to cam position (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_11" width="512">
-Get avatar name from key (usage: cmd key)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_12" width="512">
-Offer teleport to avatar (usage: cmd key)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_7" width="512">
-Teleport to sim x (usage: cmd simname)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
-        name="map_to_keep_pos" radio_style="false" width="270"
-        control_name="AscentMapToKeepPos"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_13" width="512">
-Teleport to avatar (usage: cmd name)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
-        name="AscentCmdLineTP2" width="200"/>
+      <text bottom_delta="277" follows="top" height="16" left_delta="10" name="cmd_line_text_9">Change Draw Distance (usage: cmd meters)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineDrawDistance" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_10">Teleport to cam position (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdTeleportToCam" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_11">Get avatar name from key (usage: cmd key)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineKeyToName" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_12">Offer teleport to avatar (usage: cmd key)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineOfferTp" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_7">Teleport to sim x (usage: cmd simname)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="AscentCmdLineMapTo" width="200"/>
+      <check_box bottom_delta="-24" follows="top" initial_value="false" label="Use same position between sims" name="map_to_keep_pos" control_name="AscentMapToKeepPos"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_13">Teleport to avatar (usage: cmd name)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open." name="AscentCmdLineTP2" width="200"/>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Security" name="Security">
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Broadcast Viewer Effects (Does not include beams)" left="10"
-        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Disable Point At And Beam" left="10"
-        tool_tip="Don't point at or show your edit beam when selecting an object."
-        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Do not Look At objects (defeats ShowLookAt)" left="10"
-        tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
-        mouse_opaque="true" name="private_look_at_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Show others' LookAt beacons" left="10"
-        tool_tip="Shows you where others are looking."
-        mouse_opaque="true" name="show_look_at_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
-        tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
-        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Disable click-to-sit objects" left="10"
-        tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture."
-        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Display Total Script Count changes:" left_delta="0"
-        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
-        control_name="AscentDisplayTotalScriptJumps"
-        tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
-      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
-        label="" label_width="0" digits="4" left_delta="210" max_val="9999"
-        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
-        tool_tip="Threshold for the script jump message [Default: 100]"/>
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Security" name="Security">
+      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" follows="top" initial_value="true" label="Broadcast Viewer Effects (Does not include beams)" left="10" name="broadcast_viewer_effects" width="400"/>
+      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" follows="top" initial_value="true" label="Disable Point At And Beam" tool_tip="Don't point at or show your edit beam when selecting an object." name="disable_point_at_and_beams_check"/>
+      <check_box bottom_delta="-20" control_name="PrivateLookAt" follows="top" initial_value="false" label="Do not Look At objects (defeats ShowLookAt)" tool_tip="Turns off broadcasting headturns and lookat beacons for yourself." name="private_look_at_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowLookAt" follows="top" initial_value="false" label="Show others' LookAt beacons" tool_tip="Shows you where others are looking." name="show_look_at_check"/>
+      <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" follows="top" initial_value="false" label="On standing up, revoke perms for the object your avatar was sitting on" tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately." name="revoke_perms_on_stand_up_check"/>
+      <check_box bottom_delta="-20" control_name="DisableClickSit" follows="top" initial_value="false" label="Disable click-to-sit objects" tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture." name="disable_click_sit_check"/>
+      <check_box bottom_delta="-20" follows="top" initial_value="false" label="Display Total Script Count changes:" name="totalscriptjumps" control_name="AscentDisplayTotalScriptJumps" tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
+      <spinner bottom_delta="0" decimal_digits="0" follows="top" height="16" increment="1" left_delta="210" max_val="9999" min_val="1" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff" tool_tip="Threshold for the script jump message [Default: 100]"/>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Building" name="Building">
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-        h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
-        name="text_box6" v_pad="0" width="150">
-Pivot Point
-      </text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
-        min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-        min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-        min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Values are percent" left_delta="-5" mouse_opaque="true"
-        tool_tip="Default settings are Percentages and every axis set at 50"
-        name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
-      <check_box bottom_delta="60" enabled="false" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
-        mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
-        radio_style="false" width="270"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Show axis arrow on root prim position" left_delta="0"
-        mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
-        name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
-        radio_style="false" width="270"/>
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Building" name="Building">
+      <text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Pivot Point</text>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X pos" label_width="40" left="10" max_val="256" min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y pos" label_width="40" max_val="256" min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
+      <check_box bottom_delta="-20" follows="top" label="Values are percent" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
+      <check_box bottom_delta="60" follows="top" label="Enable highlighting of selected prims" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"/>
+      <check_box bottom_delta="-20" follows="top" initial_value="false" label="Show axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
     </panel>
 
   </tab_container>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 3fa5076b1..78bb0070e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -1,467 +1,102 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-439" enabled="true" follows="left|top|right|bottom"
-     height="438" label="Graphics" left="102" mouse_opaque="true"
-     name="Display panel" width="517">
-	<button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
-	     left="470" name="GraphicsPreferencesHelpButton" width="22" />
-	<check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Run viewer in a window" left="10" mouse_opaque="true"
-	     name="windowed mode" radio_style="false" width="120" />
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
-	     embedded_items="false" enabled="false" follows="left|top"
-	     font="SansSerifSmall" height="20" hide_border="true"
-	     hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
-	     name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
-		If unchecked, viewer will display full-screen when logged in.
-	</text_editor>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="WindowSizeLabel" v_pad="0" width="128">
-		Window Size:
-	</text>
-	<combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
-	     height="18" left="185" max_chars="20" mouse_opaque="true"
-	     name="windowsize combo" width="150">
-		<combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
-			800x600
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
-			720x480 (NTSC)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576">
-			768x576 (PAL)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
-			1024x768
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
-			1280x720 (HDV720)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
-			1440x1080 (HDV1080)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
-			1920x1080 (HD1080)
-		</combo_item>
-		
+<panel border="true" bottom="-439" height="438" label="Graphics" left="102" name="Display panel" width="517">
+	<button bottom="-22" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
+	<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
+	<text bottom="-62" height="12" left="10" name="WindowSizeLabel">Window Size:</text>
+	<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
+		<combo_item name="800x600" value="800 x 600">800x600</combo_item>
+		<combo_item name="720x480" value="720 x 480">720x480 (NTSC)</combo_item>
+		<combo_item name="768x576" value="768 x 576">768x576 (PAL)</combo_item>
+		<combo_item name="1024x768" value="1024 x 768">1024x768</combo_item>
+		<combo_item name="1280x720" value="1280 x 720">1280x720 (HDV720)</combo_item>
+		<combo_item name="1440x1080" value="1440 x 1080">1440x1080 (HDV1080)</combo_item>
+		<combo_item name="1920x1080" value="1920 x 1080">1920x1080 (HD1080)</combo_item>
 	</combo_box>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
-		Display Resolution:
-	</text>
-	<combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
-	     height="18" left="185" max_chars="20" mouse_opaque="true"
-	     name="fullscreen combo" width="150" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="10" mouse_opaque="true" name="AspectRatioLabel1"
-	     tool_tip="width / height" v_pad="0" width="160">
-		Aspect Ratio:
-	</text>
-	<combo_box allow_text_entry="true" bottom="-43" enabled="true" follows="left|top"
-	     height="16" left="185" max_chars="100" mouse_opaque="true"
-	     name="aspect_ratio" tool_tip="width / height" width="150">
-		<combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
-			4:3 (Standard CRT)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="5:4(1280x1024LCD)" value="1.25">
-			5:4 (1280x1024 LCD)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="8:5(Widescreen)" value="1.6">
-			16:10 (Widescreen PC)
-		</combo_item>
-		<combo_item type="string" length="1" enabled="true" name="16:9(Widescreen)" value="1.7777777">
-			16:9 (Widescreen TV)
-		</combo_item>
+	<text bottom="-62" height="12" left="10" name="DisplayResLabel">Display Resolution:</text>
+	<combo_box bottom="-67"	height="18" left="165" name="fullscreen combo" width="150"/>
+	<text bottom="-39" height="12" left="10" name="AspectRatioLabel1">Aspect Ratio:</text>
+	<combo_box bottom="-43"	height="16" left="165" name="aspect_ratio" width="150" tool_tip="width / height">
+		<combo_item name="4:3(StandardCRT)" value="1.333333">4:3 (Standard CRT)</combo_item>
+		<combo_item name="5:4(1280x1024LCD)" value="1.25">5:4 (1280x1024 LCD)</combo_item>
+		<combo_item name="8:5(Widescreen)" value="1.6">16:10 (Widescreen PC)</combo_item>
+		<combo_item name="16:9(Widescreen)" value="1.7777777">16:9 (Widescreen TV)</combo_item>
 	</combo_box>
-	<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Auto-detect ratio" left="358" mouse_opaque="true"
-	     name="aspect_auto_detect" radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
-		Quality and
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left_delta="0" mouse_opaque="true"
-	     name="QualityText" v_pad="0" width="95">
-		Performance:
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
-		Faster
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
-		Low
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left_delta="47" mouse_opaque="true"
-	     name="ShadersPrefText2" v_pad="0" width="40">
-		Mid
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left_delta="47" mouse_opaque="true"
-	     name="ShadersPrefText3" v_pad="0" width="40">
-		High
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left_delta="47" mouse_opaque="true"
-	     name="ShadersPrefText4" v_pad="0" width="40">
-		Ultra
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
-		Higher
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left_delta="0" mouse_opaque="true"
-	     name="QualityText2" v_pad="0" width="95">
-		Quality
-	</text>
-	<icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-	     image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
-	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-	     image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
-	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-	     image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
-	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-	     image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
-	     width="2" />
-	<slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="0" label="" label_width="0"
-	     left="165" max_val="3" min_val="0" mouse_opaque="true"
-	     name="QualityPerformanceSelection" show_text="false" width="150" />
-	<check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Custom" left="385" mouse_opaque="true"
-	     name="CustomSettings" radio_style="false" width="256" />
-	<view_border bevel_style="none" border_thickness="1" bottom="-395" follows="top|left"
-	     height="280" left="5" name="GraphicsBorder" width="485" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
-		Shaders:
-	</text>
-	<check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true"
-	     label="Bump Mapping and Shiny" left="10" mouse_opaque="true"
-	     name="BumpShiny" radio_style="false" width="256" />
-	<check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Basic Shaders" left_delta="0"
-	     mouse_opaque="true" name="BasicShaders" radio_style="false"
-	     tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
-	     width="315" />
-	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Atmospheric Shaders" left_delta="0"
-	     mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
-	     width="256" />
-	<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Deferred Shading" left_delta="0"
-	     mouse_opaque="true" name="RenderDeferred" radio_style="false"
-	     width="256" />
-  <check_box bottom_delta="-17" control_name="RenderDepthOfField" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Depth of Field" left_delta="0"
-	     mouse_opaque="true" name="RenderDepthOfField" radio_style="false"
-	     width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
-	     width="128">
-		Water Reflections:
-	</text>
-	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
-		 left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
-    <combo_item type="string" length="1" name="0" value="0">
-      Disabled
-    </combo_item>
-		<combo_item type="string" length="1" name="1" value="1">
-			Terrain and Trees
-		</combo_item>
-		<combo_item type="string" length="1" name="2" value="2">
-			All Static Objects
-		</combo_item>
-		<combo_item type="string" length="1" name="3" value="3">
-			All Avatars and Objects
-		</combo_item>
-		<combo_item type="string" length="1" name="4" value="4">
-			Everything
-		</combo_item>
+	<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="358" name="aspect_auto_detect" width="256"/>
+	<text bottom="-91"  height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
+	<text bottom="-91"  height="12" left="135" name="FasterText">Faster</text>
+	<text bottom="-107" height="12" left_delta="23" name="ShadersPrefText">Low</text>
+	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText2">Mid</text>
+	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText3">High</text>
+	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
+	<text bottom="-91"  height="12"	left_delta="14" name="QualityText2">Higher Quality</text>
+<!-- Are these icons really necessary? 
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
+-->
+	<slider bottom="-91" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
+	<check_box bottom="-96" control_name="RenderCustomSettings" label="Custom" left="395" name="CustomSettings"/>
+	<view_border bevel_style="none" bottom="-395" height="280" left="5" width="485"/>
+	<text bottom="-130" height="12" left="10" name="ShadersText">Shaders:</text>
+	<check_box bottom_delta="-23" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump Mapping and Shiny" left="10" name="BumpShiny"/>
+	<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic Shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
+	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" initial_value="true" label="Atmospheric Shaders" left_delta="0" name="WindLightUseAtmosShaders"/>
+	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Deferred Shading" left_delta="0" name="RenderDeferred"/>
+	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
+	<text bottom_delta="-17" height="12" left="15" name="ReflectionDetailText">Water Reflections:</text>
+	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" label="Reflection Detail" left_delta="-2" name="ReflectionDetailCombo" width="160" height="16">
+		<combo_item name="0" value="0">Disabled</combo_item>
+		<combo_item name="1" value="1">Terrain and Trees</combo_item>
+		<combo_item name="2" value="2">All Static Objects</combo_item>
+		<combo_item name="3" value="3">All Avatars and Objects</combo_item>
+		<combo_item name="4" value="4">Everything</combo_item>
 	</combo_box>
-
-	<!--radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
-	     enabled="true" follows="left|top" height="70"
-	     left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
-	     width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="0" width="315">
-			Terrain and Trees
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="1" width="315">
-			All Static Objects
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="2" width="315">
-			All Avatars and Objects
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="3" width="315">
-			Everything
-		</radio_item>
-	</radio_group-->
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
-	     width="128">
-    Deferred Shadows:
-  </text>
-  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
-		 left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
-    <combo_item type="string" length="1" name="0" value="0">
-      Disabled
-    </combo_item>
-    <combo_item type="string" length="1" name="1" value="1">
-      Sun shadows
-    </combo_item>
-    <combo_item type="string" length="1" name="2" value="2">
-      Sun and spotlight shadows
-    </combo_item>
+  <text bottom_delta="-17" height="12" left="15" name="ShadowDetailText">Deferred Shadows:</text>
+  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" label="Shadow Detail" left_delta="-2" name="ShadowDetailCombo" width="160" height="16">
+	  <combo_item name="0" value="0">Disabled</combo_item>
+	  <combo_item name="1" value="1">Sun shadows</combo_item>
+	  <combo_item name="2" value="2">Sun and spotlight shadows</combo_item>
   </combo_box>
-  
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-	     mouse_opaque="true" name="AvatarRenderingText" v_pad="0" width="128">
-		Avatar Rendering:
-	</text>
-	<check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Avatar Impostors" left_delta="0" mouse_opaque="true"
-	     name="AvatarImpostors" radio_style="false" width="256" />
-	<slider bottom_delta="-17" can_edit_text="false" control_name="RenderAvatarMaxVisible"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="35" label="Max non-impostors"
-	     label_width="100" left_delta="8" max_val="50" min_val="1" mouse_opaque="true"
-	     name="AvatarMaxVisible" show_text="true" width="195" />
-	<check_box bottom_delta="-20" control_name="RenderAvatarVP" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Hardware Skinning" left="10" mouse_opaque="true"
-	     name="AvatarVertexProgram" radio_style="false" width="256" />
-	<check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-	     label="Avatar Cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
-	     radio_style="false" width="256" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
-	     width="128">
-		m
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-	     width="128">
-		m
-	</text>
-	<slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="8" initial_val="160" label="Draw Distance:"
-	     label_width="140" left="215" max_val="1024" min_val="64" mouse_opaque="true"
-	     name="DrawDistance" show_text="true" width="255" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="256" initial_val="4096"
-	     label="Max. Particle Count:" label_width="140" left_delta="0"
-	     max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
-	     show_text="true" width="262" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="8" label="Post Process Quality:"
-	     label_width="140" left_delta="0" max_val="9" min_val="8"
-	     mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left="215" mouse_opaque="true" name="MeshDetailText" v_pad="0"
-	     width="128">
-		Mesh Detail:
-	</text>
-	<slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.125" initial_val="160" label="  Objects:"
-	     label_width="140" left_delta="0" max_val="2" min_val="0"
-	     mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.1" initial_val="160" label="  Flexiprims:"
-	     label_width="140" left_delta="0" max_val="1" min_val="0"
-	     mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.125" initial_val="160" label="  Trees:"
-	     label_width="140" left_delta="0" max_val="1" min_val="0"
-	     mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.125" initial_val="160" label="  Avatars:"
-	     label_width="140" left_delta="0" max_val="1" min_val="0"
-	     mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarPhysicsLODFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.1" initial_val="160" label="  Avatar Physics:"
-	     label_width="140" left_delta="0" max_val="1" min_val="0"
-	     mouse_opaque="true" name="AvatarPhysicsDetail" show_text="false" width="223" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
-	     decimal_digits="3" enabled="true" follows="left|top" height="16"
-	     increment="0.125" initial_val="160" label="  Terrain:"
-	     label_width="140" left_delta="0" max_val="2" min_val="1"
-	     mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
-	<slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="8" initial_val="160" label="  Sky:"
-	     label_width="140" left_delta="0" max_val="128" min_val="16"
-	     mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
-		Low
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
-	     width="128">
-		Low
-	</text>
-	<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="12" left_delta="0" mouse_opaque="true"
-	     name="FlexibleMeshDetailText" v_pad="0" width="128">
-		Low
-	</text>
-	<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="12" left_delta="0" mouse_opaque="true"
-	     name="TreeMeshDetailText" v_pad="0" width="128">
-		Low
-	</text>
-	<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="12" left_delta="0" mouse_opaque="true"
-	     name="AvatarMeshDetailText" v_pad="0" width="128">
-		Low
-	</text>
-  <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="12" left_delta="0" mouse_opaque="true"
-	     name="AvatarPhysicsDetailText" v_pad="0" width="128">
-    Off
-  </text>
-	<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="12" left_delta="0" mouse_opaque="true"
-	     name="TerrainMeshDetailText" v_pad="0" width="128">
-		Low
-	</text>
-	<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="12" left_delta="0" mouse_opaque="true"
-	     name="SkyMeshDetailText" v_pad="0" width="128">
-		Low
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="215" mouse_opaque="true" name="LightingDetailText" v_pad="0"
-	     width="128">
-		Lighting Detail:
-	</text>
-	<radio_group bottom_delta="-43" control_name="RenderLocalLights" draw_border="false"
-	     enabled="true" follows="left|top" height="38" left_delta="0"
-	     mouse_opaque="true" name="LightingDetailRadio" width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="SunMoon" width="156">
-			Sun and moon only
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="LocalLights" width="156">
-			Nearby local lights
-		</radio_item>
-	</radio_group>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="370"
-	     mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
-		Terrain Detail:
-	</text>
-	<radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
-	     enabled="true" follows="left|top" height="38" left_delta="0"
-	     mouse_opaque="true" name="TerrainDetailRadio" width="321">
-		<radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="0" width="315">
-			Low
-		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-		     left="3" mouse_opaque="true" name="2" width="315">
-			High
-		</radio_item>
-	</radio_group>
-	<button bottom="-430" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Recommended Settings" left="130" mouse_opaque="true"
-	     name="Defaults" scale_image="true" width="170" />
-	<button bottom="-430" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Hardware Options" label_selected="Hardware Options"
-	     left="310" mouse_opaque="true" name="GraphicsHardwareButton"
-	     scale_image="true" width="170" />
-	<string name="resolution_format">
-		[RES_X] x [RES_Y]
-	</string>
-	<string name="aspect_ratio_text">
-		[NUM]:[DEN]
-	</string>
+
+  <text bottom="-317" height="12" left="10">Avatar Rendering:</text>
+  <check_box bottom_delta="-18" control_name="RenderUseImpostors" initial_value="true" label="Avatar Impostors" left_delta="0" name="AvatarImpostors"/>
+  <slider bottom_delta="-12" control_name="RenderAvatarMaxVisible" 	  	 decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="100" left_delta="8" max_val="50" min_val="1" name="AvatarMaxVisible" width="195"/>
+  <check_box bottom_delta="-22" control_name="RenderAvatarVP" initial_value="true" label="Hardware Skinning" left="10" name="AvatarVertexProgram"/>
+  <check_box bottom_delta="-17" control_name="RenderAvatarCloth" initial_value="true" label="Avatar Cloth" left_delta="0" name="AvatarCloth"/>
+  <!--text bottom="-131" height="12" left="464">m</text-->
+  <text bottom="-131" height="12" left="470">m</text>
+  <slider bottom="-135"      control_name="RenderFarClip"	  	  		  decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" left="215" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
+  <slider bottom_delta="-16" control_name="RenderMaxPartCount"	  		  decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101" left_delta="0"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
+  <slider bottom_delta="-20" control_name="RenderGlowResolutionPow" 	  decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" left_delta="0" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
+  <text bottom_delta="-17" height="12" left="215" width="128" name="MeshDetailText">Mesh Detail:</text>
+  <slider bottom_delta="-18" control_name="RenderVolumeLODFactor" 		  decimal_digits="3" increment="0.125" initial_val="160" label="  Objects:" label_width="79" left_delta="0" max_val="2" min_val="0" name="ObjectMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderFlexTimeFactor"  		  decimal_digits="3" increment="0.1" initial_val="160" label="  Flexiprims:" label_width="79" left_delta="0" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	  		  decimal_digits="3" increment="0.125" initial_val="160" label="  Trees:" label_width="79" left_delta="0" max_val="1" min_val="0" name="TreeMeshDetail"   show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" 		  decimal_digits="3" increment="0.125" initial_val="160" label="  Avatars:" label_width="79" left_delta="0" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderAvatarPhysicsLODFactor"  decimal_digits="3" increment="0.1" initial_val="160" label="  Avatar Physics:" label_width="79" left_delta="0" max_val="1" min_val="0"	   name="AvatarPhysicsDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderTerrainLODFactor"  	  decimal_digits="3" increment="0.125" initial_val="160" label="  Terrain:" label_width="79" left_delta="0" max_val="2" min_val="1"	   name="TerrainMeshDetail"   show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="WLSkyDetail"			  		  decimal_digits="0" increment="8" initial_val="160" label="  Sky:" label_width="79" left_delta="0" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
+  <text bottom="-172" height="12" left="444" name="PostProcessText">Low</text>
+  <text bottom_delta="-38" height="12" left_delta="0" name="ObjectMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="FlexibleMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="TreeMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="AvatarMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="AvatarPhysicsDetailText">Off</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="TerrainMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" left_delta="0" name="SkyMeshDetailText">Low</text>
+  <text bottom="-354"	   height="12" left="215" 	  name="LightingDetailText">Lighting Detail:</text>
+  <radio_group bottom_delta="-40" control_name="RenderLocalLights" draw_border="false" height="38" left_delta="0" name="LightingDetailRadio" width="321">
+	  <radio_item bottom="-15" height="16" left="3" name="SunMoon" width="156">Sun and moon only</radio_item>
+	  <radio_item bottom="-31" height="16" left="3" name="LocalLights" width="156">Nearby local lights</radio_item>
+  </radio_group>
+  <text bottom="-354" height="12" left="370">Terrain Detail:</text>
+  <radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" left_delta="0"	name="TerrainDetailRadio" width="321">
+	  <radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
+	  <radio_item bottom="-31" height="16" left="3" name="2" width="315">High</radio_item>
+  </radio_group>
+  <button bottom="-430" font="SansSerif" height="20" label="Recommended Settings" left="130" name="Defaults" scale_image="true" width="170"/>
+  <button bottom="-430" font="SansSerif" height="20" label="Hardware Options" 	  left="310" name="GraphicsHardwareButton" scale_image="true" width="170"/>
+  <string name="resolution_format">[RES_X] x [RES_Y]</string>
+  <string name="aspect_ratio_text">[NUM]:[DEN]</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 4af729364..eeb498902 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -20,6 +20,10 @@
 	<check_box bottom_delta="-18" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
 	     mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
+	<check_box bottom_delta="-20" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
+	     radio_style="false" width="256" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -73,16 +77,6 @@
 	     label="Unsit Avatar on Camera Reset" left="148" mouse_opaque="true"
 	     name="unsit_on_camera_reset" radio_style="false"
 	     tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode" width="242" />
-  <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="12" left="10"
-	     mouse_opaque="true" name="text2" v_pad="0" width="128">
-		Avatar Display Options:
-	</text>
-	<check_box bottom_delta="-4" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
-	     radio_style="false" width="256" />
 	<button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
 	     label="Joystick Setup" left_delta="0" mouse_opaque="true"
 	     name="joystick_setup_button" width="155" />
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index a75da0e9e..e72790169 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -2445,4 +2445,5 @@ osSetWindParam(string plugin, string param, float value)
 Sets value of param property for plugin module.
 (OpenSim only.)
   </string>
+  <string name="Unnamed">(Unnamed)</string>
 </strings>