diff --git a/data/cameras.xml b/data/cameras.xml
index ca481c5..cf5798c 100644
--- a/data/cameras.xml
+++ b/data/cameras.xml
@@ -220,6 +220,7 @@
 			<Alias id="Digital Rebel XT">Canon EOS DIGITAL REBEL XT</Alias>
 			<Alias id="Kiss Digital N">Canon EOS Kiss Digital N</Alias>
 			<Alias id="EOS 350D">Canon EOS 350D</Alias>
+			<Alias id="EOS 350D">Canon EOS 350D Digital</Alias>
 		</Aliases>
 	</Camera>
 	<Camera make="Canon" model="Canon EOS 40D" decoder_version="2">
@@ -588,7 +589,7 @@
 			<Horizontal y="2" height="60"/>
 		</BlackAreas>
 		<Aliases>
-			<Alias>Canon EOS 5DS R</Alias>
+			<Alias id="EOS 5DS R">Canon EOS 5DS R</Alias>
 		</Aliases>
 	</Camera>
 	<Camera make="Canon" model="Canon EOS 6D" decoder_version="2">
@@ -1088,6 +1089,21 @@
 			<Horizontal y="0" height="10"/>
 		</BlackAreas>
 	</Camera>
+	<Camera make="Canon" model="Canon PowerShot G3 X">
+		<ID make="Canon" model="PowerShot G3 X">Canon PowerShot G3 X</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="96" y="17" width="0" height="0"/>
+		<Sensor black="2047" white="16000"/>
+		<BlackAreas>
+			<Vertical x="0" width="90"/>
+			<Horizontal y="0" height="16"/>
+		</BlackAreas>
+	</Camera>
 	<Camera make="Canon" model="Canon PowerShot G5">
 		<ID make="Canon" model="PowerShot G5">Canon PowerShot G5</ID>
 		<CFA width="2" height="2">
@@ -1106,6 +1122,20 @@
 			<Horizontal y="0" height="10"/>
 		</BlackAreas>
 	</Camera>
+	<Camera make="Canon" model="Canon PowerShot G5 X">
+		<ID make="Canon" model="PowerShot G5 X">Canon PowerShot G5 X</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="96" y="17" width="0" height="0"/>
+		<Sensor black="2047" white="16000"/>
+		<Hints>
+			<Hint name="wb_offset" value="142"/>
+		</Hints>
+	</Camera>
 	<Camera make="Canon" model="Canon PowerShot G6">
 		<ID make="Canon" model="PowerShot G6">Canon PowerShot G6</ID>
 		<CFA width="2" height="2">
@@ -1272,6 +1302,9 @@
 			<Vertical x="0" width="80"/>
 			<Horizontal y="0" height="16"/>
 		</BlackAreas>
+		<Hints>
+			<Hint name="wb_offset" value="142"/>
+		</Hints>
 	</Camera>
 	<Camera make="Canon" model="Canon PowerShot SX1 IS">
 		<ID make="Canon" model="PowerShot SX1 IS">Canon PowerShot SX1 IS</ID>
@@ -1710,9 +1743,6 @@
 		</CFA>
 		<Crop x="2" y="0" width="-50" height="0"/>
 		<Sensor black="0" white="16383"/>
-		<BlackAreas>
-			<Vertical x="4984" width="8"/>
-		</BlackAreas>
 	</Camera>
 	<Camera make="NIKON CORPORATION" model="NIKON Df">
 		<ID make="Nikon" model="Df">Nikon Df</ID>
@@ -2742,6 +2772,17 @@
 		<Crop x="0" y="0" width="4096" height="3072"/>
 		<Sensor black="64" white="4095"/>
 	</Camera>
+	<Camera make="OLYMPUS IMAGING CORP." model="SP320">
+		<ID make="Olympus" model="SP320">Olympus SP320</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="0" height="0"/>
+		<Sensor black="0" white="4095"/>
+	</Camera>
 	<Camera make="OLYMPUS IMAGING CORP." model="SP350">
 		<ID make="Olympus" model="SP350">Olympus SP350</ID>
 		<CFA width="2" height="2">
