diff --git a/SAMSUNG.xml b/SAMSUNG.xml
index a404903..c57d237 100644
--- a/SAMSUNG.xml
+++ b/SAMSUNG.xml
@@ -19,43 +19,57 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
 -->
 <devices vendor="SAMSUNG">
     <device>
-        <commonname>Galaxy Europa</commonname>
-        <ro.product.model>GT-I5500</ro.product.model>
+        <commonname>Galaxy</commonname>
+        <ro.product.model>GT-I7500</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 5</commonname>
-        <ro.product.model>GT-I5500B</ro.product.model>
+        <commonname>Galaxy</commonname>
+        <ro.product.model>GT-I7500H</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy Europa</commonname>
-        <ro.product.model>GT-I5500L</ro.product.model>
+        <commonname>Galaxy</commonname>
+        <ro.product.model>GT-I7500L</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 5</commonname>
-        <ro.product.model>GT-I5500M</ro.product.model>
+        <commonname>Galaxy</commonname>
+        <ro.product.model>GT-I7500U</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 5</commonname>
-        <ro.product.model>GT-I5503</ro.product.model>
+        <commonname>Galaxy Ace</commonname>
+        <ro.product.model>GT-I8160</ro.product.model>
+        <ro.product.device>GT-I8160</ro.product.device>
+        <ro.product.board>codinal</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy Apollo</commonname>
+        <ro.product.model>GT-I5801</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 5</commonname>
-        <ro.product.model>GT-I5503T</ro.product.model>
+        <commonname>Galaxy Europa</commonname>
+        <ro.product.model>GT-I5500</ro.product.model>
+        <ro.product.device></ro.product.device>
+        <ro.product.board></ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy Europa</commonname>
+        <ro.product.model>GT-I5500L</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
@@ -68,169 +82,246 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I5510</ro.product.model>
+        <commonname>Galaxy Note 3</commonname>
+        <ro.product.model>SM-N900V</ro.product.model>
+        <ro.product.device>hltevzw</ro.product.device>
+        <ro.product.board>MSM8974</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy Note 3</commonname>
+        <ro.product.model>SAMSUNG-SM-N900A</ro.product.model>
+        <ro.product.device>hlteatt</ro.product.device>
+        <ro.product.board>MSM8974</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy Note 10.1 (2014 Edition)</commonname>
+        <ro.product.model>SM-P605</ro.product.model>
+        <ro.product.device>lt03lte</ro.product.device>
+        <ro.product.board>MSM8974</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy Spica</commonname>
+        <ro.product.model>GT-I5700</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I5510L</ro.product.model>
+        <commonname>Galaxy Spica</commonname>
+        <ro.product.model>GT-I5700L</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I5510M</ro.product.model>
+        <commonname>Galaxy Spica</commonname>
+        <ro.product.model>GT-I5700R</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I5510T</ro.product.model>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>GT-I9300</ro.product.model>
+        <ro.product.device>m0</ro.product.device>
+        <ro.product.board>smdk4x12</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>GT-I9300I</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy Spica</commonname>
-        <ro.product.model>GT-I5700</ro.product.model>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>GT-I9300T</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy Spica</commonname>
-        <ro.product.model>GT-I5700L</ro.product.model>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>GT-I9300X</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy Spica</commonname>
-        <ro.product.model>GT-I5700R</ro.product.model>
+        <commonname>Galaxy S III LTE</commonname>
+        <ro.product.model>GT-I9305</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 3</commonname>
-        <ro.product.model>GT-I5800</ro.product.model>
+        <commonname>Galaxy S III LTE</commonname>
+        <ro.product.model>GT-I9305N</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 3</commonname>
-        <ro.product.model>GT-I5800D</ro.product.model>
+        <commonname>Galaxy S III LTE</commonname>
+        <ro.product.model>GT-I9305T</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy 3</commonname>
-        <ro.product.model>GT-I5800L</ro.product.model>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>GT-I9308I</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname>Galaxy Apollo</commonname>
-        <ro.product.model>GT-I5801</ro.product.model>
+        <commonname>Galaxy S III</commonname>
+        <ro.product.model>SAMSUNG-SGH-I747</ro.product.model>
+        <ro.product.device>d2att</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4</commonname>
+        <ro.product.model>GT-I9500</ro.product.model>
+        <ro.product.device>ja3g</ro.product.device>
+        <ro.product.board>universal5410</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4</commonname>
+        <ro.product.model>GT-I9502</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6210</ro.product.model>
+        <commonname>Galaxy S4</commonname>
+        <ro.product.model>GT-I9505</ro.product.model>
+        <ro.product.device>jflte</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4</commonname>
+        <ro.product.model>SCH-I545</ro.product.model>
+        <ro.product.device>jfltevzw</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4</commonname>
+        <ro.product.model>SGH-I337</ro.product.model>
+        <ro.product.device>jflteatt</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4 Active</commonname>
+        <ro.product.model>GT-I9295</ro.product.model>
+        <ro.product.device>jactivelte</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4 Google Play Edition</commonname>
+        <ro.product.model>GT-I9505G</ro.product.model>
+        <ro.product.device>jgedlte</ro.product.device>
+        <ro.product.board>MSM8960</ro.product.board>
+        <description></description>
+    </device>
+    <device>
+        <commonname>Galaxy S4 LTE+</commonname>
+        <ro.product.model>GT-I9506</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6220</ro.product.model>
+        <commonname>Galaxy 3</commonname>
+        <ro.product.model>GT-I5800</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6230</ro.product.model>
+        <commonname>Galaxy 3</commonname>
+        <ro.product.model>GT-I5800D</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6330C</ro.product.model>
+        <commonname>Galaxy 3</commonname>
+        <ro.product.model>GT-I5800L</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6410</ro.product.model>
+        <commonname>Galaxy 5</commonname>
+        <ro.product.model>GT-I5500B</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6500U</ro.product.model>
+        <commonname>Galaxy 5</commonname>
+        <ro.product.model>GT-I5500M</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I6712</ro.product.model>
+        <commonname>Galaxy 5</commonname>
+        <ro.product.model>GT-I5503</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7110</ro.product.model>
+        <commonname>Galaxy 5</commonname>
+        <ro.product.model>GT-I5503T</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7410</ro.product.model>
+        <commonname>Galaxy 551</commonname>
+        <ro.product.model>GT-I5510</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7500</ro.product.model>
+        <commonname>Galaxy 551</commonname>
+        <ro.product.model>GT-I5510L</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7500H</ro.product.model>
+        <commonname>Galaxy 551</commonname>
+        <ro.product.model>GT-I5510M</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7500L</ro.product.model>
+        <commonname>Galaxy 551</commonname>
+        <ro.product.model>GT-I5510T</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
     <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I7500U</ro.product.model>
