diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml
index 8cf178533..324687b72 100644
--- a/Aircraft/c172p/Models/c172p.xml
+++ b/Aircraft/c172p/Models/c172p.xml
@@ -2386,7 +2386,7 @@
    <object-name>LandingLightCone</object-name>
    <condition>
      <and>
-       <property>/sim/rendering/rembrandt</property>
+       <property>/sim/rendering/rembrandt/enabled</property>
        <property>controls/lighting/landing-lights</property>
      </and>
    </condition>
@@ -2401,7 +2401,7 @@
      <and>
        <property>controls/lighting/landing-lights</property>
        <not>
-         <property>/sim/rendering/rembrandt</property>
+         <property>/sim/rendering/rembrandt/enabled</property>
        </not>
       </and>
    </condition>
diff --git a/Effects/display.eff b/Effects/display.eff
index e9a751ad2..3ab968dc5 100644
--- a/Effects/display.eff
+++ b/Effects/display.eff
@@ -2,8 +2,8 @@
 <PropertyList>
 	<name>Effects/display</name>
 	<parameters>
-		<exposure type="float"><use>/sim/rendering/exposure</use></exposure>
-		<show-buffers type="bool"><use>/sim/rendering/show-buffers</use></show-buffers>
+		<exposure type="float"><use>/sim/rendering/rembrandt/exposure</use></exposure>
+		<show-buffers type="bool"><use>/sim/rendering/rembrandt/show-buffers</use></show-buffers>
 	</parameters>
 	<technique n="11">
 		<pass>
diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff
index d0121ec7a..716220bbf 100644
--- a/Effects/model-combined-deferred.eff
+++ b/Effects/model-combined-deferred.eff
@@ -12,7 +12,7 @@ the objects that use it, and replaces it with the default shader.
   <technique n="8">
 	<predicate>
 	  <and>
-		<property>/sim/rendering/rembrandt</property>
+		<property>/sim/rendering/rembrandt/enabled</property>
 		<or>
 		  <less-equal>
 			<value type="float">2.0</value>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index 0d0e5ceea..b2d8cac0e 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -141,7 +141,7 @@ please see Docs/README.model-combined.eff for documentation
 			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<rembrandt>
-		  <use>/sim/rendering/rembrandt</use>
+		  <use>/sim/rendering/rembrandt/enabled</use>
 		</rembrandt>
 		<!-- 		END fog include -->
 	</parameters>
@@ -156,7 +156,7 @@ please see Docs/README.model-combined.eff for documentation
 	<predicate>
 	  <and>
 		<property>/sim/rendering/shaders/model</property>
-		<property>/sim/rendering/rembrandt</property>
+		<property>/sim/rendering/rembrandt/enabled</property>
 		<or>
 		  <less-equal>
 			<value type="float">2.0</value>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 5bc396735..fa622d218 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -142,7 +142,7 @@
 <technique n="10">
 	<predicate>
 		<and>
-			<property>/sim/rendering/rembrandt</property>
+			<property>/sim/rendering/rembrandt/enabled</property>
 			<or>
 				<less-equal>
 					<value type="float">2.0</value>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index 10e1549e7..3f51fb4fa 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -415,7 +415,7 @@
 <technique n="10">
 	<predicate>
 		<and>
-			<property>/sim/rendering/rembrandt</property>
+			<property>/sim/rendering/rembrandt/enabled</property>
 			<or>
 				<less-equal>
 					<value type="float">2.0</value>
diff --git a/Effects/tree.eff b/Effects/tree.eff
index f3c028286..3eed93b11 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -40,7 +40,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
-        <property>/sim/rendering/rembrandt</property>
+        <property>/sim/rendering/rembrandt/enabled</property>
 				<property>/sim/rendering/random-vegetation</property>
 			</and>
 		</predicate>
diff --git a/Effects/urban.eff b/Effects/urban.eff
index d0bbbbdb7..df4ac6a44 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -42,7 +42,7 @@
 	<technique n="6">
 		<predicate>
 			<and>
-				<property>/sim/rendering/rembrandt</property>
+				<property>/sim/rendering/rembrandt/enabled</property>
 				<property>/sim/rendering/shaders/urban</property>
 				<less-equal>
 					<value type="float">4.0</value>
@@ -233,7 +233,7 @@
 	<technique n="7">
 		<predicate>
 			<and>
-				<property>/sim/rendering/rembrandt</property>
+				<property>/sim/rendering/rembrandt/enabled</property>
 				<property>/sim/rendering/shaders/urban</property>
 				<less-equal>
 					<value type="float">1.0</value>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 302aa87b0..8f4406992 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -547,13 +547,13 @@
 					<label>Rembrandt</label>
 					<halign>left</halign>
 					<visible>
-						<property>/sim/rendering/rembrandt</property>
+						<property>/sim/rendering/rembrandt/enabled</property>
 					</visible>
 				</text>
 				<hrule>
 					<stretch>true</stretch>
 					<visible>
-						<property>/sim/rendering/rembrandt</property>
+						<property>/sim/rendering/rembrandt/enabled</property>
 					</visible>
 				</hrule>
 			</group>
@@ -568,7 +568,7 @@
 					<object-name>shadow</object-name>
 				</binding>
 				<visible>
-					<property>/sim/rendering/rembrandt</property>
+					<property>/sim/rendering/rembrandt/enabled</property>
 				</visible>
 			</checkbox>
 			
@@ -576,7 +576,7 @@
 				<layout>hbox</layout>
 				<halign>right</halign>
 				<visible>
-					<property>/sim/rendering/rembrandt</property>
+					<property>/sim/rendering/rembrandt/enabled</property>
 				</visible>
 				
 				<text>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 8ba29c2a5..28cfdf706 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -662,7 +662,7 @@
 			<name>rendering-buffers</name>
 			<binding>
 				<command>property-toggle</command>
-				<property>/sim/rendering/show-buffers</property>
+				<property>/sim/rendering/rembrandt/show-buffers</property>
 			</binding>
 			<enabled>false</enabled>
 		</item>
diff --git a/preferences.xml b/preferences.xml
index cd6acd146..a5114134d 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -64,12 +64,14 @@ Started September 2000 by David Megginson, david@megginson.com
 		</startup>
 		<rendering>
 			<materials-file>Materials/default/materials.xml</materials-file>
-			<rembrandt type="bool">false</rembrandt>
-			<renderer userarchive="y">default-pipeline</renderer>
-			<show-buffers type="bool" userarchive="y">true</show-buffers>
-			<ambient-occlusion type="bool" userarchive="y">false</ambient-occlusion>
-			<exposure type="float" userarchive="y">1.0</exposure>
-			<use-color-for-depth type="bool">false</use-color-for-depth>
+			<rembrandt>
+				<enabled type="bool">false</enabled>
+				<renderer userarchive="y">default-pipeline</renderer>
+				<show-buffers type="bool" userarchive="y">true</show-buffers>
+				<ambient-occlusion type="bool" userarchive="y">false</ambient-occlusion>
+				<exposure type="float" userarchive="y">1.0</exposure>
+				<use-color-for-depth type="bool">false</use-color-for-depth>
+			</rembrandt>
 			<debug type="bool">false</debug>
 			<realism type="int">5</realism>
 			<filtering type="int">8</filtering>