@@ -2819,6 +2860,17 @@
 		<Crop x="8" y="8" width="-24" height="-8"/>
 		<Sensor black="254" white="4000"/>
 	</Camera>
+	<Camera make="OLYMPUS CORPORATION" model="E-M10MarkII">
+		<ID make="Olympus" model="E-M10 Mark II">Olympus E-M10 Mark II</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="0" height="0"/>
+		<Sensor black="254" white="4000"/>
+	</Camera>
 	<Camera make="OLYMPUS IMAGING CORP." model="E-M5">
 		<ID make="Olympus" model="E-M5">Olympus E-M5</ID>
 		<CFA width="2" height="2">
@@ -3063,9 +3115,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-CM1" mode="3:2">
 		<ID make="Panasonic" model="DMC-CM1">Panasonic DMC-CM1</ID>
@@ -3077,9 +3126,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FX150">
 		<ID make="Panasonic" model="DMC-FX150">Panasonic DMC-FX150</ID>
@@ -3091,9 +3137,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="4429" height="3324"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FX150" mode = "4:3">
 		<ID make="Panasonic" model="DMC-FX150">Panasonic DMC-FX150</ID>
@@ -3105,9 +3148,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="4429" height="3324"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ28" mode = "4:3">
 		<ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
@@ -3119,9 +3159,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3668" height="2754"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ28" mode = "16:9">
 		<ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
@@ -3133,9 +3170,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3668" height="2754"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ28">
 		<ID make="Panasonic" model="DMC-FZ28">Panasonic DMC-FZ28</ID>
@@ -3147,9 +3181,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-56" height="-4"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ150">
 		<ID make="Panasonic" model="DMC-FZ150">Panasonic DMC-FZ150</ID>
@@ -3161,11 +3192,8 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="15" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
-	<Camera make="Panasonic" model = "DMC-FZ150" mode="4:3">
+	<Camera make="Panasonic" model="DMC-FZ150" mode="4:3">
 		<ID make="Panasonic" model="DMC-FZ150">Panasonic DMC-FZ150</ID>
 		<CFA width="2" height="2">
 			<Color x="0" y="0">GREEN</Color>
@@ -3174,10 +3202,18 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
-		<Sensor black="15" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
+		<Sensor black="145" white="3956"/>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-FZ150" mode="3:2">
+		<ID make="Panasonic" model="DMC-FZ150">Panasonic DMC-FZ150</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">GREEN</Color>
+			<Color x="1" y="0">BLUE</Color>
+			<Color x="0" y="1">RED</Color>
+			<Color x="1" y="1">GREEN</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-128" height="0"/>
+		<Sensor black="143" white="3971"/>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ200">
 		<ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
@@ -3189,9 +3225,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="-4"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ200" mode="4:3">
 		<ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
@@ -3203,9 +3236,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="-4"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ200" mode="3:2">
 		<ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
@@ -3217,9 +3247,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ200" mode="1:1">
 		<ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
@@ -3231,9 +3258,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-16" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ200" mode="16:9">
 		<ID make="Panasonic" model="DMC-FZ200">Panasonic DMC-FZ200</ID>
@@ -3245,9 +3269,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G1">
 		<ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
@@ -3259,9 +3280,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="4018" height="3016" />
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G1" mode="4:3">
 		<ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
@@ -3273,9 +3291,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="4018" height="3016" />
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G1" mode="16:9">
 		<ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
@@ -3287,9 +3302,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-32" height="0" />
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G1" mode="3:2">
 		<ID make="Panasonic" model="DMC-G1">Panasonic DMC-G1</ID>
@@ -3301,9 +3313,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0" />
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G2" mode="4:3">
 		<ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
@@ -3315,9 +3324,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0" />
 		<Sensor black="0" white="3900"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G2" mode="3:2">
 		<ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
@@ -3329,9 +3335,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0" />
 		<Sensor black="0" white="3900"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G2" mode="16:9">
 		<ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
@@ -3343,9 +3346,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0" />
 		<Sensor black="0" white="3900"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G2" mode="1:1">
 		<ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
@@ -3357,9 +3357,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0" />
 		<Sensor black="0" white="3900"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G2">
 		<ID make="Panasonic" model="DMC-G2">Panasonic DMC-G2</ID>
