diff --git a/indra/newview/alrenderutils.cpp b/indra/newview/alrenderutils.cpp
index b6fbb0cc110f985db1d3a96526f329d9f09b66a2..c2d508f05fd9b7ad1783f3eaab80ed6767f86dc0 100644
--- a/indra/newview/alrenderutils.cpp
+++ b/indra/newview/alrenderutils.cpp
@@ -314,7 +314,7 @@ bool ALRenderUtil::setupTonemap()
 		mTonemapType = gSavedSettings.getU32("RenderToneMapType");
 		if (mTonemapType >= TONEMAP_COUNT)
 		{
-			mTonemapType = ALTonemap::TONEMAP_NONE;
+			mTonemapType = ALTonemap::TONEMAP_ACES_HILL;
 		}
 
 		mTonemapExposure = llclamp(gSavedSettings.getF32("RenderExposure"), 0.5f, 4.f);
@@ -326,11 +326,6 @@ bool ALRenderUtil::setupTonemap()
 		mToneUnchartedParamB = LLVector3(gSavedSettings.getF32("AlchemyToneMapFilmicShoulderLen"), gSavedSettings.getF32("AlchemyToneMapFilmicShoulderAngle"), gSavedSettings.getF32("AlchemyToneMapFilmicGamma"));
 		mToneUnchartedParamC = LLVector3(gSavedSettings.getF32("AlchemyToneMapFilmicWhitePoint"), 2.0, 0.0);
 	}
-	else
-	{
-		mTonemapType = ALTonemap::TONEMAP_NONE;
-		mTonemapExposure = 1.f;
-	}
 	return true;
 }
 
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index bb6dde37fb3056f1b50ea78b5523212e07ed82ec..253d380b3c295940ae8a6064410ab43c9c22d28f 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 55
+version 56
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index ad740b035974f3127d2e37ff14bb7daa60b27c28..3bff96f3486424f18d8fbb51299c1698217dae9e 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 52
+version 53
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -69,7 +69,8 @@ RenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
 RenderGLContextCoreProfile         1   1
-RenderGLMultiThreaded       1   0
+RenderGLMultiThreadedTextures      1   0
+RenderGLMultiThreadedMedia         1   0
 RenderReflectionProbeResolution 1 128
 RenderScreenSpaceReflections 1  1
 RenderToneMapType 1 1
@@ -298,7 +299,7 @@ RenderFSAASamples			1	0
 RenderGLContextCoreProfile  1   1
 
 list AMD
-RenderGLMultiThreaded       1   1
+RenderGLMultiThreadedTextures       1   0
 
 list GL3
 RenderFSAASamples           0   0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 16cc68ae52b86acddcd4d96b26eec419fe6f28da..278f3c9fe7fff11dbea9be9b68da2b4a45f3e369 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 50
+version 51
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp
index 9c953436809363dde80197f18b0177b1a048a5d5..80bf5796b835f4c2cc6a6d8d7ccd34b679ee26d6 100644
--- a/indra/newview/llpresetsmanager.cpp
+++ b/indra/newview/llpresetsmanager.cpp
@@ -292,8 +292,6 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
 {
 	const std::vector<std::string> camera_controls = {
 		// From panel_preferences_graphics.xml
-		"AlchemyRenderCAS",
-		"AlchemyRenderCASSharpness",
 		"AlwaysRenderFriends",
 		"RenderAnisotropicLevel",
 		"RenderAvatarLODFactor",
@@ -301,13 +299,11 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
 		"RenderAvatarMaxNonImpostors",
 		"RenderAvatarPhysicsLODFactor",
 		"RenderColorGradeLUT",
-		"RenderCompressTextures",
 		"RenderDeferredSSAO",
 		"RenderDepthOfField",
 		"RenderFSAASamples",
 		"RenderFarClip",
 		"RenderFlexTimeFactor",
-		"RenderGamma",
 		"RenderGlowResolutionPow",
 		"RenderLocalLights",
 		"RenderMaxPartCount",
@@ -320,6 +316,12 @@ void LLPresetsManager::getGraphicsControlNames(std::vector<std::string>& names)
 		"RenderTreeLODFactor",
 		"RenderVolumeLODFactor",
 		"WLSkyDetail",
+		"RenderScreenSpaceReflections",
+		"RenderReflectionProbeDetail",
+		"RenderReflectionProbeLevel"
+		"RenderSharpenMethod",
+		"RenderSharpenDLSParams",
+		"RenderSharpenCASParams",
 	};
 	names = camera_controls;
 }