diff --git a/Effects/material-diffuse.eff b/Effects/material-diffuse.eff
index 79963a9a1..d99153c5a 100644
--- a/Effects/material-diffuse.eff
+++ b/Effects/material-diffuse.eff
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
   <name>Effects/material-diffuse</name>
+  <parameters>
+    <material>
+      <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
+    </material>
+  </parameters>
   <inherits-from>Effects/model-default</inherits-from>
-  <technique n="10">
-    <pass>
-      <program>
-        <vertex-shader>Shaders/default.vert</vertex-shader>
-        <fragment-shader>Shaders/default.frag</fragment-shader>
-      </program>
-      <uniform>
-        <name>colorMode</name>
-        <type>int</type>
-        <value>1</value> <!-- DIFFUSE -->
-      </uniform>
-    </pass>
-  </technique>
 </PropertyList>
diff --git a/Effects/material-off.eff b/Effects/material-off.eff
index 1e6e3e6db..e6cf9f202 100644
--- a/Effects/material-off.eff
+++ b/Effects/material-off.eff
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
   <name>Effects/material-off</name>
+  <parameters>
+    <material>
+      <color-mode-uniform>0</color-mode-uniform> <!-- OFF -->
+    </material>
+  </parameters>
   <inherits-from>Effects/model-default</inherits-from>
-  <technique n="10">
-    <pass>
-      <uniform>
-        <name>colorMode</name>
-        <type>int</type>
-        <value>0</value> <!-- OFF -->
-      </uniform>
-    </pass>
-  </technique>
 </PropertyList>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 7cbdb3948..2a9adf0b7 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -6,6 +6,9 @@
       <type>white</type>
     </texture>
     <vertex-program-two-side type="bool">false</vertex-program-two-side>
+    <material>
+      <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
+    </material>
   </parameters>
   <technique n="10">
     <predicate>
@@ -76,7 +79,7 @@
       <uniform>
         <name>colorMode</name>
         <type>int</type>
-        <value>1</value> <!-- DIFFUSE -->
+        <value><use>material/color-mode-uniform</use></value>
       </uniform>
     </pass>
   </technique>