@@ -3440,9 +3437,6 @@
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="155" white="3956"/>
 		<Sensor black="165" white="3941" iso_min="6400"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH3" mode="3:2">
 		<ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
@@ -3455,9 +3449,6 @@
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="155" white="3956"/>
 		<Sensor black="165" white="3941" iso_min="6400"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH3" mode="16:9">
 		<ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
@@ -3470,9 +3461,6 @@
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="155" white="3956"/>
 		<Sensor black="165" white="3941" iso_min="6400"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH3" mode="1:1">
 		<ID make="Panasonic" model="DMC-GH3">Panasonic DMC-GH3</ID>
@@ -3485,9 +3473,6 @@
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="155" white="3956"/>
 		<Sensor black="165" white="3941" iso_min="6400"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<!-- Default Guess -->
 	<Camera make="Panasonic" model = "DMC-GH3">
@@ -3501,9 +3486,6 @@
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="155" white="3956"/>
 		<Sensor black="165" white="3941" iso_min="6400"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH4" mode="4:3">
 		<ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
@@ -3515,9 +3497,6 @@
 		</CFA>
 		<Crop x="8" y="8" width="-200" height="-8"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH4" mode="3:2">
 		<ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
@@ -3529,9 +3508,6 @@
 		</CFA>
 		<Crop x="8" y="8" width="-200" height="-8"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH4" mode="16:9">
 		<ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
@@ -3543,9 +3519,6 @@
 		</CFA>
 		<Crop x="8" y="8" width="-200" height="-8"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH4" mode="1:1">
 		<ID make="Panasonic" model="DMC-GH4">Panasonic DMC-GH4</ID>
@@ -3557,9 +3530,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<!-- Default Guess -->
 	<Camera make="Panasonic" model = "DMC-GH4">
@@ -3572,9 +3542,6 @@
 		</CFA>
 		<Crop x="8" y="8" width="-200" height="8"/>
 		<Sensor black="142" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF1">
 		<ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
@@ -3586,9 +3553,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF1" mode="4:3">
 		<ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
@@ -3600,9 +3564,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF1" mode="16:9">
 		<ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
@@ -3614,9 +3575,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF1" mode="3:2">
 		<ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
@@ -3628,9 +3586,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF1" mode="1:1">
 		<ID make="Panasonic" model="DMC-GF1">Panasonic DMC-GF1</ID>
@@ -3642,9 +3597,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF2">
 		<ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
@@ -3656,9 +3608,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF2" mode="4:3">
 		<ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
@@ -3670,9 +3619,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF2" mode="16:9">
 		<ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
@@ -3684,9 +3630,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF2" mode="3:2">
 		<ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
@@ -3698,9 +3641,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF2" mode="1:1">
 		<ID make="Panasonic" model="DMC-GF2">Panasonic DMC-GF2</ID>
@@ -3723,9 +3663,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-206" height="0"/>
 		<Sensor black="143" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GM1" mode="3:2">
 		<ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
@@ -3737,9 +3674,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-206" height="0"/>
 		<Sensor black="143" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GM1" mode="16:9">
 		<ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
@@ -3751,9 +3685,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-206" height="0"/>
 		<Sensor black="143" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GM1" mode="1:1">
 		<ID make="Panasonic" model="DMC-GM1">Panasonic DMC-GM1</ID>
@@ -3765,9 +3696,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="143" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<!-- Default Guess -->
 	<Camera make="Panasonic" model = "DMC-GM1">
@@ -3780,9 +3708,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-206" height="0"/>
 		<Sensor black="143" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-GM5">
 		<ID make="Panasonic" model="DMC-GM5">Panasonic DMC-GM5</ID>
@@ -3848,9 +3773,6 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-152" height="0"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Sensor black="143" white="3956"/>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-G3" mode="1:1">
@@ -3862,9 +3784,6 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="0"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Sensor black="143" white="3956"/>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-G3" mode="16:9">
@@ -3876,9 +3795,6 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-168" height="0"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Sensor black="143" white="3956"/>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-G3" mode="3:2">
@@ -3890,9 +3806,6 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-168" height="0"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Sensor black="143" white="3956"/>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-G3">
@@ -3904,9 +3817,6 @@
 			<Color x="1" y="1">GREEN</Color>
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Sensor black="143" white="3956"/>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G5" mode="4:3">
@@ -3919,9 +3829,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-192" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G5" mode="3:2">
 		<ID make="Panasonic" model="DMC-G5">Panasonic DMC-G5</ID>
