diff --git a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
index 3b194a3927d3ddee608667cc6fec3b98e88a3dd6..2a3a82a39cd1d725887f63590d710a7a5d0a50ef 100644
--- a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -29,19 +29,139 @@
 				layout="topleft"
 				name="colortone_settings"
 				can_resize="false">
+				<!--LUT Control-->
 				<text
 					follows="left|top"
 					height="15"
 					left="10"
-					top_pad="4"
-					width="100"
+					top_pad="6"
+					width="60"
 					layout="topleft"
-					value="Image Processing" />
+					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
+					value="Active LUT:" />
+				<!--TODO: Make more flexible?-->
+				<combo_box
+					allow_text_entry="true"
+					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
+					control_name="RenderColorGradeLUT"
+					follows="left|top"
+					height="20"
+					layout="topleft"
+					right="-4"
+					max_chars="200"
+					name="colorlut_combo"
+					top_pad="-18"
+					width="265">
+					<combo_box.item
+						label="None"
+						name="lut_none"
+						value="" />
+					<combo_box.item
+						label="Neutral"
+						name="lut_neutral"
+						value="NeutralLUT.png" />
+					<combo_box.item
+						label="CrossProcess - Warm"
+						name="lut_xprocess_warm"
+						value="CrossWarm.png" />
+					<combo_box.item
+						label="CrossProcess - Cool"
+						name="lut_xprocess_cool"
+						value="CrossCool.png" />
+					<combo_box.item
+						label="Acid Trip"
+						name="lut_acidTrip"
+						value="AcidTrip.png" />
+					<combo_box.item
+						label="Battleblue"
+						name="lut_battleblue"
+						value="Battleblue.png" />
+					<combo_box.item
+						label="Crunchy"
+						name="lut_crunchy"
+						value="Crunchy.png" />
+					<combo_box.item
+						label="Dreary"
+						name="lut_dreary"
+						value="Dreary.png" />
+					<combo_box.item
+						label="Fall Painty"
+						name="lut_fallPainty"
+						value="FallPainty.png" />
+					<combo_box.item
+						label="Harshness"
+						name="lut_harshness"
+						value="Harshness.png" />
+					<combo_box.item
+						label="Nuked"
+						name="lut_nuked"
+						value="Nuked.png" />
+					<combo_box.item
+						label="OG Boy"
+						name="lut_ogBoy"
+						value="OGBoy.png" />
+					<combo_box.item
+						label="Old Photo"
+						name="lut_oldPhoto"
+						value="OldPhoto.png" />
+					<combo_box.item
+						label="Pastel Dreams"
+						name="lut_pastelDreams"
+						value="PastelDreams.png" />
+					<combo_box.item
+						label="Purple Haze"
+						name="lut_purpleHaze"
+						value="PurpleHaze.png" />
+					<combo_box.item
+						label="Sickly Blue"
+						name="lut_sicklyBlue"
+						value="SicklyBlue.png" />
+					<combo_box.item
+						label="Sinner 1"
+						name="lut_sinner1"
+						value="Sinner.png" />
+					<combo_box.item
+						label="Sinner 2"
+						name="lut_sinner2"
+						value="Sinner2.png" />
+					<combo_box.item
+						label="Tealness"
+						name="lut_tealness"
+						value="Tealness.png" />
+					<combo_box.item
+						label="Toonland"
+						name="lut_toonland"
+						value="Toonland.png" />
+					<combo_box.item
+						label="Warm"
+						name="lut_warm"
+						value="Warm.png" />
+					<combo_box.item
+						label="A E S T H E T I C S  1"
+						name="lut_AST1"
+						value="AESTHETICS_1.png" />
+					<combo_box.item
+						label="A E S T H E T I C S  2"
+						name="lut_AST2"
+						value="AESTHETICS_2.png" />
+					<combo_box.item
+						label="A E S T H E T I C S  3"
+						name="lut_AST3"
+						value="AESTHETICS_3.png" />
+					<combo_box.item
+						label="A E S T H E T I C S  4"
+						name="lut_AST4"
+						value="AESTHETICS_4.png" />
+					<combo_box.item
+						label="A E S T H E T I C S  5"
+						name="lut_AST5"
+						value="AESTHETICS_5.png" />
+				</combo_box>
 				<!--Sharpen Controls-->
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="5"
 					width="50"
 					layout="topleft"
@@ -104,7 +224,7 @@
 					name="sharp_dynamic_text"
 					follows="left|top"
 					height="15"
-					left="100"
+					left="30"
 					top_pad="10"
 					width="50"
 					layout="topleft"
@@ -154,8 +274,8 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
-					top_pad="3"
+					left="10"
+					top_pad="6"
 					width="70"
 					layout="topleft"
 					tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
@@ -209,199 +329,378 @@
 						name="toneUncharted"
 						value="9" />
 				</combo_box>