+        <commonname>Saturn</commonname>
+        <ro.product.model>GT-I6500U</ro.product.model>
         <ro.product.device></ro.product.device>
         <ro.product.board></ro.product.board>
         <description></description>
@@ -291,13 +382,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Galaxy Ace</commonname>
-        <ro.product.model>GT-I8160</ro.product.model>
-        <ro.product.device>GT-I8160</ro.product.device>
-        <ro.product.board>codinal</ro.product.board>
-        <description></description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>GT-I8160L</ro.product.model>
@@ -984,104 +1068,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname></commonname>
-        <ro.product.model>GT-I9295</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>GT-I9300</ro.product.model>
-        <ro.product.device>m0</ro.product.device>
-        <ro.product.board>smdk4x12</ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>GT-I9300I</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>GT-I9300T</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>GT-I9300X</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3 LTE</commonname>
-        <ro.product.model>GT-I9305</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3 LTE</commonname>
-        <ro.product.model>GT-I9305N</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3 LTE</commonname>
-        <ro.product.model>GT-I9305T</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>GT-I9308I</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S4</commonname>
-        <ro.product.model>GT-I9500</ro.product.model>
-        <ro.product.device>ja3g</ro.product.device>
-        <ro.product.board>universal5410</ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S4</commonname>
-        <ro.product.model>GT-I9502</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S4</commonname>
-        <ro.product.model>GT-I9505</ro.product.model>
-        <ro.product.device>jflte</ro.product.device>
-        <ro.product.board>MSM8960</ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S4 GPE</commonname>
-        <ro.product.model>GT-I9505G</ro.product.model>
-        <ro.product.device>jgedlte</ro.product.device>
-        <ro.product.board>MSM8960</ro.product.board>
-        <description></description>
-    </device>
-    <device>
-        <commonname>Galaxy S4 LTE+</commonname>
-        <ro.product.model>GT-I9506</ro.product.model>
-        <ro.product.device></ro.product.device>
-        <ro.product.board></ro.product.board>
-        <description></description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>GT-I9507</ro.product.model>
@@ -3378,13 +3364,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Galaxy S4</commonname>
-        <ro.product.model>SCH-I545</ro.product.model>
-        <ro.product.device>jfltevzw</ro.product.device>
-        <ro.product.board>MSM8960</ro.product.board>
-        <description></description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SCH-I545L</ro.product.model>
@@ -3532,13 +3511,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Galaxy S4</commonname>
-        <ro.product.model>SGH-I337</ro.product.model>
-        <ro.product.device>jflteatt</ro.product.device>
-        <ro.product.board>MSM8960</ro.product.board>
-        <description>Actual model is SGH-I337</description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SGH-I337Z</ro.product.model>
@@ -3602,13 +3574,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Galaxy S3</commonname>
-        <ro.product.model>SAMSUNG-SGH-I747</ro.product.model>
-        <ro.product.device>d2att</ro.product.device>
-        <ro.product.board>MSM8960</ro.product.board>
-        <description>Actual model is SGH-I747</description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SGH-I827</ro.product.model>
@@ -3784,13 +3749,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname></commonname>
-        <ro.product.model>SAMSUNG-SM-N900A</ro.product.model>
-        <ro.product.device>hlteatt</ro.product.device>
-        <ro.product.board>MSM8974</ro.product.board>
-        <description>Actual model is SM-N900A</description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SM-N900K</ro.product.model>
@@ -3833,13 +3791,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Note 3</commonname>
-        <ro.product.model>SM-N900V</ro.product.model>
-        <ro.product.device>hltevzw</ro.product.device>
-        <ro.product.board>MSM8974</ro.product.board>
-        <description></description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SM-N900W8</ro.product.model>
@@ -3875,13 +3826,6 @@ along with Foobar. If not, see http://www.gnu.org/licenses/.
         <ro.product.board></ro.product.board>
         <description></description>
     </device>
-    <device>
-        <commonname>Galaxy Note 10.1 2014 edition</commonname>
-        <ro.product.model>SM-P605</ro.product.model>
-        <ro.product.device>lt03lte</ro.product.device>
-        <ro.product.board>MSM8974</ro.product.board>
-        <description></description>
-    </device>
     <device>
         <commonname></commonname>
         <ro.product.model>SM-P605M</ro.product.model>