@@ -3933,9 +3840,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-192" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G5" mode="16:9">
 		<CFA width="2" height="2">
@@ -3946,9 +3850,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-192" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G5" mode="1:1">
 		<CFA width="2" height="2">
@@ -3959,9 +3860,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G5">
 		<ID make="Panasonic" model="DMC-G5">Panasonic DMC-G5</ID>
@@ -3973,9 +3871,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-192" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G6">
 		<ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
@@ -3987,9 +3882,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="142" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G6" mode="4:3">
 		<ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
@@ -4001,9 +3893,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="142" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G6" mode="3:2">
 		<ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
@@ -4015,9 +3904,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="142" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G6" mode="16:9">
 		<ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
@@ -4029,9 +3915,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-194" height="0"/>
 		<Sensor black="142" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-G6" mode="1:1">
 		<ID make="Panasonic" model="DMC-G6">Panasonic DMC-G6</ID>
@@ -4043,9 +3926,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="0" height="0"/>
 		<Sensor black="142" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-G7">
 		<ID make="Panasonic" model="DMC-G7">Panasonic DMC-G7</ID>
@@ -4057,9 +3937,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Aliases>
 			<Alias>DMC-G70</Alias>
 		</Aliases>
@@ -4074,9 +3951,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Aliases>
 			<Alias>DMC-G70</Alias>
 		</Aliases>
@@ -4091,9 +3965,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Aliases>
 			<Alias>DMC-G70</Alias>
 		</Aliases>
@@ -4108,9 +3979,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-32" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Aliases>
 			<Alias>DMC-G70</Alias>
 		</Aliases>
@@ -4125,9 +3993,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 		<Aliases>
 			<Alias>DMC-G70</Alias>
 		</Aliases>
@@ -4142,9 +4007,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-72" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF3" mode= "4:3">
 		<ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
@@ -4156,9 +4018,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-72" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF3" mode= "3:2">
 		<ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
@@ -4170,9 +4029,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-72" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF3" mode= "16:9">
 		<ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
@@ -4184,9 +4040,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-72" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF3" mode= "1:1">
 		<ID make="Panasonic" model="DMC-GF3">Panasonic DMC-GF3</ID>
@@ -4198,9 +4051,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-184" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF5">
 		<ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
@@ -4212,9 +4062,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF5" mode= "4:3">
 		<ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
@@ -4226,9 +4073,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF5" mode= "16:9">
 		<ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
@@ -4240,9 +4084,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF5" mode= "3:2">
 		<ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
@@ -4254,9 +4095,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF5" mode= "1:1">
 		<ID make="Panasonic" model="DMC-GF5">Panasonic DMC-GF5</ID>
@@ -4268,9 +4106,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-16" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF6">
 		<ID make="Panasonic" model="DMC-GF6">Panasonic DMC-GF6</ID>
@@ -4282,9 +4117,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GF6" mode= "4:3">
 		<ID make="Panasonic" model="DMC-GF6">Panasonic DMC-GF6</ID>
@@ -4296,9 +4128,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-GF7">
 		<ID make="Panasonic" model="DMC-GF7">Panasonic DMC-GF7</ID>
@@ -4310,9 +4139,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-GF7" mode="4:3">
 		<ID make="Panasonic" model="DMC-GF7">Panasonic DMC-GF7</ID>
@@ -4324,9 +4150,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="143" white="4095"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH2">
 		<ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
@@ -4338,9 +4161,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-216" height="0"/>
 		<Sensor black="15" white="3800"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH2" mode="4:3">
 		<ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
@@ -4352,9 +4172,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-136" height="0"/>
 		<Sensor black="15" white="3800"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH2" mode="16:9">
 		<ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
@@ -4366,9 +4183,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-216" height="0"/>
 		<Sensor black="15" white="3800"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH2" mode="3:2">
 		<ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