+				<button
+					name="exposure_default_btn"
+					follows="top|right"
+					layout="topleft"
+					height="20"
+					right="-2"
+					top_pad="-18"
+					label="Reset Tonemapper Sliders"
+					halign="left"
+					width="155"
+					scale_image="true"
+					image_overlay="Refresh_Off"
+					image_overlay_alignment="right">
+					<button.commit_callback
+						function="LightBox.ResetGroupDefault"
+						parameter="tonemap" />
+				</button>
+				<text
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="4"
+					width="100"
+					layout="topleft"
+					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+					value="Exposure:" />
+				<slider_bar
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="16.0"
+					min_val="0.1"
+					left_delta="100"
+					right="-55"
+					name="exposure_slider"
+					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+					control_name="RenderToneMapExposure"/>
+				<spinner
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="16.0"
+					min_val="0.1"
+					width="55"
+					increment=".1"
+					name="exposure_spinner"
+					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+					control_name="RenderToneMapExposure"/>
+				<!--TODO: This effects multiple values that need to be hooked up-->
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text1"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD1:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider1"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner1"
+					control_name=""/>
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text2"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD2:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider2"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner2"
+					control_name=""/>
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text3"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD3:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider3"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner3"
+					control_name=""/>
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text4"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD4:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider4"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner4"
+					control_name=""/>
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text5"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD5:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider5"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner5"
+					control_name=""/>
+				<text
+					visible="false"
+					name="tonemapper_dynamic_text6"
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="10"
+					width="100"
+					layout="topleft"
+					value="TonemapD6:" />
 				<slider_bar
+					visible="false"
 					top_pad="-18"
 					height="20"
 					increment=".1"
 					follows="left|top|right"
 					layout="topleft"
-					max_val="16.0"
-					min_val="0.1"
-					left_delta="80"
-					right="-75"
-					name="exposure_slider"
-					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderToneMapExposure"/>
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider6"
+					control_name=""/>
 				<spinner
-					top_pad="-19"
+					visible="false"
+					top_pad="-20"
 					height="15"
 					label_width="0"
-					right="-20"
+					right="-1"
 					decimal_digits="1"
 					follows="top|right"
 					layout="topleft"
-					max_val="16.0"
-					min_val="0.1"
+					max_val="1.0"
+					min_val="0.0"
 					width="55"
 					increment=".1"
-					name="exposure_spinner"
-					tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
-					control_name="RenderToneMapExposure"/>
-				<button
-					name="exposure_default_btn"
-					follows="top|right"
-					layout="topleft"
-					height="20"
-					left_delta="55"
-					top_pad="-15"
-					width="18"
-					scale_image="true"
-					image_overlay="Refresh_Off"
-					image_overlay_alignment="center">
-					<button.commit_callback
-						function="LightBox.ResetGroupDefault"
-						parameter="tonemap" />
-				</button>
-				<!--LUT Control-->
+					name="tonemapper_dynamic_spinner6"
+					control_name=""/>
 				<text
+					visible="false"
+					name="tonemapper_dynamic_text7"
 					follows="left|top"
 					height="15"
 					left="30"
-					top_pad="6"
-					width="60"
+					top_pad="10"
+					width="100"
 					layout="topleft"
-					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
-					value="Active LUT:" />
-				<!--TODO: Make more flexible?-->
-				<combo_box
-					allow_text_entry="true"
-					tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
-					control_name="RenderColorGradeLUT"
-					follows="left|top"
+					value="TonemapD7:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
 					height="20"
+					increment=".1"
+					follows="left|top|right"
 					layout="topleft"