@@ -4380,9 +4194,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-216" height="0"/>
 		<Sensor black="15" white="3800"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH2" mode="1:1">
 		<ID make="Panasonic" model="DMC-GH2">Panasonic DMC-GH2</ID>
@@ -4394,9 +4205,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-168" height="0"/>
 		<Sensor black="15" white="3800"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GH1" mode="16:9">
 		<ID make="Panasonic" model="DMC-GH1">Panasonic DMC-GH1</ID>
@@ -4422,9 +4230,6 @@
 		<Aliases>
 			<Alias>DMC-FZ38</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ35">
 		<ID make="Panasonic" model="DMC-FZ35">Panasonic DMC-FZ35</ID>
@@ -4440,9 +4245,6 @@
 		<Aliases>
 			<Alias>DMC-FZ38</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ45">
 		<CFA width="2" height="2">
@@ -4456,9 +4258,6 @@
 		<Aliases>
 			<Alias>DMC-FZ40</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ45" mode = "4:3">
 		<CFA width="2" height="2">
@@ -4472,9 +4271,6 @@
 		<Aliases>
 			<Alias>DMC-FZ40</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ70">
 		<ID make="Panasonic" model="DMC-FZ70">Panasonic DMC-FZ70</ID>
@@ -4489,9 +4285,6 @@
 		<Aliases>
 			<Alias>DMC-FZ72</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ70" mode="4:3">
 		<ID make="Panasonic" model="DMC-FZ70">Panasonic DMC-FZ70</ID>
@@ -4506,9 +4299,6 @@
 		<Aliases>
 			<Alias>DMC-FZ72</Alias>
 		</Aliases>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ100">
 		<ID make="Panasonic" model="DMC-FZ100">Panasonic DMC-FZ100</ID>
@@ -4520,9 +4310,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="0"/>
 		<Sensor black="120" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-FZ100" mode="4:3">
 		<ID make="Panasonic" model="DMC-FZ100">Panasonic DMC-FZ100</ID>
@@ -4534,9 +4321,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="0"/>
 		<Sensor black="120" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-FZ1000">
 		<ID make="Panasonic" model="DMC-FZ1000">Panasonic DMC-FZ1000</ID>
@@ -4603,9 +4387,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-154" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX1" mode = "4:3">
 		<ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
@@ -4617,9 +4398,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-154" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX1" mode = "3:2">
 		<ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
@@ -4631,9 +4409,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-170" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX1" mode = "16:9">
 		<ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
@@ -4645,9 +4420,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-170" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX1" mode = "1:1">
 		<ID make="Panasonic" model="DMC-GX1">Panasonic DMC-GX1</ID>
@@ -4659,9 +4431,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-198" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX7">
 		<ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
@@ -4673,9 +4442,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX7" mode = "4:3">
 		<ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
@@ -4687,9 +4453,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX7" mode = "3:2">
 		<ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
@@ -4701,9 +4464,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX7" mode = "16:9">
 		<ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
@@ -4715,9 +4475,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-208" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-GX7" mode = "1:1">
 		<ID make="Panasonic" model="DMC-GX7">Panasonic DMC-GX7</ID>
@@ -4729,11 +4486,31 @@
 		</CFA>
 		<Crop x="0" y="0" width="-32" height="0"/>
 		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
-	<Camera make="Panasonic" model = "DMC-LF1" mode="4:3">
+	<Camera make="Panasonic" model="DMC-GX8">
+		<ID make="Panasonic" model="DMC-GX8">Panasonic DMC-GX8</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">GREEN</Color>
+			<Color x="1" y="0">BLUE</Color>
+			<Color x="0" y="1">RED</Color>
+			<Color x="1" y="1">GREEN</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-64" height="0"/>
+		<Sensor black="143" white="4095"/>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-GX8" mode="4:3">
+		<ID make="Panasonic" model="DMC-GX8">Panasonic DMC-GX8</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">GREEN</Color>
+			<Color x="1" y="0">BLUE</Color>
+			<Color x="0" y="1">RED</Color>
+			<Color x="1" y="1">GREEN</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-64" height="0"/>
+		<Sensor black="143" white="4095"/>
+	</Camera>
+	<!-- Default guess -->
+	<Camera make="Panasonic" model = "DMC-LF1">
 		<ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
 		<CFA width="2" height="2">
 			<Color x="0" y="0">RED</Color>
@@ -4742,13 +4519,9 @@
 			<Color x="1" y="1">BLUE</Color>
 		</CFA>
 		<Crop x="0" y="0" width="-130" height="0"/>
-		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
+		<Sensor black="143" white="3971"/>
 	</Camera>
-	<!-- Default guess -->
-	<Camera make="Panasonic" model = "DMC-LF1">
+	<Camera make="Panasonic" model = "DMC-LF1" mode="4:3">
 		<ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
 		<CFA width="2" height="2">
 			<Color x="0" y="0">RED</Color>
@@ -4756,11 +4529,41 @@
 			<Color x="0" y="1">GREEN</Color>
 			<Color x="1" y="1">BLUE</Color>
 		</CFA>
-		<Crop x="0" y="0" width="-130" height="0"/>
-		<Sensor black="150" white="3956"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
+		<Crop x="0" y="0" width="-126" height="0"/>
+		<Sensor black="143" white="3956"/>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-LF1" mode="3:2">
+		<ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-126" height="0"/>
+		<Sensor black="143" white="3971"/>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-LF1" mode="16:9">
+		<ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-126" height="0"/>
+		<Sensor black="143" white="3956"/>
+	</Camera>
+	<Camera make="Panasonic" model="DMC-LF1" mode="1:1">
+		<ID make="Panasonic" model="DMC-LF1">Panasonic DMC-LF1</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-16" height="0"/>
+		<Sensor black="142" white="3971"/>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX3">
 		<ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
@@ -4772,9 +4575,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-84" height="0"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX3" mode="16:9">
 		<ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
@@ -4786,9 +4586,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3990" height="2250"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX3" mode="4:3">
 		<ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
@@ -4800,9 +4597,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3666" height="2754"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX3" mode="3:2">
 		<ID make="Panasonic" model="DMC-LX3">Panasonic DMC-LX3</ID>
@@ -4814,9 +4608,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model="DIGILUX 2" decoder_version="2">
 		<ID make="Leica" model="Digilux 2">Leica Digilux 2</ID>
@@ -5060,9 +4851,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-84" height="0"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 4" mode="16:9">
 		<ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
@@ -5074,9 +4862,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3990" height="2250"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 4" mode="4:3">
 		<ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
@@ -5088,9 +4873,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="3666" height="2754"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 4" mode="3:2">
 		<ID make="Leica" model="D-LUX 4">Leica D-LUX 4</ID>
@@ -5102,9 +4884,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-44" height="0"/>
 		<Sensor black="15" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 
 	<Camera make="Panasonic" model = "DMC-LX5">
@@ -5117,9 +4896,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX5" mode="4:3">
 		<ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
@@ -5131,9 +4907,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX5" mode="3:2">
 		<ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
@@ -5145,9 +4918,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX5" mode="16:9">
 		<ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
@@ -5159,9 +4929,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-104" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX5" mode="1:1">
 		<ID make="Panasonic" model="DMC-LX5">Panasonic DMC-LX5</ID>
@@ -5173,9 +4940,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-220" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<!-- Leica D-Lux 5 is the same camera as LX-5 -->
 	<Camera make="LEICA" model = "D-LUX 5">
@@ -5188,9 +4952,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 5" mode="4:3">
 		<ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
@@ -5202,9 +4963,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-200" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 5" mode="3:2">
 		<ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
@@ -5216,9 +4974,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-74" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 5" mode="16:9">
 		<ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
@@ -5230,9 +4985,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-104" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 5" mode="1:1">
 		<ID make="Leica" model="D-LUX 5">Leica D-LUX 5</ID>
@@ -5244,9 +4996,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-220" height="-4"/>
 		<Sensor black="150" white="3986"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX7">
 		<ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
@@ -5258,9 +5007,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-34" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX7" mode="4:3">
 		<ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
@@ -5272,9 +5018,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-34" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX7" mode="3:2">
 		<ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
@@ -5286,9 +5029,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX7" mode="16:9">
 		<ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