-					right="-4"
-					max_chars="200"
-					name="colorlut_combo"
-					top_pad="-18"
-					width="246">
-					<combo_box.item
-						label="None"
-						name="lut_none"
-						value="" />
-					<combo_box.item
-						label="Neutral"
-						name="lut_neutral"
-						value="NeutralLUT.png" />
-					<combo_box.item
-						label="CrossProcess - Warm"
-						name="lut_xprocess_warm"
-						value="CrossWarm.png" />
-					<combo_box.item
-						label="CrossProcess - Cool"
-						name="lut_xprocess_cool"
-						value="CrossCool.png" />
-					<combo_box.item
-						label="Acid Trip"
-						name="lut_acidTrip"
-						value="AcidTrip.png" />
-					<combo_box.item
-						label="Battleblue"
-						name="lut_battleblue"
-						value="Battleblue.png" />
-					<combo_box.item
-						label="Crunchy"
-						name="lut_crunchy"
-						value="Crunchy.png" />
-					<combo_box.item
-						label="Dreary"
-						name="lut_dreary"
-						value="Dreary.png" />
-					<combo_box.item
-						label="Fall Painty"
-						name="lut_fallPainty"
-						value="FallPainty.png" />
-					<combo_box.item
-						label="Harshness"
-						name="lut_harshness"
-						value="Harshness.png" />
-					<combo_box.item
-						label="Nuked"
-						name="lut_nuked"
-						value="Nuked.png" />
-					<combo_box.item
-						label="OG Boy"
-						name="lut_ogBoy"
-						value="OGBoy.png" />
-					<combo_box.item
-						label="Old Photo"
-						name="lut_oldPhoto"
-						value="OldPhoto.png" />
-					<combo_box.item
-						label="Pastel Dreams"
-						name="lut_pastelDreams"
-						value="PastelDreams.png" />
-					<combo_box.item
-						label="Purple Haze"
-						name="lut_purpleHaze"
-						value="PurpleHaze.png" />
-					<combo_box.item
-						label="Sickly Blue"
-						name="lut_sicklyBlue"
-						value="SicklyBlue.png" />
-					<combo_box.item
-						label="Sinner 1"
-						name="lut_sinner1"
-						value="Sinner.png" />
-					<combo_box.item
-						label="Sinner 2"
-						name="lut_sinner2"
-						value="Sinner2.png" />
-					<combo_box.item
-						label="Tealness"
-						name="lut_tealness"
-						value="Tealness.png" />
-					<combo_box.item
-						label="Toonland"
-						name="lut_toonland"
-						value="Toonland.png" />
-					<combo_box.item
-						label="Warm"
-						name="lut_warm"
-						value="Warm.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  1"
-						name="lut_AST1"
-						value="AESTHETICS_1.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  2"
-						name="lut_AST2"
-						value="AESTHETICS_2.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  3"
-						name="lut_AST3"
-						value="AESTHETICS_3.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  4"
-						name="lut_AST4"
-						value="AESTHETICS_4.png" />
-					<combo_box.item
-						label="A E S T H E T I C S  5"
-						name="lut_AST5"
-						value="AESTHETICS_5.png" />
-				</combo_box>
-				<!--Render Settings Section-->
-				<view_border
-					bevel_style="none"
-					height="0"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider7"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
 					layout="topleft"
-					left="0"
-					name="render_divider"
-					top_pad="7"
-					width="350"/>
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner7"
+					control_name=""/>
 				<text
+					visible="false"
+					name="tonemapper_dynamic_text8"
 					follows="left|top"
 					height="15"
-					left="10"
-					top_pad="7"
+					left="30"
+					top_pad="10"
 					width="100"
 					layout="topleft"
-					value="Rendering Settings" />
+					value="TonemapD8:" />
+				<slider_bar
+					visible="false"
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="100"
+					right="-55"
+					name="tonemapper_dynamic_slider8"
+					control_name=""/>
+				<spinner
+					visible="false"
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-1"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="tonemapper_dynamic_spinner8"
+					control_name=""/>
+				
+			</panel>
+			<!--Rendering Panel-->
+			<panel
+				label="Rendering"
+				class="render_settings"
+				layout="topleft"
+				name="render_settings">
 				<!--Anti-Aliasing-->
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="4"
 					width="90"
 					layout="topleft"
@@ -412,7 +711,7 @@
 					layout="topleft"
 					height="16"
 					width="150"
-					right="-4"
+					right="-2"
 					top_pad="-16"
 					max_chars="128"
 					allow_text_entry="false"
@@ -444,7 +743,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="4"
 					width="120"
 					layout="topleft"
@@ -457,7 +756,7 @@
 					follows="left|top"
 					height="16"
 					layout="topleft"
-					right="-4"
+					right="-2"
 					max_chars="128"
 					name="anisotropicfilter_combo"
 					top_pad="-16"
@@ -487,7 +786,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="3"
 					width="90"
 					layout="topleft"
@@ -534,7 +833,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="4"
 					width="90"
 					layout="topleft"
@@ -572,7 +871,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="8"
 					width="90"
 					layout="topleft"
@@ -607,7 +906,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="8"
 					width="90"
 					layout="topleft"
@@ -642,7 +941,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="8"
 					width="90"
 					layout="topleft"
@@ -677,7 +976,7 @@
 				<text
 					follows="left|top"
 					height="15"
-					left="30"
+					left="10"
 					top_pad="8"
 					width="90"
 					layout="topleft"
@@ -1607,6 +1906,26 @@
 					label="Depth of Field"
 					tool_tip="Toggles Depth of Field"
 					control_name="RenderDepthOfField"/>
+				<check_box
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="4"
+					width="80"
+					layout="topleft"
+					label="Follow Mouse"
+					tool_tip="Allows DoF's focus point to follow mouse cursor"
+					control_name="RenderFocusPointFollowsPointer"/>
+				<check_box
+					follows="left|top"
+					height="15"
+					left="30"
+					top_pad="4"
+					width="80"
+					layout="topleft"
+					label="Lock Focus (alt+shift+X)"
+					tool_tip="Locks the current focus point for DoF"
+					control_name="RenderFocusPointLocked"/>
 				<!--DOF Resolution-->
 				<!--TODO: Ensure this setting is temporary? Large CoC @ Full Res has caused Login-Crashes on other viewers, even on high end GPUs!-->
 				<text