@@ -5300,9 +5040,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-160" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model = "DMC-LX7" mode="1:1">
 		<ID make="Panasonic" model="DMC-LX7">Panasonic DMC-LX7</ID>
@@ -5314,9 +5051,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-48" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<!-- LEICA D-LUX 6 is the same camera as Panasonic DMC-LX7 -->
 	<Camera make="LEICA" model = "D-LUX 6">
@@ -5329,9 +5063,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-34" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 6" mode="4:3">
 		<ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
@@ -5343,9 +5074,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-34" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 6" mode="3:2">
 		<ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
@@ -5357,9 +5085,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-128" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 6" mode="16:9">
 		<ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
@@ -5371,9 +5096,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-160" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="LEICA" model = "D-LUX 6" mode="1:1">
 		<ID make="Leica" model="D-LUX 6">Leica D-LUX 6</ID>
@@ -5385,9 +5107,6 @@
 		</CFA>
 		<Crop x="0" y="0" width="-48" height="0"/>
 		<Sensor black="150" white="3971"/>
-		<Hints>
-			<Hint name="zero_is_bad" value=""/>
-		</Hints>
 	</Camera>
 	<Camera make="Panasonic" model="DMC-LX1" mode="16:9">
 		<ID make="Panasonic" model="DMC-LX1">Panasonic DMC-LX1</ID>
@@ -5734,6 +5453,17 @@
 		<Crop x="0" y="0" width="3880" height="2604"/>
 		<Sensor black="0" white="4095"/>
 	</Camera>
+	<Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX K-S1">
+		<ID make="Pentax" model="K-S1">Pentax K-S1</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="0" height="0"/>
+		<Sensor black="32" white="4062"/>
+	</Camera>
 	<Camera make="RICOH IMAGING COMPANY, LTD." model="PENTAX K-S2">
 		<ID make="Pentax" model="K-S2">Pentax K-S2</ID>
 		<CFA width="2" height="2">
@@ -6158,6 +5888,17 @@
 		<Crop x="0" y="0" width="-8" height="0"/>
 		<Sensor black="800" white="16300"/>
 	</Camera>
+	<Camera make="SONY" model="DSC-RX10M2">
+		<ID make="Sony" model="DSC-RX10M2">Sony DSC-RX10M2</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-8" height="0"/>
+		<Sensor black="800" white="16300"/>
+	</Camera>
 	<!-- Still needs to interpolate/upscale some pixels -->
 	<Camera make="SIGMA" model="SIGMA dp2 Quattro" supported="no">
 		<Crop x="204" y="24" width="-236" height="-24"/>
@@ -6196,6 +5937,17 @@
 		<Crop x="0" y="0" width="-12" height="0"/>
 		<Sensor black="800" white="16300"/>
 	</Camera>
+	<Camera make="SONY" model="DSC-RX100M4">
+		<ID make="Sony" model="DSC-RX100M4">Sony DSC-RX100M4</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="0" height="0"/>
+		<Sensor black="800" white="16300"/>
+	</Camera>
 	<Camera make="SONY" model="DSC-RX1R">
 		<ID make="Sony" model="DSC-RX1R">Sony DSC-RX1R</ID>
 		<CFA width="2" height="2">
@@ -6605,7 +6357,18 @@
 			<Color x="0" y="1">GREEN</Color>
 			<Color x="1" y="1">BLUE</Color>
 		</CFA>
-		<Crop x="0" y="0" width="-26" height="0"/>
+		<Crop x="0" y="0" width="-32" height="0"/>
+		<Sensor black="512" white="16300"/>
+	</Camera>
+	<Camera make="SONY" model="ILCE-7SM2">
+		<ID make="Sony" model="ILCE-7SM2">Sony ILCE-7SM2</ID>
+		<CFA width="2" height="2">
+			<Color x="0" y="0">RED</Color>
+			<Color x="1" y="0">GREEN</Color>
+			<Color x="0" y="1">GREEN</Color>
+			<Color x="1" y="1">BLUE</Color>
+		</CFA>
+		<Crop x="0" y="0" width="-32" height="0"/>
 		<Sensor black="512" white="16300"/>
 	</Camera>
 	<Camera make="SONY" model="DSC-RX1">