diff --git a/.gitattributes b/.gitattributes
index ecae2d87d..85b9dcfd6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
 *           text=auto
-*.cs        text diff=csharp
-*.json      text diff=json
-*.sln       text eol=crlf
-*.csproj    text eol=crlf
 *.bat       text eol=crlf
+*.cs        text diff=csharp
+*.csproj    text eol=crlf
+*.json      text eol=lf
 *.sh        text eol=lf
+*.sln       text eol=crlf
 publish.cmd text eol=lf
diff --git a/Distribution/Data/Locations/felucca.json b/Distribution/Data/Locations/felucca.json
index df21f48fa..74776f3f3 100644
--- a/Distribution/Data/Locations/felucca.json
+++ b/Distribution/Data/Locations/felucca.json
@@ -1,413 +1,413 @@
-{
-  "name": "Felucca",
-  "categories": [
-    {
-      "name": "Factions",
-      "categories": [
-        {
-          "name": "Towns",
-          "locations": [
-            { "name": "Britain", "location": [1592, 1680, 10] },
-            { "name": "Magincia", "location": [3714, 2235, 20] },
-            { "name": "Minoc", "location": [2471, 439, 15] },
-            { "name": "Moonglow", "location": [4436, 1083, 0] },
-            { "name": "Skara Brae", "location": [576, 2200, 0] },
-            { "name": "Trinsic", "location": [1914, 2717, 20] },
-            { "name": "Vesper", "location": [2982, 818, 0] },
-            { "name": "Yew", "location": [548, 979, 0] }
-          ]
-        }
-      ],
-      "locations": [
-        { "name": "Council of Mages", "location": [3750, 2241, 20] },
-        { "name": "Minax", "location": [1172, 2593, 0] },
-        { "name": "Shadowlords", "location": [969, 768, 0] },
-        { "name": "True Britannians", "location": [1419, 1622, 20] }
-      ]
-    },
-    {
-      "name": "Dungeons",
-      "categories": [
-        { "name": "Blighted Grove", "locations": [{ "name": "Entrance", "location": [586, 1643, -5] }] },
-        {
-          "name": "Covetous",
-          "locations": [
-            { "name": "Entrance", "location": [2499, 919, 0] },
-            { "name": "Level 1", "location": [5456, 1863, 0] },
-            { "name": "Level 2", "location": [5614, 1997, 0] },
-            { "name": "Level 3", "location": [5579, 1924, 0] },
-            { "name": "Lake Cave", "location": [5467, 1805, 7] },
-            { "name": "Torture Chambers", "location": [5552, 1807, 0] }
-          ]
-        },
-        {
-          "name": "Deceit",
-          "locations": [
-            { "name": "Entrance", "location": [4111, 432, 5] },
-            { "name": "Level 1", "location": [5188, 638, 0] },
-            { "name": "Level 2", "location": [5305, 533, 2] },
-            { "name": "Level 3", "location": [5137, 650, 5] },
-            { "name": "Level 4", "location": [5306, 652, 2] }
-          ]
-        },
-        {
-          "name": "Despise",
-          "locations": [
-            { "name": "Entrance", "location": [1298, 1080, 0] },
-            { "name": "Entryway", "location": [5587, 631, 30] },
-            { "name": "Level 1", "location": [5501, 570, 59] },
-            { "name": "Level 2", "location": [5519, 673, 20] },
-            { "name": "Level 3", "location": [5407, 859, 45] }
-          ]
-        },
-        {
-          "name": "Destard",
-          "locations": [
-            { "name": "Entrance", "location": [1176, 2637, 0] },
-            { "name": "Level 1", "location": [5243, 1006, 0] },
-            { "name": "Level 2", "location": [5143, 801, 4] },
-            { "name": "Level 3", "location": [5137, 986, 5] }
-          ]
-        },
-        {
-          "name": "Hythloth",
-          "locations": [
-            { "name": "Entrance", "location": [4721, 3822, 0] },
-            { "name": "Level 1", "location": [5905, 20, 46] },
-            { "name": "Level 2", "location": [5976, 169, 0] },
-            { "name": "Level 3", "location": [6083, 145, -20] },
-            { "name": "Level 4", "location": [6059, 89, 24] }
-          ]
-        },
-        {
-          "name": "Shame",
-          "locations": [
-            { "name": "Entrance", "location": [514, 1561, 0] },
-            { "name": "Level 1", "location": [5395, 126, 0] },
-            { "name": "Level 2", "location": [5515, 11, 5] },
-            { "name": "Level 3", "location": [5514, 148, 25] },
-            { "name": "Level 4", "location": [5875, 20, -5] }
-          ]
-        },
-        {
-          "name": "Wrong",
-          "locations": [
-            { "name": "Entrance", "location": [2043, 238, 10] },
-            { "name": "Level 1", "location": [5825, 630, 0] },
-            { "name": "Level 2", "location": [5690, 569, 25] },
-            { "name": "Level 3", "location": [5703, 639, 0] }
-          ]
-        },
-        {
-          "name": "Miscellaneous",
-          "locations": [
-            { "name": "Hyloth Fire Pit", "location": [4596, 3630, 30] },
-            { "name": "Yew-Britain Brigand Camp", "location": [885, 1682, 0] },
-            { "name": "Yew Fort of the Damned", "location": [972, 768, 0] }
-          ]
-        },
-        {
-          "name": "Terathan Keep",
-          "locations": [
-            { "name": "Entrance", "location": [5451, 3143, -60] },
-            { "name": "Level 1", "location": [5342, 1601, 0] },
-            { "name": "Champion Room", "location": [5205, 1585, 0] },
-            { "name": "Starroom", "location": [5139, 1767, 0] }
-          ]
-        },
-        {
-          "name": "Fire",
-          "locations": [
-            { "name": "Entrance", "location": [5760, 2908, 15] },
-            { "name": "Brit Entrance", "location": [2923, 3407, 8] },
-            { "name": "Level 1", "location": [5790, 1416, 40] },
-            { "name": "Level 2", "location": [5702, 1316, 1] }
-          ]
-        },
-        {
-          "name": "Ice",
-          "locations": [
-            { "name": "Entrance", "location": [5210, 2322, 30] },
-            { "name": "Brit Entrance", "location": [1999, 81, 4] },
-            { "name": "Level 1", "location": [5875, 150, 15] },
-            { "name": "Ratman Room", "location": [5834, 327, 18] },
-            { "name": "Ice Demon Lair", "location": [5700, 305, 0] }
-          ]
-        },
-        {
-          "name": "Orc Cave",
-          "locations": [
-            { "name": "Entrance", "location": [1019, 1431, 0] },
-            { "name": "Level 1", "location": [5137, 2014, 0] },
-            { "name": "Level 2", "location": [5332, 1376, 0] },
-            { "name": "Level 3", "location": [5272, 2036, 0] }
-          ]
-        },
-        { "name": "Painted Caves", "locations": [{ "name": "Entrance", "location": [1716, 2993, 0] }] },
-        {
-          "name": "Palace of Paroxysmus",
-          "locations": [{ "name": "Entrance", "location": [5576, 3018, 25] }]
-        },
-        { "name": "Prism of Light", "locations": [{ "name": "Entrance", "location": [3784, 1097, 14] }] },
-        { "name": "Sanctuary", "locations": [{ "name": "Entrance", "location": [764, 1646, 0] }] },
-        {
-          "name": "Solen Hives",
-          "categories": [
-            {
-              "name": "Area A",
-              "locations": [
-                { "name": "Entrance", "location": [729, 1451, 0] },
-                { "name": "Level 1", "location": [5658, 1795, 3] },
-                { "name": "Level 2", "location": [5726, 1891, 1] }
-              ]
-            },
-            {
-              "name": "Area B",
-              "locations": [
-                { "name": "Entrance", "location": [2607, 763, 0] },
-                { "name": "Level 1", "location": [5921, 1797, 1] },
-                { "name": "Level 2", "location": [5875, 1866, 2] }
-              ]
-            },
-            {
-              "name": "Area C",
-              "locations": [
-                { "name": "Entrance", "location": [1689, 2789, 0] },
-                { "name": "Level 1", "location": [5659, 2022, 0] },
-                { "name": "Level 2", "location": [5708, 1955, 0] }
-              ]
-            },
-            {
-              "name": "Area D",
-              "locations": [
-                { "name": "Entrance", "location": [1723, 814, 0] },
-                { "name": "Level 1", "location": [5916, 2019, 3] },
-                { "name": "Level 2", "location": [5813, 2012, -1] }
-              ]
-            },
-            { "name": "Area E", "locations": [{ "name": "Entrance", "location": [5732, 1858, 0] }] }
-          ],
-          "locations": [{ "name": "Central Area", "location": [5774, 1896, 20] }]
-        },
-        {
-          "name": "Khaldun",
-          "locations": [
-            { "name": "Entrance 1", "location": [6009, 3775, 19] },
-            { "name": "Entrance 2", "location": [5882, 3819, -1] },
-            { "name": "Level 1", "location": [5571, 1302, 0] }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Internal",
-      "categories": [
-        {
-          "name": "Jail Cells",
-          "locations": [
-            { "name": "Cell 1", "location": [5276, 1164, 0] },
-            { "name": "Cell 2", "location": [5286, 1164, 0] },
-            { "name": "Cell 3", "location": [5296, 1164, 0] },
-            { "name": "Cell 4", "location": [5306, 1164, 0] },
-            { "name": "Cell 5", "location": [5276, 1174, 0] },
-            { "name": "Cell 6", "location": [5286, 1174, 0] },
-            { "name": "Cell 7", "location": [5286, 1174, 0] },
-            { "name": "Cell 8", "location": [5306, 1174, 0] },
-            { "name": "Cell 9", "location": [5283, 1184, 0] },
-            { "name": "Cell 10", "location": [5304, 1184, 0] }
-          ]
-        }
-      ],
-      "locations": [{ "name": "Green Acres", "location": [5445, 1153, 0] }]
-    },
-    {
-      "name": "Shrines",
-      "locations": [
-        { "name": "Chaos", "location": [1456, 854, 0] },
-        { "name": "Compassion", "location": [1856, 872, -1] },
-        { "name": "Honesty", "location": [4217, 564, 36] },
-        { "name": "Honor", "location": [1730, 3528, 3] },
-        { "name": "Humility", "location": [4276, 3699, 0] },
-        { "name": "Justice", "location": [1301, 639, 16] },
-        { "name": "Sacrifice", "location": [3355, 299, 9] },
-        { "name": "Spirituality", "location": [1589, 2485, 5] },
-        { "name": "Valor", "location": [2496, 3932, 0] }
-      ]
-    },
-    {
-      "name": "Towns",
-      "categories": [
-        {
-          "name": "Britain",
-          "locations": [
-            { "name": "Blackthorn Castle", "location": [1533, 1415, 56] },
-            { "name": "Blackthorn Entrance", "location": [1523, 1456, 15] },
-            { "name": "British Castle", "location": [1323, 1624, 55] },
-            { "name": "British Entrance", "location": [1401, 1625, 28] },
-            { "name": "Cemetery", "location": [1384, 1497, 10] },
-            { "name": "Center", "location": [1475, 1645, 20] },
-            { "name": "Farmlands", "location": [1228, 1705, 0] },
-            { "name": "Park", "location": [1614, 1641, 35] },
-            { "name": "Suburbs", "location": [1662, 1572, 5] }
-          ]
-        },
-        {
-          "name": "Buccaneers Den",
-          "locations": [
-            { "name": "Bathhouse", "location": [2667, 2084, 5] },
-            { "name": "Docks", "location": [2736, 2166, 0] },
-            { "name": "Tunnels", "location": [2667, 2069, -20] }
-          ]
-        },
-        {
-          "name": "Cove",
-          "locations": [
-            { "name": "Cemetery", "location": [2443, 1123, 5] },
-            { "name": "Gates", "location": [2285, 1209, 0] },
-            { "name": "Guard Post", "location": [2218, 1116, 19] },
-            { "name": "Orc Fort", "location": [2171, 1332, 0] }
-          ]
-        },
-        {
-          "name": "Jhelom",
-          "locations": [
-            { "name": "Cemetery", "location": [1296, 3719, 0] },
-            { "name": "East Docks", "location": [1492, 3696, -3] },
-            { "name": "Fighting Pit", "location": [1398, 3742, -21] },
-            { "name": "Main Island", "location": [1414, 3816, 0] },
-            { "name": "Medium Island", "location": [1124, 3623, 5] },
-            { "name": "Small Island", "location": [1466, 4015, 5] }
-          ]
-        },
-        {
-          "name": "Magincia",
-          "locations": [
-            { "name": "Bank", "location": [3730, 2161, 20] },
-            { "name": "Docks", "location": [3675, 2259, 20] },
-            { "name": "Park", "location": [3719, 2063, 25] },
-            { "name": "Parliament", "location": [3792, 2248, 20] }
-          ]
-        },
-        {
-          "name": "Minoc",
-          "locations": [
-            { "name": "Bridge", "location": [2539, 501, 30] },
-            { "name": "Gypsy Camp", "location": [2540, 651, 0] },
-            { "name": "Mining Camp", "location": [2583, 528, 15] },
-            { "name": "North", "location": [2475, 417, 15] },
-            { "name": "South", "location": [2526, 583, 0] }
-          ]
-        },
-        {
-          "name": "Moonglow",
-          "locations": [
-            { "name": "Cemetery", "location": [4546, 1338, 8] },
-            { "name": "Center", "location": [4442, 1122, 5] },
-            { "name": "Docks", "location": [4406, 1045, -2] },
-            { "name": "Telescope", "location": [4707, 1124, 0] },
-            { "name": "Zoo", "location": [4549, 1378, 8] }
-          ]
-        },
-        {
-          "name": "Nujel'm",
-          "locations": [
-            { "name": "Cemetery", "location": [3536, 1156, 20] },
-            { "name": "Chess Board", "location": [3728, 1360, 5] },
-            { "name": "Docks", "location": [3803, 1279, 5] },
-            { "name": "East", "location": [3755, 1227, 0] },
-            { "name": "North", "location": [3668, 1116, 0] },
-            { "name": "Palace", "location": [3698, 1279, 20] },
-            { "name": "West", "location": [3572, 1211, 0] }
-          ]
-        },
-        {
-          "name": "Ocllo",
-          "locations": [
-            { "name": "Docks", "location": [3650, 2653, 0] },
-            { "name": "Farmlands", "location": [3722, 2647, 20] },
-            { "name": "North", "location": [3650, 2516, 0] }
-          ]
-        },
-        {
-          "name": "Serpents Hold",
-          "locations": [
-            { "name": "North", "location": [3023, 3417, 15] },
-            { "name": "South", "location": [2906, 3505, 10] },
-            { "name": "Guard Post", "location": [3011, 3526, 15] }
-          ]
-        },
-        {
-          "name": "Skara Brae",
-          "locations": [
-            { "name": "East", "location": [811, 2243, 0] },
-            { "name": "East Docks", "location": [716, 2233, -3] },
-            { "name": "North", "location": [746, 2165, 0] },
-            { "name": "South", "location": [899, 2381, 0] },
-            { "name": "West", "location": [601, 2171, 0] },
-            { "name": "West Docks", "location": [639, 2236, -3] }
-          ]
-        },
-        {
-          "name": "Trinsic",
-          "locations": [
-            { "name": "Center", "location": [1927, 2779, 0] },
-            { "name": "East Docks", "location": [2071, 2855, -3] },
-            { "name": "Island Park", "location": [2108, 2793, 2] },
-            { "name": "North", "location": [1894, 2666, 0] },
-            { "name": "South", "location": [1891, 2850, 20] },
-            { "name": "South Gate", "location": [2000, 2930, 0] },
-            { "name": "West Gate", "location": [1832, 2779, 0] }
-          ]
-        },
-        {
-          "name": "Vesper",
-          "locations": [
-            { "name": "Cemetery", "location": [2786, 867, 0] },
-            { "name": "Center", "location": [2882, 788, 0] },
-            { "name": "Docks", "location": [3013, 828, -3] },
-            { "name": "East", "location": [2760, 981, 0] },
-            { "name": "North", "location": [2907, 603, 0] }
-          ]
-        },
-        {
-          "name": "Wind",
-          "locations": [
-            { "name": "Caves", "location": [5166, 244, 15] },
-            { "name": "East", "location": [5336, 88, 15] },
-            { "name": "Entrance", "location": [1362, 896, 0] },
-            { "name": "Park", "location": [5211, 22, 15] },
-            { "name": "South", "location": [5223, 189, 5] },
-            { "name": "West", "location": [5180, 90, 25] }
-          ]
-        },
-        {
-          "name": "Yew",
-          "locations": [
-            { "name": "Cemetery", "location": [724, 1138, 0] },
-            { "name": "Center", "location": [535, 992, 0] },
-            { "name": "Courts and Prisons", "location": [354, 836, 20] },
-            { "name": "Empath Abbey", "location": [635, 860, 0] },
-            { "name": "Hidden Cave", "location": [313, 787, -24] },
-            { "name": "Orc Fort", "location": [633, 1499, 0] }
-          ]
-        },
-        {
-          "name": "Delucia",
-          "locations": [
-            { "name": "Watch Tower", "location": [5276, 3945, 37] },
-            { "name": "Center", "location": [5228, 3978, 37] },
-            { "name": "Orc Fort", "location": [5210, 3636, 3] }
-          ]
-        },
-        {
-          "name": "Papua",
-          "locations": [
-            { "name": "The Just Inn", "location": [5769, 3176, 0] },
-            { "name": "Center", "location": [5730, 3208, -4] },
-            { "name": "Docks", "location": [5825, 3256, 2] }
-          ]
-        }
-      ]
-    }
-  ]
-}
+{
+  "name": "Felucca",
+  "categories": [
+    {
+      "name": "Factions",
+      "categories": [
+        {
+          "name": "Towns",
+          "locations": [
+            { "name": "Britain", "location": [1592, 1680, 10] },
+            { "name": "Magincia", "location": [3714, 2235, 20] },
+            { "name": "Minoc", "location": [2471, 439, 15] },
+            { "name": "Moonglow", "location": [4436, 1083, 0] },
+            { "name": "Skara Brae", "location": [576, 2200, 0] },
+            { "name": "Trinsic", "location": [1914, 2717, 20] },
+            { "name": "Vesper", "location": [2982, 818, 0] },
+            { "name": "Yew", "location": [548, 979, 0] }
+          ]
+        }
+      ],
+      "locations": [
+        { "name": "Council of Mages", "location": [3750, 2241, 20] },
+        { "name": "Minax", "location": [1172, 2593, 0] },
+        { "name": "Shadowlords", "location": [969, 768, 0] },
+        { "name": "True Britannians", "location": [1419, 1622, 20] }
+      ]
+    },
+    {
+      "name": "Dungeons",
+      "categories": [
+        { "name": "Blighted Grove", "locations": [{ "name": "Entrance", "location": [586, 1643, -5] }] },
+        {
+          "name": "Covetous",
+          "locations": [
+            { "name": "Entrance", "location": [2499, 919, 0] },
+            { "name": "Level 1", "location": [5456, 1863, 0] },
+            { "name": "Level 2", "location": [5614, 1997, 0] },
+            { "name": "Level 3", "location": [5579, 1924, 0] },
+            { "name": "Lake Cave", "location": [5467, 1805, 7] },
+            { "name": "Torture Chambers", "location": [5552, 1807, 0] }
+          ]
+        },
+        {
+          "name": "Deceit",
+          "locations": [
+            { "name": "Entrance", "location": [4111, 432, 5] },
+            { "name": "Level 1", "location": [5188, 638, 0] },
+            { "name": "Level 2", "location": [5305, 533, 2] },
+            { "name": "Level 3", "location": [5137, 650, 5] },
+            { "name": "Level 4", "location": [5306, 652, 2] }
+          ]
+        },
+        {
+          "name": "Despise",
+          "locations": [
+            { "name": "Entrance", "location": [1298, 1080, 0] },
+            { "name": "Entryway", "location": [5587, 631, 30] },
+            { "name": "Level 1", "location": [5501, 570, 59] },
+            { "name": "Level 2", "location": [5519, 673, 20] },
+            { "name": "Level 3", "location": [5407, 859, 45] }
+          ]
+        },
+        {
+          "name": "Destard",
+          "locations": [
+            { "name": "Entrance", "location": [1176, 2637, 0] },
+            { "name": "Level 1", "location": [5243, 1006, 0] },
+            { "name": "Level 2", "location": [5143, 801, 4] },
+            { "name": "Level 3", "location": [5137, 986, 5] }
+          ]
+        },
+        {
+          "name": "Hythloth",
+          "locations": [
+            { "name": "Entrance", "location": [4721, 3822, 0] },
+            { "name": "Level 1", "location": [5905, 20, 46] },
+            { "name": "Level 2", "location": [5976, 169, 0] },
+            { "name": "Level 3", "location": [6083, 145, -20] },
+            { "name": "Level 4", "location": [6059, 89, 24] }
+          ]
+        },
+        {
+          "name": "Shame",
+          "locations": [
+            { "name": "Entrance", "location": [514, 1561, 0] },
+            { "name": "Level 1", "location": [5395, 126, 0] },
+            { "name": "Level 2", "location": [5515, 11, 5] },
+            { "name": "Level 3", "location": [5514, 148, 25] },
+            { "name": "Level 4", "location": [5875, 20, -5] }
+          ]
+        },
+        {
+          "name": "Wrong",
+          "locations": [
+            { "name": "Entrance", "location": [2043, 238, 10] },
+            { "name": "Level 1", "location": [5825, 630, 0] },
+            { "name": "Level 2", "location": [5690, 569, 25] },
+            { "name": "Level 3", "location": [5703, 639, 0] }
+          ]
+        },
+        {
+          "name": "Miscellaneous",
+          "locations": [
+            { "name": "Hyloth Fire Pit", "location": [4596, 3630, 30] },
+            { "name": "Yew-Britain Brigand Camp", "location": [885, 1682, 0] },
+            { "name": "Yew Fort of the Damned", "location": [972, 768, 0] }
+          ]
+        },
+        {
+          "name": "Terathan Keep",
+          "locations": [
+            { "name": "Entrance", "location": [5451, 3143, -60] },
+            { "name": "Level 1", "location": [5342, 1601, 0] },
+            { "name": "Champion Room", "location": [5205, 1585, 0] },
+            { "name": "Starroom", "location": [5139, 1767, 0] }
+          ]
+        },
+        {
+          "name": "Fire",
+          "locations": [
+            { "name": "Entrance", "location": [5760, 2908, 15] },
+            { "name": "Brit Entrance", "location": [2923, 3407, 8] },
+            { "name": "Level 1", "location": [5790, 1416, 40] },
+            { "name": "Level 2", "location": [5702, 1316, 1] }
+          ]
+        },
+        {
+          "name": "Ice",
+          "locations": [
+            { "name": "Entrance", "location": [5210, 2322, 30] },
+            { "name": "Brit Entrance", "location": [1999, 81, 4] },
+            { "name": "Level 1", "location": [5875, 150, 15] },
+            { "name": "Ratman Room", "location": [5834, 327, 18] },
+            { "name": "Ice Demon Lair", "location": [5700, 305, 0] }
+          ]
+        },
+        {
+          "name": "Orc Cave",
+          "locations": [
+            { "name": "Entrance", "location": [1019, 1431, 0] },
+            { "name": "Level 1", "location": [5137, 2014, 0] },
+            { "name": "Level 2", "location": [5332, 1376, 0] },
+            { "name": "Level 3", "location": [5272, 2036, 0] }
+          ]
+        },
+        { "name": "Painted Caves", "locations": [{ "name": "Entrance", "location": [1716, 2993, 0] }] },
+        {
+          "name": "Palace of Paroxysmus",
+          "locations": [{ "name": "Entrance", "location": [5576, 3018, 25] }]
+        },
+        { "name": "Prism of Light", "locations": [{ "name": "Entrance", "location": [3784, 1097, 14] }] },
+        { "name": "Sanctuary", "locations": [{ "name": "Entrance", "location": [764, 1646, 0] }] },
+        {
+          "name": "Solen Hives",
+          "categories": [
+            {
+              "name": "Area A",
+              "locations": [
+                { "name": "Entrance", "location": [729, 1451, 0] },
+                { "name": "Level 1", "location": [5658, 1795, 3] },
+                { "name": "Level 2", "location": [5726, 1891, 1] }
+              ]
+            },
+            {
+              "name": "Area B",
+              "locations": [
+                { "name": "Entrance", "location": [2607, 763, 0] },
+                { "name": "Level 1", "location": [5921, 1797, 1] },
+                { "name": "Level 2", "location": [5875, 1866, 2] }
+              ]
+            },
+            {
+              "name": "Area C",
+              "locations": [
+                { "name": "Entrance", "location": [1689, 2789, 0] },
+                { "name": "Level 1", "location": [5659, 2022, 0] },
+                { "name": "Level 2", "location": [5708, 1955, 0] }
+              ]
+            },
+            {
+              "name": "Area D",
+              "locations": [
+                { "name": "Entrance", "location": [1723, 814, 0] },
+                { "name": "Level 1", "location": [5916, 2019, 3] },
+                { "name": "Level 2", "location": [5813, 2012, -1] }
+              ]
+            },
+            { "name": "Area E", "locations": [{ "name": "Entrance", "location": [5732, 1858, 0] }] }
+          ],
+          "locations": [{ "name": "Central Area", "location": [5774, 1896, 20] }]
+        },
+        {
+          "name": "Khaldun",
+          "locations": [
+            { "name": "Entrance 1", "location": [6009, 3775, 19] },
+            { "name": "Entrance 2", "location": [5882, 3819, -1] },
+            { "name": "Level 1", "location": [5571, 1302, 0] }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Internal",
+      "categories": [
+        {
+          "name": "Jail Cells",
+          "locations": [
+            { "name": "Cell 1", "location": [5276, 1164, 0] },
+            { "name": "Cell 2", "location": [5286, 1164, 0] },
+            { "name": "Cell 3", "location": [5296, 1164, 0] },
+            { "name": "Cell 4", "location": [5306, 1164, 0] },
+            { "name": "Cell 5", "location": [5276, 1174, 0] },
+            { "name": "Cell 6", "location": [5286, 1174, 0] },
+            { "name": "Cell 7", "location": [5286, 1174, 0] },
+            { "name": "Cell 8", "location": [5306, 1174, 0] },
+            { "name": "Cell 9", "location": [5283, 1184, 0] },
+            { "name": "Cell 10", "location": [5304, 1184, 0] }
+          ]
+        }
+      ],
+      "locations": [{ "name": "Green Acres", "location": [5445, 1153, 0] }]
+    },
+    {
+      "name": "Shrines",
+      "locations": [
+        { "name": "Chaos", "location": [1456, 854, 0] },
+        { "name": "Compassion", "location": [1856, 872, -1] },
+        { "name": "Honesty", "location": [4217, 564, 36] },
+        { "name": "Honor", "location": [1730, 3528, 3] },
+        { "name": "Humility", "location": [4276, 3699, 0] },
+        { "name": "Justice", "location": [1301, 639, 16] },
+        { "name": "Sacrifice", "location": [3355, 299, 9] },
+        { "name": "Spirituality", "location": [1589, 2485, 5] },
+        { "name": "Valor", "location": [2496, 3932, 0] }
+      ]
+    },
+    {
+      "name": "Towns",
+      "categories": [
+        {
+          "name": "Britain",
+          "locations": [
+            { "name": "Blackthorn Castle", "location": [1533, 1415, 56] },
+            { "name": "Blackthorn Entrance", "location": [1523, 1456, 15] },
+            { "name": "British Castle", "location": [1323, 1624, 55] },
+            { "name": "British Entrance", "location": [1401, 1625, 28] },
+            { "name": "Cemetery", "location": [1384, 1497, 10] },
+            { "name": "Center", "location": [1475, 1645, 20] },
+            { "name": "Farmlands", "location": [1228, 1705, 0] },
+            { "name": "Park", "location": [1614, 1641, 35] },
+            { "name": "Suburbs", "location": [1662, 1572, 5] }
+          ]
+        },
+        {
+          "name": "Buccaneers Den",
+          "locations": [
+            { "name": "Bathhouse", "location": [2667, 2084, 5] },
+            { "name": "Docks", "location": [2736, 2166, 0] },
+            { "name": "Tunnels", "location": [2667, 2069, -20] }
+          ]
+        },
+        {
+          "name": "Cove",
+          "locations": [
+            { "name": "Cemetery", "location": [2443, 1123, 5] },
+            { "name": "Gates", "location": [2285, 1209, 0] },
+            { "name": "Guard Post", "location": [2218, 1116, 19] },
+            { "name": "Orc Fort", "location": [2171, 1332, 0] }
+          ]
+        },
+        {
+          "name": "Jhelom",
+          "locations": [
+            { "name": "Cemetery", "location": [1296, 3719, 0] },
+            { "name": "East Docks", "location": [1492, 3696, -3] },
+            { "name": "Fighting Pit", "location": [1398, 3742, -21] },
+            { "name": "Main Island", "location": [1414, 3816, 0] },
+            { "name": "Medium Island", "location": [1124, 3623, 5] },
+            { "name": "Small Island", "location": [1466, 4015, 5] }
+          ]
+        },
+        {
+          "name": "Magincia",
+          "locations": [
+            { "name": "Bank", "location": [3730, 2161, 20] },
+            { "name": "Docks", "location": [3675, 2259, 20] },
+            { "name": "Park", "location": [3719, 2063, 25] },
+            { "name": "Parliament", "location": [3792, 2248, 20] }
+          ]
+        },
+        {
+          "name": "Minoc",
+          "locations": [
+            { "name": "Bridge", "location": [2539, 501, 30] },
+            { "name": "Gypsy Camp", "location": [2540, 651, 0] },
+            { "name": "Mining Camp", "location": [2583, 528, 15] },
+            { "name": "North", "location": [2475, 417, 15] },
+            { "name": "South", "location": [2526, 583, 0] }
+          ]
+        },
+        {
+          "name": "Moonglow",
+          "locations": [
+            { "name": "Cemetery", "location": [4546, 1338, 8] },
+            { "name": "Center", "location": [4442, 1122, 5] },
+            { "name": "Docks", "location": [4406, 1045, -2] },
+            { "name": "Telescope", "location": [4707, 1124, 0] },
+            { "name": "Zoo", "location": [4549, 1378, 8] }
+          ]
+        },
+        {
+          "name": "Nujel'm",
+          "locations": [
+            { "name": "Cemetery", "location": [3536, 1156, 20] },
+            { "name": "Chess Board", "location": [3728, 1360, 5] },
+            { "name": "Docks", "location": [3803, 1279, 5] },
+            { "name": "East", "location": [3755, 1227, 0] },
+            { "name": "North", "location": [3668, 1116, 0] },
+            { "name": "Palace", "location": [3698, 1279, 20] },
+            { "name": "West", "location": [3572, 1211, 0] }
+          ]
+        },
+        {
+          "name": "Ocllo",
+          "locations": [
+            { "name": "Docks", "location": [3650, 2653, 0] },
+            { "name": "Farmlands", "location": [3722, 2647, 20] },
+            { "name": "North", "location": [3650, 2516, 0] }
+          ]
+        },
+        {
+          "name": "Serpents Hold",
+          "locations": [
+            { "name": "North", "location": [3023, 3417, 15] },
+            { "name": "South", "location": [2906, 3505, 10] },
+            { "name": "Guard Post", "location": [3011, 3526, 15] }
+          ]
+        },
+        {
+          "name": "Skara Brae",
+          "locations": [
+            { "name": "East", "location": [811, 2243, 0] },
+            { "name": "East Docks", "location": [716, 2233, -3] },
+            { "name": "North", "location": [746, 2165, 0] },
+            { "name": "South", "location": [899, 2381, 0] },
+            { "name": "West", "location": [601, 2171, 0] },
+            { "name": "West Docks", "location": [639, 2236, -3] }
+          ]
+        },
+        {
+          "name": "Trinsic",
+          "locations": [
+            { "name": "Center", "location": [1927, 2779, 0] },
+            { "name": "East Docks", "location": [2071, 2855, -3] },
+            { "name": "Island Park", "location": [2108, 2793, 2] },
+            { "name": "North", "location": [1894, 2666, 0] },
+            { "name": "South", "location": [1891, 2850, 20] },
+            { "name": "South Gate", "location": [2000, 2930, 0] },
+            { "name": "West Gate", "location": [1832, 2779, 0] }
+          ]
+        },
+        {
+          "name": "Vesper",
+          "locations": [
+            { "name": "Cemetery", "location": [2786, 867, 0] },
+            { "name": "Center", "location": [2882, 788, 0] },
+            { "name": "Docks", "location": [3013, 828, -3] },
+            { "name": "East", "location": [2760, 981, 0] },
+            { "name": "North", "location": [2907, 603, 0] }
+          ]
+        },
+        {
+          "name": "Wind",
+          "locations": [
+            { "name": "Caves", "location": [5166, 244, 15] },
+            { "name": "East", "location": [5336, 88, 15] },
+            { "name": "Entrance", "location": [1362, 896, 0] },
+            { "name": "Park", "location": [5211, 22, 15] },
+            { "name": "South", "location": [5223, 189, 5] },
+            { "name": "West", "location": [5180, 90, 25] }
+          ]
+        },
+        {
+          "name": "Yew",
+          "locations": [
+            { "name": "Cemetery", "location": [724, 1138, 0] },
+            { "name": "Center", "location": [535, 992, 0] },
+            { "name": "Courts and Prisons", "location": [354, 836, 20] },
+            { "name": "Empath Abbey", "location": [635, 860, 0] },
+            { "name": "Hidden Cave", "location": [313, 787, -24] },
+            { "name": "Orc Fort", "location": [633, 1499, 0] }
+          ]
+        },
+        {
+          "name": "Delucia",
+          "locations": [
+            { "name": "Watch Tower", "location": [5276, 3945, 37] },
+            { "name": "Center", "location": [5228, 3978, 37] },
+            { "name": "Orc Fort", "location": [5210, 3636, 3] }
+          ]
+        },
+        {
+          "name": "Papua",
+          "locations": [
+            { "name": "The Just Inn", "location": [5769, 3176, 0] },
+            { "name": "Center", "location": [5730, 3208, -4] },
+            { "name": "Docks", "location": [5825, 3256, 2] }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/Locations/ilshenar.json b/Distribution/Data/Locations/ilshenar.json
index e0ca153c8..f6e52665b 100644
--- a/Distribution/Data/Locations/ilshenar.json
+++ b/Distribution/Data/Locations/ilshenar.json
@@ -1,143 +1,143 @@
-{
-  "name": "Ilshenar",
-  "categories": [
-    {
-      "name": "Cities",
-      "categories": [
-        { "name": "Ancient Citadel", "locations": [{ "name": "Entrance", "location": [1518, 568, -14] }] },
-        {
-          "name": "Gargoyle City",
-          "locations": [
-            { "name": "Bank", "location": [852, 602, -40] },
-            { "name": "Central Area", "location": [836, 641, -20] }
-          ]
-        },
-        { "name": "Lakeshire", "locations": [{ "name": "Central Area", "location": [1203, 1124, -25] }] },
-        { "name": "Mistas", "locations": [{ "name": "Central Area", "location": [820, 1073, -30] }] },
-        { "name": "Montor", "locations": [{ "name": "Central Area", "location": [1643, 310, 48] }] },
-        { "name": "Req Volon", "locations": [{ "name": "Central Area", "location": [1362, 1073, -13] }] },
-        { "name": "Savage Camp", "locations": [{ "name": "Central Area", "location": [1251, 743, -80] }] },
-        { "name": "Terort Skitas", "locations": [{ "name": "Entrance", "location": [567, 437, 21] }] }
-      ]
-    },
-    {
-      "name": "Dungeons",
-      "categories": [
-        {
-          "name": "Ankh",
-          "locations": [
-            { "name": "Entrance", "location": [576, 1150, -100] },
-            { "name": "Level 1", "location": [155, 1482, -28] },
-            { "name": "Kirin passage", "location": [11, 874, -28] },
-            { "name": "Serpentine Passage", "location": [396, 1578, -28] }
-          ]
-        },
-        {
-          "name": "Blood",
-          "locations": [
-            { "name": "Entrance", "location": [1747, 1228, -1] },
-            { "name": "Level 1", "location": [2114, 834, -28] }
-          ]
-        },
-        {
-          "name": "Exodus",
-          "locations": [
-            { "name": "Entrance", "location": [835, 777, -80] },
-            { "name": "Level 1", "location": [1974, 115, -28] }
-          ]
-        },
-        {
-          "name": "Rock",
-          "locations": [
-            { "name": "Entrance", "location": [1788, 573, 70] },
-            { "name": "Level 1", "location": [2188, 318, -7] },
-            { "name": "Level 2", "location": [2188, 28, -27] }
-          ]
-        },
-        {
-          "name": "Sorcerers",
-          "locations": [
-            { "name": "Entrance", "location": [548, 462, -53] },
-            { "name": "Level 1", "location": [428, 109, -28] },
-            { "name": "Level 2", "location": [240, 23, -18] },
-            { "name": "Level 3", "location": [272, 136, -28] },
-            { "name": "Level 4", "location": [132, 124, -28] },
-            { "name": "Level 5", "location": [236, 121, -28] }
-          ]
-        },
-        {
-          "name": "Spectre",
-          "locations": [
-            { "name": "Entrance", "location": [1363, 1033, -8] },
-            { "name": "Level 1", "location": [1982, 1103, -28] }
-          ]
-        },
-        {
-          "name": "Wisp",
-          "locations": [
-            { "name": "Entrance", "location": [651, 1302, -58] },
-            { "name": "Level 1", "location": [627, 1525, -28] },
-            { "name": "Level 2", "location": [718, 1492, -28] },
-            { "name": "Level 3", "location": [832, 1551, -28] },
-            { "name": "Level 4", "location": [960, 1428, -28] },
-            { "name": "Level 5", "location": [942, 1465, -33] },
-            { "name": "Level 6", "location": [866, 1434, -28] },
-            { "name": "Level 7", "location": [807, 1548, -28] },
-            { "name": "Level 8", "location": [754, 1479, -28] }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Caves",
-      "categories": [
-        {
-          "name": "Ancient Lair",
-          "locations": [
-            { "name": "Entrance", "location": [940, 504, -30] },
-            { "name": "Level 1", "location": [85, 746, -28] }
-          ]
-        },
-        {
-          "name": "Lizard Passage",
-          "locations": [
-            { "name": "Entrance", "location": [314, 1334, -36] },
-            { "name": "Level 1", "location": [329, 1589, -18] },
-            { "name": "Level 2", "location": [227, 1337, -18] }
-          ]
-        },
-        { "name": "Mushroom Cave", "locations": [{ "name": "Entrance", "location": [1459, 1329, -24] }] },
-        {
-          "name": "Rat Cave",
-          "locations": [
-            { "name": "Entrance", "location": [1034, 1153, -23] },
-            { "name": "Level 1", "location": [1348, 1510, -3] },
-            { "name": "Level 2", "location": [1247, 1511, -28] }
-          ]
-        },
-        {
-          "name": "Spider Cave",
-          "locations": [
-            { "name": "Entrance", "location": [1421, 913, -19] },
-            { "name": "Level 1", "location": [1786, 991, -28] },
-            { "name": "Level 2", "location": [1517, 877, 10] },
-            { "name": "Ethereal Keep", "location": [1365, 1102, -26] }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Shrines",
-      "locations": [
-        { "name": "Compassion", "location": [1217, 469, -13] },
-        { "name": "Honesty", "location": [720, 1356, -60] },
-        { "name": "Honor", "location": [748, 728, -29] },
-        { "name": "Humility", "location": [287, 1016, 0] },
-        { "name": "Justice", "location": [987, 1007, -35] },
-        { "name": "Sacrifice", "location": [1175, 1287, -30] },
-        { "name": "Spirituality", "location": [1532, 1341, -3] },
-        { "name": "Valor", "location": [527, 218, -44] }
-      ]
-    }
-  ]
-}
+{
+  "name": "Ilshenar",
+  "categories": [
+    {
+      "name": "Cities",
+      "categories": [
+        { "name": "Ancient Citadel", "locations": [{ "name": "Entrance", "location": [1518, 568, -14] }] },
+        {
+          "name": "Gargoyle City",
+          "locations": [
+            { "name": "Bank", "location": [852, 602, -40] },
+            { "name": "Central Area", "location": [836, 641, -20] }
+          ]
+        },
+        { "name": "Lakeshire", "locations": [{ "name": "Central Area", "location": [1203, 1124, -25] }] },
+        { "name": "Mistas", "locations": [{ "name": "Central Area", "location": [820, 1073, -30] }] },
+        { "name": "Montor", "locations": [{ "name": "Central Area", "location": [1643, 310, 48] }] },
+        { "name": "Req Volon", "locations": [{ "name": "Central Area", "location": [1362, 1073, -13] }] },
+        { "name": "Savage Camp", "locations": [{ "name": "Central Area", "location": [1251, 743, -80] }] },
+        { "name": "Terort Skitas", "locations": [{ "name": "Entrance", "location": [567, 437, 21] }] }
+      ]
+    },
+    {
+      "name": "Dungeons",
+      "categories": [
+        {
+          "name": "Ankh",
+          "locations": [
+            { "name": "Entrance", "location": [576, 1150, -100] },
+            { "name": "Level 1", "location": [155, 1482, -28] },
+            { "name": "Kirin passage", "location": [11, 874, -28] },
+            { "name": "Serpentine Passage", "location": [396, 1578, -28] }
+          ]
+        },
+        {
+          "name": "Blood",
+          "locations": [
+            { "name": "Entrance", "location": [1747, 1228, -1] },
+            { "name": "Level 1", "location": [2114, 834, -28] }
+          ]
+        },
+        {
+          "name": "Exodus",
+          "locations": [
+            { "name": "Entrance", "location": [835, 777, -80] },
+            { "name": "Level 1", "location": [1974, 115, -28] }
+          ]
+        },
+        {
+          "name": "Rock",
+          "locations": [
+            { "name": "Entrance", "location": [1788, 573, 70] },
+            { "name": "Level 1", "location": [2188, 318, -7] },
+            { "name": "Level 2", "location": [2188, 28, -27] }
+          ]
+        },
+        {
+          "name": "Sorcerers",
+          "locations": [
+            { "name": "Entrance", "location": [548, 462, -53] },
+            { "name": "Level 1", "location": [428, 109, -28] },
+            { "name": "Level 2", "location": [240, 23, -18] },
+            { "name": "Level 3", "location": [272, 136, -28] },
+            { "name": "Level 4", "location": [132, 124, -28] },
+            { "name": "Level 5", "location": [236, 121, -28] }
+          ]
+        },
+        {
+          "name": "Spectre",
+          "locations": [
+            { "name": "Entrance", "location": [1363, 1033, -8] },
+            { "name": "Level 1", "location": [1982, 1103, -28] }
+          ]
+        },
+        {
+          "name": "Wisp",
+          "locations": [
+            { "name": "Entrance", "location": [651, 1302, -58] },
+            { "name": "Level 1", "location": [627, 1525, -28] },
+            { "name": "Level 2", "location": [718, 1492, -28] },
+            { "name": "Level 3", "location": [832, 1551, -28] },
+            { "name": "Level 4", "location": [960, 1428, -28] },
+            { "name": "Level 5", "location": [942, 1465, -33] },
+            { "name": "Level 6", "location": [866, 1434, -28] },
+            { "name": "Level 7", "location": [807, 1548, -28] },
+            { "name": "Level 8", "location": [754, 1479, -28] }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Caves",
+      "categories": [
+        {
+          "name": "Ancient Lair",
+          "locations": [
+            { "name": "Entrance", "location": [940, 504, -30] },
+            { "name": "Level 1", "location": [85, 746, -28] }
+          ]
+        },
+        {
+          "name": "Lizard Passage",
+          "locations": [
+            { "name": "Entrance", "location": [314, 1334, -36] },
+            { "name": "Level 1", "location": [329, 1589, -18] },
+            { "name": "Level 2", "location": [227, 1337, -18] }
+          ]
+        },
+        { "name": "Mushroom Cave", "locations": [{ "name": "Entrance", "location": [1459, 1329, -24] }] },
+        {
+          "name": "Rat Cave",
+          "locations": [
+            { "name": "Entrance", "location": [1034, 1153, -23] },
+            { "name": "Level 1", "location": [1348, 1510, -3] },
+            { "name": "Level 2", "location": [1247, 1511, -28] }
+          ]
+        },
+        {
+          "name": "Spider Cave",
+          "locations": [
+            { "name": "Entrance", "location": [1421, 913, -19] },
+            { "name": "Level 1", "location": [1786, 991, -28] },
+            { "name": "Level 2", "location": [1517, 877, 10] },
+            { "name": "Ethereal Keep", "location": [1365, 1102, -26] }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Shrines",
+      "locations": [
+        { "name": "Compassion", "location": [1217, 469, -13] },
+        { "name": "Honesty", "location": [720, 1356, -60] },
+        { "name": "Honor", "location": [748, 728, -29] },
+        { "name": "Humility", "location": [287, 1016, 0] },
+        { "name": "Justice", "location": [987, 1007, -35] },
+        { "name": "Sacrifice", "location": [1175, 1287, -30] },
+        { "name": "Spirituality", "location": [1532, 1341, -3] },
+        { "name": "Valor", "location": [527, 218, -44] }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/Locations/malas.json b/Distribution/Data/Locations/malas.json
index ee4367289..faf33ed8e 100644
--- a/Distribution/Data/Locations/malas.json
+++ b/Distribution/Data/Locations/malas.json
@@ -1,108 +1,108 @@
-{
-  "name": "Malas",
-  "categories": [
-    {
-      "name": "Towns",
-      "categories": [
-        {
-          "name": "Luna",
-          "locations": [
-            { "name": "Luna Moongate", "location": [1015, 527, -65] },
-            { "name": "Luna Bank", "location": [991, 519, -50] },
-            { "name": "Clothier's Colors", "location": [976, 527, -50] },
-            { "name": "Grand Arena", "location": [961, 638, -90] },
-            { "name": "Hardwoods and More", "location": [1002, 512, -50] },
-            { "name": "Paladin's Stopover", "location": [1005, 519, -30] },
-            { "name": "Proud Bridle", "location": [1023, 503, -70] },
-            { "name": "Open Market", "location": [992, 512, -50] },
-            { "name": "Sage's Refuge", "location": [1002, 527, -50] },
-            { "name": "Shining Blades", "location": [976, 512, -50] },
-            { "name": "Shrine of Wisdom", "location": [976, 510, -30] },
-            { "name": "Vault of Secrets", "location": [1072, 457, -90] }
-          ]
-        },
-        {
-          "name": "Umbra",
-          "locations": [
-            { "name": "Umbra Moongate", "location": [1998, 1387, -85] },
-            { "name": "Umbra Bridge", "location": [1941, 1321, -88] },
-            { "name": "Armoury of Souls", "location": [1984, 1367, -80] },
-            { "name": "Bloodletter's Guild", "location": [2084, 1372, -75] },
-            { "name": "Critter Pens", "location": [1992, 1326, -90] },
-            { "name": "Darkweave", "location": [2079, 1338, -81] },
-            { "name": "Ghast Refectory", "location": [2017, 1354, -90] },
-            { "name": "Gravedigger's Apparatus", "location": [2016, 1328, -80] },
-            { "name": "Lich's Hoard", "location": [2051, 1398, -90] },
-            { "name": "Necromancer Ampitheater", "location": [2024, 1383, -80] },
-            { "name": "Skeleton Swill", "location": [2030, 1350, -90] },
-            { "name": "Wailing Banshee Inn", "location": [2039, 1317, -84] },
-            { "name": "Warped Woodworks", "location": [2066, 1288, -80] }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Dungeons",
-      "categories": [
-        {
-          "name": "Doom",
-          "locations": [
-            { "name": "Entrance", "location": [2367, 1268, -85] },
-            { "name": "Tunnel", "location": [2352, 1267, -110] },
-            { "name": "Inside", "location": [381, 133, 33] },
-            { "name": "Gauntlet", "location": [433, 331, -2] },
-            { "name": "Guardian's Room", "location": [365, 15, -1] },
-            { "name": "Lamp Room", "location": [470, 95, -1] }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Sites",
-      "categories": [
-        {
-          "name": "Points of Interest",
-          "locations": [
-            { "name": "Broken Mountains", "location": [1111, 1461, -90] },
-            { "name": "Corrupted Forest", "location": [2172, 1144, -87] },
-            { "name": "Crumbling Continent", "location": [736, 1180, -95] },
-            { "name": "Crystal Fens", "location": [1388, 616, -85] },
-            { "name": "Divide of the Abyss", "location": [1545, 877, -85] },
-            { "name": "Dry Highlands", "location": [2128, 1668, -90] },
-            { "name": "Forgotten Pyramid", "location": [1825, 1799, -50] },
-            { "name": "Gravewater Lake", "location": [1596, 1656, -115] },
-            { "name": "Grimswind Ruins", "location": [2192, 330, -90] },
-            { "name": "Northern Crags", "location": [1580, 384, -50] },
-            { "name": "Orc Fortress", "location": [1340, 1226, -90] },
-            { "name": "Hanse's Hostel", "location": [1065, 1435, -90] }
-          ]
-        },
-        {
-          "name": "Caves and Mines",
-          "locations": [
-            { "name": "Mine 1", "location": [2082, 574, -90] },
-            { "name": "Mine 2", "location": [2157, 456, -90] },
-            { "name": "Mine 3", "location": [1811, 359, -90] },
-            { "name": "Mine 4", "location": [1790, 475, -90] },
-            { "name": "Mine 5", "location": [1628, 432, -86] },
-            { "name": "Mine 6", "location": [1658, 304, -90] },
-            { "name": "Mine 7", "location": [1071, 247, -90] },
-            { "name": "Mine 8", "location": [1095, 197, -90] },
-            { "name": "Mine 9", "location": [1195, 511, -90] }
-          ]
-        },
-        {
-          "name": "Orc Forts",
-          "locations": [
-            { "name": "Fort 1", "location": [912, 193, -79] },
-            { "name": "Fort 2", "location": [1666, 362, -50] },
-            { "name": "Fort 3", "location": [1364, 599, -86] },
-            { "name": "Fort 4", "location": [1205, 705, -88] },
-            { "name": "Fort 5", "location": [1257, 1331, -90] },
-            { "name": "Fort 6", "location": [1598, 1825, -110] }
-          ]
-        }
-      ]
-    }
-  ]
-}
+{
+  "name": "Malas",
+  "categories": [
+    {
+      "name": "Towns",
+      "categories": [
+        {
+          "name": "Luna",
+          "locations": [
+            { "name": "Luna Moongate", "location": [1015, 527, -65] },
+            { "name": "Luna Bank", "location": [991, 519, -50] },
+            { "name": "Clothier's Colors", "location": [976, 527, -50] },
+            { "name": "Grand Arena", "location": [961, 638, -90] },
+            { "name": "Hardwoods and More", "location": [1002, 512, -50] },
+            { "name": "Paladin's Stopover", "location": [1005, 519, -30] },
+            { "name": "Proud Bridle", "location": [1023, 503, -70] },
+            { "name": "Open Market", "location": [992, 512, -50] },
+            { "name": "Sage's Refuge", "location": [1002, 527, -50] },
+            { "name": "Shining Blades", "location": [976, 512, -50] },
+            { "name": "Shrine of Wisdom", "location": [976, 510, -30] },
+            { "name": "Vault of Secrets", "location": [1072, 457, -90] }
+          ]
+        },
+        {
+          "name": "Umbra",
+          "locations": [
+            { "name": "Umbra Moongate", "location": [1998, 1387, -85] },
+            { "name": "Umbra Bridge", "location": [1941, 1321, -88] },
+            { "name": "Armoury of Souls", "location": [1984, 1367, -80] },
+            { "name": "Bloodletter's Guild", "location": [2084, 1372, -75] },
+            { "name": "Critter Pens", "location": [1992, 1326, -90] },
+            { "name": "Darkweave", "location": [2079, 1338, -81] },
+            { "name": "Ghast Refectory", "location": [2017, 1354, -90] },
+            { "name": "Gravedigger's Apparatus", "location": [2016, 1328, -80] },
+            { "name": "Lich's Hoard", "location": [2051, 1398, -90] },
+            { "name": "Necromancer Ampitheater", "location": [2024, 1383, -80] },
+            { "name": "Skeleton Swill", "location": [2030, 1350, -90] },
+            { "name": "Wailing Banshee Inn", "location": [2039, 1317, -84] },
+            { "name": "Warped Woodworks", "location": [2066, 1288, -80] }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Dungeons",
+      "categories": [
+        {
+          "name": "Doom",
+          "locations": [
+            { "name": "Entrance", "location": [2367, 1268, -85] },
+            { "name": "Tunnel", "location": [2352, 1267, -110] },
+            { "name": "Inside", "location": [381, 133, 33] },
+            { "name": "Gauntlet", "location": [433, 331, -2] },
+            { "name": "Guardian's Room", "location": [365, 15, -1] },
+            { "name": "Lamp Room", "location": [470, 95, -1] }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Sites",
+      "categories": [
+        {
+          "name": "Points of Interest",
+          "locations": [
+            { "name": "Broken Mountains", "location": [1111, 1461, -90] },
+            { "name": "Corrupted Forest", "location": [2172, 1144, -87] },
+            { "name": "Crumbling Continent", "location": [736, 1180, -95] },
+            { "name": "Crystal Fens", "location": [1388, 616, -85] },
+            { "name": "Divide of the Abyss", "location": [1545, 877, -85] },
+            { "name": "Dry Highlands", "location": [2128, 1668, -90] },
+            { "name": "Forgotten Pyramid", "location": [1825, 1799, -50] },
+            { "name": "Gravewater Lake", "location": [1596, 1656, -115] },
+            { "name": "Grimswind Ruins", "location": [2192, 330, -90] },
+            { "name": "Northern Crags", "location": [1580, 384, -50] },
+            { "name": "Orc Fortress", "location": [1340, 1226, -90] },
+            { "name": "Hanse's Hostel", "location": [1065, 1435, -90] }
+          ]
+        },
+        {
+          "name": "Caves and Mines",
+          "locations": [
+            { "name": "Mine 1", "location": [2082, 574, -90] },
+            { "name": "Mine 2", "location": [2157, 456, -90] },
+            { "name": "Mine 3", "location": [1811, 359, -90] },
+            { "name": "Mine 4", "location": [1790, 475, -90] },
+            { "name": "Mine 5", "location": [1628, 432, -86] },
+            { "name": "Mine 6", "location": [1658, 304, -90] },
+            { "name": "Mine 7", "location": [1071, 247, -90] },
+            { "name": "Mine 8", "location": [1095, 197, -90] },
+            { "name": "Mine 9", "location": [1195, 511, -90] }
+          ]
+        },
+        {
+          "name": "Orc Forts",
+          "locations": [
+            { "name": "Fort 1", "location": [912, 193, -79] },
+            { "name": "Fort 2", "location": [1666, 362, -50] },
+            { "name": "Fort 3", "location": [1364, 599, -86] },
+            { "name": "Fort 4", "location": [1205, 705, -88] },
+            { "name": "Fort 5", "location": [1257, 1331, -90] },
+            { "name": "Fort 6", "location": [1598, 1825, -110] }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/Locations/termur.json b/Distribution/Data/Locations/termur.json
index 252982709..276ea7a39 100644
--- a/Distribution/Data/Locations/termur.json
+++ b/Distribution/Data/Locations/termur.json
@@ -1,90 +1,90 @@
-{
-  "name": "TerMur",
-  "categories": [
-    {
-      "name": "Towns",
-      "categories": [
-        {
-          "name": "Royal City",
-          "locations": [{ "name": "Royal City Moongate", "location": [855, 3526, -43] }]
-        },
-        {
-          "name": "Holy City",
-          "locations": [{ "name": "Holy City Moongate", "location": [928, 3989, -40] }]
-        },
-        { "name": "Dugan", "locations": [{ "name": "Dugan", "location": [1107, 1131, -52] }] }
-      ]
-    },
-    {
-      "name": "Dungeons",
-      "categories": [
-        {
-          "name": "Tomb of Kings",
-          "locations": [
-            { "name": "Entrance", "location": [997, 3843, -41] },
-            { "name": "Gate to Stygian Abyss", "location": [38, 29, 0] }
-          ]
-        },
-        {
-          "name": "Stygian Abyss",
-          "locations": [
-            { "name": "Exit to Tomb of Kings", "location": [946, 71, 72] },
-            { "name": "Exit to Underworld", "location": [521, 921, 36] },
-            { "name": "Abyssal Lair Entrance", "location": [985, 366, -11] },
-            { "name": "Cavern of the Discarded", "location": [912, 501, -12] },
-            { "name": "Clan Scratch", "location": [959, 548, -14] },
-            { "name": "Crimson Veins", "location": [974, 164, -11] },
-            { "name": "Enslaved Goblins", "location": [581, 815, -45] },
-            { "name": "Fairy Dragon Lair", "location": [888, 277, 3] },
-            { "name": "Fire Temple Ruins", "location": [519, 765, -92] },
-            { "name": "Hydra", "location": [793, 753, 53] },
-            { "name": "Lands of the Lich", "location": [538, 656, 8] },
-            { "name": "Lava Caldera", "location": [587, 895, -73] },
-            { "name": "Medusa's Lair", "location": [818, 755, 50] },
-            { "name": "Passage of Tears", "location": [685, 579, -15] },
-            { "name": "Secret Garden", "location": [462, 719, 22] },
-            { "name": "Serpent Lair", "location": [711, 720, -11] },
-            { "name": "Silver Sapling", "location": [341, 619, 26] },
-            { "name": "Stygian Dragon Lair Entrance", "location": [851, 279, -12] },
-            { "name": "Sutek the Mage", "location": [924, 595, -14] }
-          ]
-        },
-        { "name": "Underworld", "locations": [{ "name": "Entrance", "location": [1128, 1211, -2] }] }
-      ]
-    },
-    {
-      "name": "Sites",
-      "categories": [
-        {
-          "name": "Regions",
-          "locations": [
-            { "name": "Atoll Bend", "location": [1118, 3408, -42] },
-            { "name": "Chicken Chase", "location": [560, 3412, 37] },
-            { "name": "City Residential", "location": [952, 3531, -43] },
-            { "name": "Coral Desert", "location": [1047, 2980, 62] },
-            { "name": "Fishermans Reach", "location": [631, 3035, 36] },
-            { "name": "Gated Isle", "location": [703, 3934, -31] },
-            { "name": "High Plain", "location": [863, 2931, 38] },
-            { "name": "Holy City Island", "location": [996, 3905, -42] },
-            { "name": "Kepetch Waste", "location": [447, 3188, 20] },
-            { "name": "Lava Lake", "location": [407, 3010, -24] },
-            { "name": "Lavapit Pyramid", "location": [740, 3691, -43] },
-            { "name": "Lost Settlement", "location": [526, 3822, -44] },
-            { "name": "Northern Steppes", "location": [822, 3063, 61] },
-            { "name": "Raptor Island", "location": [816, 3778, -42] },
-            { "name": "Royal Park", "location": [711, 3255, 38] },
-            { "name": "Shrine of Singularity", "location": [995, 3814, -23] },
-            { "name": "Slith Valley", "location": [1078, 3331, -42] },
-            { "name": "Spider Island", "location": [1115, 3730, -42] },
-            { "name": "Spiders Guarde", "location": [1109, 3606, -45] },
-            { "name": "Talon Point", "location": [676, 3831, -39] },
-            { "name": "Treefellow Course", "location": [570, 2936, 39] },
-            { "name": "Void Isle", "location": [440, 3577, 38] },
-            { "name": "Walled Circus", "location": [370, 3273, 0] },
-            { "name": "Waterfall Point", "location": [661, 2894, 39] }
-          ]
-        }
-      ]
-    }
-  ]
-}
+{
+  "name": "TerMur",
+  "categories": [
+    {
+      "name": "Towns",
+      "categories": [
+        {
+          "name": "Royal City",
+          "locations": [{ "name": "Royal City Moongate", "location": [855, 3526, -43] }]
+        },
+        {
+          "name": "Holy City",
+          "locations": [{ "name": "Holy City Moongate", "location": [928, 3989, -40] }]
+        },
+        { "name": "Dugan", "locations": [{ "name": "Dugan", "location": [1107, 1131, -52] }] }
+      ]
+    },
+    {
+      "name": "Dungeons",
+      "categories": [
+        {
+          "name": "Tomb of Kings",
+          "locations": [
+            { "name": "Entrance", "location": [997, 3843, -41] },
+            { "name": "Gate to Stygian Abyss", "location": [38, 29, 0] }
+          ]
+        },
+        {
+          "name": "Stygian Abyss",
+          "locations": [
+            { "name": "Exit to Tomb of Kings", "location": [946, 71, 72] },
+            { "name": "Exit to Underworld", "location": [521, 921, 36] },
+            { "name": "Abyssal Lair Entrance", "location": [985, 366, -11] },
+            { "name": "Cavern of the Discarded", "location": [912, 501, -12] },
+            { "name": "Clan Scratch", "location": [959, 548, -14] },
+            { "name": "Crimson Veins", "location": [974, 164, -11] },
+            { "name": "Enslaved Goblins", "location": [581, 815, -45] },
+            { "name": "Fairy Dragon Lair", "location": [888, 277, 3] },
+            { "name": "Fire Temple Ruins", "location": [519, 765, -92] },
+            { "name": "Hydra", "location": [793, 753, 53] },
+            { "name": "Lands of the Lich", "location": [538, 656, 8] },
+            { "name": "Lava Caldera", "location": [587, 895, -73] },
+            { "name": "Medusa's Lair", "location": [818, 755, 50] },
+            { "name": "Passage of Tears", "location": [685, 579, -15] },
+            { "name": "Secret Garden", "location": [462, 719, 22] },
+            { "name": "Serpent Lair", "location": [711, 720, -11] },
+            { "name": "Silver Sapling", "location": [341, 619, 26] },
+            { "name": "Stygian Dragon Lair Entrance", "location": [851, 279, -12] },
+            { "name": "Sutek the Mage", "location": [924, 595, -14] }
+          ]
+        },
+        { "name": "Underworld", "locations": [{ "name": "Entrance", "location": [1128, 1211, -2] }] }
+      ]
+    },
+    {
+      "name": "Sites",
+      "categories": [
+        {
+          "name": "Regions",
+          "locations": [
+            { "name": "Atoll Bend", "location": [1118, 3408, -42] },
+            { "name": "Chicken Chase", "location": [560, 3412, 37] },
+            { "name": "City Residential", "location": [952, 3531, -43] },
+            { "name": "Coral Desert", "location": [1047, 2980, 62] },
+            { "name": "Fishermans Reach", "location": [631, 3035, 36] },
+            { "name": "Gated Isle", "location": [703, 3934, -31] },
+            { "name": "High Plain", "location": [863, 2931, 38] },
+            { "name": "Holy City Island", "location": [996, 3905, -42] },
+            { "name": "Kepetch Waste", "location": [447, 3188, 20] },
+            { "name": "Lava Lake", "location": [407, 3010, -24] },
+            { "name": "Lavapit Pyramid", "location": [740, 3691, -43] },
+            { "name": "Lost Settlement", "location": [526, 3822, -44] },
+            { "name": "Northern Steppes", "location": [822, 3063, 61] },
+            { "name": "Raptor Island", "location": [816, 3778, -42] },
+            { "name": "Royal Park", "location": [711, 3255, 38] },
+            { "name": "Shrine of Singularity", "location": [995, 3814, -23] },
+            { "name": "Slith Valley", "location": [1078, 3331, -42] },
+            { "name": "Spider Island", "location": [1115, 3730, -42] },
+            { "name": "Spiders Guarde", "location": [1109, 3606, -45] },
+            { "name": "Talon Point", "location": [676, 3831, -39] },
+            { "name": "Treefellow Course", "location": [570, 2936, 39] },
+            { "name": "Void Isle", "location": [440, 3577, 38] },
+            { "name": "Walled Circus", "location": [370, 3273, 0] },
+            { "name": "Waterfall Point", "location": [661, 2894, 39] }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/Locations/tokuno.json b/Distribution/Data/Locations/tokuno.json
index 17388df5b..42a7b4eef 100644
--- a/Distribution/Data/Locations/tokuno.json
+++ b/Distribution/Data/Locations/tokuno.json
@@ -1,64 +1,64 @@
-{
-  "name": "Tokuno",
-  "categories": [
-    {
-      "name": "Tokuno Islands",
-      "categories": [
-        {
-          "name": "Towns",
-          "categories": [
-            {
-              "name": "Zento",
-              "locations": [
-                { "name": "Zento Moongate", "x": 802, "y": 1204, "z": 25 },
-                { "name": "Zento Bank", "x": 735, "y": 1255, "z": 30 }
-              ]
-            }
-          ]
-        },
-        {
-          "name": "Dungeons",
-          "categories": [
-            { "name": "Fan Dancer's Dojo", "locations": [{ "name": "Entrance", "x": 977, "y": 218, "z": 23 }] },
-            { "name": "Yomotsu Mines", "locations": [{ "name": "Entrance", "x": 259, "y": 785, "z": 64 }] }
-          ]
-        },
-        {
-          "name": "Sites",
-          "categories": [
-            {
-              "name": "Makoto-Jima",
-              "locations": [
-                { "name": "Moongate", "x": 802, "y": 1204, "z": 25 },
-                { "name": "Shrine", "x": 718, "y": 1161, "z": 25 },
-                { "name": "The Waste", "x": 724, "y": 943, "z": 42 }
-              ]
-            },
-            {
-              "name": "Isamu-Jima",
-              "locations": [
-                { "name": "Moongate", "x": 1169, "y": 998, "z": 41 },
-                { "name": "Shrine", "x": 1047, "y": 512, "z": 15 },
-                { "name": "Lotus Lakes", "x": 1066, "y": 817, "z": 20 },
-                { "name": "Mount Sho", "x": 1159, "y": 696, "z": 70 },
-                { "name": "Dragon Valley", "x": 948, "y": 432, "z": 8 },
-                { "name": "Winter Spur", "x": 926, "y": 162, "z": 34 }
-              ]
-            },
-            {
-              "name": "Homare-Jima",
-              "locations": [
-                { "name": "Moongate", "x": 270, "y": 628, "z": 15 },
-                { "name": "Shrine", "x": 295, "y": 712, "z": 55 },
-                { "name": "Field of Echoes", "x": 160, "y": 654, "z": 36 },
-                { "name": "Crane Marsh", "x": 232, "y": 1107, "z": 10 },
-                { "name": "Bushido Dojo", "x": 334, "y": 407, "z": 32 },
-                { "name": "Kitsune Woods", "x": 523, "y": 520, "z": 32 }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
+{
+  "name": "Tokuno",
+  "categories": [
+    {
+      "name": "Tokuno Islands",
+      "categories": [
+        {
+          "name": "Towns",
+          "categories": [
+            {
+              "name": "Zento",
+              "locations": [
+                { "name": "Zento Moongate", "x": 802, "y": 1204, "z": 25 },
+                { "name": "Zento Bank", "x": 735, "y": 1255, "z": 30 }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "Dungeons",
+          "categories": [
+            { "name": "Fan Dancer's Dojo", "locations": [{ "name": "Entrance", "x": 977, "y": 218, "z": 23 }] },
+            { "name": "Yomotsu Mines", "locations": [{ "name": "Entrance", "x": 259, "y": 785, "z": 64 }] }
+          ]
+        },
+        {
+          "name": "Sites",
+          "categories": [
+            {
+              "name": "Makoto-Jima",
+              "locations": [
+                { "name": "Moongate", "x": 802, "y": 1204, "z": 25 },
+                { "name": "Shrine", "x": 718, "y": 1161, "z": 25 },
+                { "name": "The Waste", "x": 724, "y": 943, "z": 42 }
+              ]
+            },
+            {
+              "name": "Isamu-Jima",
+              "locations": [
+                { "name": "Moongate", "x": 1169, "y": 998, "z": 41 },
+                { "name": "Shrine", "x": 1047, "y": 512, "z": 15 },
+                { "name": "Lotus Lakes", "x": 1066, "y": 817, "z": 20 },
+                { "name": "Mount Sho", "x": 1159, "y": 696, "z": 70 },
+                { "name": "Dragon Valley", "x": 948, "y": 432, "z": 8 },
+                { "name": "Winter Spur", "x": 926, "y": 162, "z": 34 }
+              ]
+            },
+            {
+              "name": "Homare-Jima",
+              "locations": [
+                { "name": "Moongate", "x": 270, "y": 628, "z": 15 },
+                { "name": "Shrine", "x": 295, "y": 712, "z": 55 },
+                { "name": "Field of Echoes", "x": 160, "y": 654, "z": 36 },
+                { "name": "Crane Marsh", "x": 232, "y": 1107, "z": 10 },
+                { "name": "Bushido Dojo", "x": 334, "y": 407, "z": 32 },
+                { "name": "Kitsune Woods", "x": 523, "y": 520, "z": 32 }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/Locations/trammel.json b/Distribution/Data/Locations/trammel.json
index 3e43051b4..9eb8b8c6f 100644
--- a/Distribution/Data/Locations/trammel.json
+++ b/Distribution/Data/Locations/trammel.json
@@ -1,384 +1,384 @@
-{
-  "name": "Trammel",
-  "categories": [
-    {
-      "name": "Dungeons",
-      "categories": [
-        { "name": "Blighted Grove", "locations": [{ "name": "Entrance", "location": [586, 1643, -5] }] },
-        {
-          "name": "Covetous",
-          "locations": [
-            { "name": "Entrance", "location": [2499, 919, 0] },
-            { "name": "Level 1", "location": [5456, 1863, 0] },
-            { "name": "Level 2", "location": [5614, 1997, 0] },
-            { "name": "Level 3", "location": [5579, 1924, 0] },
-            { "name": "Lake Cave", "location": [5467, 1805, 7] },
-            { "name": "Torture Chambers", "location": [5552, 1807, 0] }
-          ]
-        },
-        {
-          "name": "Deceit",
-          "locations": [
-            { "name": "Entrance", "location": [4111, 432, 5] },
-            { "name": "Level 1", "location": [5188, 638, 0] },
-            { "name": "Level 2", "location": [5305, 533, 2] },
-            { "name": "Level 3", "location": [5137, 650, 5] },
-            { "name": "Level 4", "location": [5306, 652, 2] }
-          ]
-        },
-        {
-          "name": "Despise",
-          "locations": [
-            { "name": "Entrance", "location": [1298, 1080, 0] },
-            { "name": "Entryway", "location": [5587, 631, 30] },
-            { "name": "Level 1", "location": [5501, 570, 59] },
-            { "name": "Level 2", "location": [5519, 673, 20] },
-            { "name": "Level 3", "location": [5407, 859, 45] }
-          ]
-        },
-        {
-          "name": "Destard",
-          "locations": [
-            { "name": "Entrance", "location": [1176, 2637, 0] },
-            { "name": "Level 1", "location": [5243, 1006, 0] },
-            { "name": "Level 2", "location": [5143, 801, 4] },
-            { "name": "Level 3", "location": [5137, 986, 5] }
-          ]
-        },
-        {
-          "name": "Hythloth",
-          "locations": [
-            { "name": "Entrance", "location": [4721, 3822, 0] },
-            { "name": "Level 1", "location": [5905, 20, 46] },
-            { "name": "Level 2", "location": [5976, 169, 0] },
-            { "name": "Level 3", "location": [6083, 145, -20] },
-            { "name": "Level 4", "location": [6059, 89, 24] }
-          ]
-        },
-        {
-          "name": "Shame",
-          "locations": [
-            { "name": "Entrance", "location": [514, 1561, 0] },
-            { "name": "Level 1", "location": [5395, 126, 0] },
-            { "name": "Level 2", "location": [5515, 11, 5] },
-            { "name": "Level 3", "location": [5514, 148, 25] },
-            { "name": "Level 4", "location": [5875, 20, -5] }
-          ]
-        },
-        {
-          "name": "Wrong",
-          "locations": [
-            { "name": "Entrance", "location": [2043, 238, 10] },
-            { "name": "Level 1", "location": [5825, 630, 0] },
-            { "name": "Level 2", "location": [5690, 569, 25] },
-            { "name": "Level 3", "location": [5703, 639, 0] }
-          ]
-        },
-        {
-          "name": "Miscellaneous",
-          "locations": [
-            { "name": "Hyloth Fire Pit", "location": [4596, 3630, 30] },
-            { "name": "Yew-Britain Brigand Camp", "location": [885, 1682, 0] },
-            { "name": "Yew Fort of the Damned", "location": [972, 768, 0] }
-          ]
-        },
-        {
-          "name": "Terathan Keep",
-          "locations": [
-            { "name": "Entrance", "location": [5451, 3143, -60] },
-            { "name": "Level 1", "location": [5342, 1601, 0] },
-            { "name": "Champion Room", "location": [5205, 1585, 0] },
-            { "name": "Starroom", "location": [5139, 1767, 0] }
-          ]
-        },
-        {
-          "name": "Fire",
-          "locations": [
-            { "name": "Entrance", "location": [5760, 2908, 15] },
-            { "name": "Brit Entrance", "location": [2923, 3407, 8] },
-            { "name": "Level 1", "location": [5790, 1416, 40] },
-            { "name": "Level 2", "location": [5702, 1316, 1] }
-          ]
-        },
-        {
-          "name": "Ice",
-          "locations": [
-            { "name": "Entrance", "location": [5210, 2322, 30] },
-            { "name": "Brit Entrance", "location": [1999, 81, 4] },
-            { "name": "Level 1", "location": [5875, 150, 15] },
-            { "name": "Ratman Room", "location": [5834, 327, 18] },
-            { "name": "Ice Demon Lair", "location": [5700, 305, 0] }
-          ]
-        },
-        {
-          "name": "Orc Cave",
-          "locations": [
-            { "name": "Entrance", "location": [1019, 1431, 0] },
-            { "name": "Level 1", "location": [5137, 2014, 0] },
-            { "name": "Level 2", "location": [5332, 1376, 0] },
-            { "name": "Level 3", "location": [5272, 2036, 0] }
-          ]
-        },
-        { "name": "Painted Caves", "locations": [{ "name": "Entrance", "location": [1716, 2993, 0] }] },
-        {
-          "name": "Palace of Paroxysmus",
-          "locations": [{ "name": "Entrance", "location": [5576, 3018, 25] }]
-        },
-        { "name": "Prism of Light", "locations": [{ "name": "Entrance", "location": [3784, 1097, 14] }] },
-        { "name": "Sanctuary", "locations": [{ "name": "Entrance", "location": [764, 1646, 0] }] },
-        {
-          "name": "Solen Hives",
-          "categories": [
-            {
-              "name": "Area A",
-              "locations": [
-                { "name": "Entrance", "location": [729, 1451, 0] },
-                { "name": "Level 1", "location": [5658, 1795, 3] },
-                { "name": "Level 2", "location": [5726, 1891, 1] }
-              ]
-            },
-            {
-              "name": "Area B",
-              "locations": [
-                { "name": "Entrance", "location": [2607, 763, 0] },
-                { "name": "Level 1", "location": [5921, 1797, 1] },
-                { "name": "Level 2", "location": [5875, 1866, 2] }
-              ]
-            },
-            {
-              "name": "Area C",
-              "locations": [
-                { "name": "Entrance", "location": [1689, 2789, 0] },
-                { "name": "Level 1", "location": [5659, 2022, 0] },
-                { "name": "Level 2", "location": [5708, 1955, 0] }
-              ]
-            },
-            {
-              "name": "Area D",
-              "locations": [
-                { "name": "Entrance", "location": [1723, 814, 0] },
-                { "name": "Level 1", "location": [5916, 2019, 3] },
-                { "name": "Level 2", "location": [5813, 2012, -1] }
-              ]
-            },
-            { "name": "Area E", "locations": [{ "name": "Entrance", "location": [5732, 1858, 0] }] }
-          ],
-          "locations": [{ "name": "Central Area", "location": [5774, 1896, 20] }]
-        }
-      ]
-    },
-    {
-      "name": "Internal",
-      "categories": [
-        {
-          "name": "Jail Cells",
-          "locations": [
-            { "name": "Cell 1", "location": [5276, 1164, 0] },
-            { "name": "Cell 2", "location": [5286, 1164, 0] },
-            { "name": "Cell 3", "location": [5296, 1164, 0] },
-            { "name": "Cell 4", "location": [5306, 1164, 0] },
-            { "name": "Cell 5", "location": [5276, 1174, 0] },
-            { "name": "Cell 6", "location": [5286, 1174, 0] },
-            { "name": "Cell 7", "location": [5286, 1174, 0] },
-            { "name": "Cell 8", "location": [5306, 1174, 0] },
-            { "name": "Cell 9", "location": [5283, 1184, 0] },
-            { "name": "Cell 10", "location": [5304, 1184, 0] }
-          ]
-        }
-      ],
-      "locations": [{ "name": "Green Acres", "location": [5445, 1153, 0] }]
-    },
-    {
-      "name": "Shrines",
-      "locations": [
-        { "name": "Chaos", "location": [1456, 854, 0] },
-        { "name": "Compassion", "location": [1856, 872, -1] },
-        { "name": "Honesty", "location": [4217, 564, 36] },
-        { "name": "Honor", "location": [1730, 3528, 3] },
-        { "name": "Humility", "location": [4276, 3699, 0] },
-        { "name": "Justice", "location": [1301, 639, 16] },
-        { "name": "Sacrifice", "location": [3355, 299, 9] },
-        { "name": "Spirituality", "location": [1589, 2485, 5] },
-        { "name": "Valor", "location": [2496, 3932, 0] }
-      ]
-    },
-    {
-      "name": "Towns",
-      "categories": [
-        {
-          "name": "Britain",
-          "locations": [
-            { "name": "Blackthorn Castle", "location": [1533, 1415, 56] },
-            { "name": "Blackthorn Entrance", "location": [1523, 1456, 15] },
-            { "name": "British Castle", "location": [1323, 1624, 55] },
-            { "name": "British Entrance", "location": [1401, 1625, 28] },
-            { "name": "Cemetery", "location": [1384, 1497, 10] },
-            { "name": "Center", "location": [1475, 1645, 20] },
-            { "name": "Farmlands", "location": [1228, 1705, 0] },
-            { "name": "Park", "location": [1614, 1641, 35] },
-            { "name": "Suburbs", "location": [1662, 1572, 5] }
-          ]
-        },
-        {
-          "name": "Buccaneers Den",
-          "locations": [
-            { "name": "Bathhouse", "location": [2667, 2084, 5] },
-            { "name": "Docks", "location": [2736, 2166, 0] },
-            { "name": "Tunnels", "location": [2667, 2069, -20] }
-          ]
-        },
-        {
-          "name": "Cove",
-          "locations": [
-            { "name": "Cemetery", "location": [2443, 1123, 5] },
-            { "name": "Gates", "location": [2285, 1209, 0] },
-            { "name": "Guard Post", "location": [2218, 1116, 19] },
-            { "name": "Orc Fort", "location": [2171, 1332, 0] }
-          ]
-        },
-        { "name": "Heartwood", "locations": [{ "name": "Entrance", "location": [6986, 340, 0] }] },
-        {
-          "name": "Jhelom",
-          "locations": [
-            { "name": "Cemetery", "location": [1296, 3719, 0] },
-            { "name": "East Docks", "location": [1492, 3696, -3] },
-            { "name": "Fighting Pit", "location": [1398, 3742, -21] },
-            { "name": "Main Island", "location": [1414, 3816, 0] },
-            { "name": "Medium Island", "location": [1124, 3623, 5] },
-            { "name": "Small Island", "location": [1466, 4015, 5] }
-          ]
-        },
-        {
-          "name": "Magincia",
-          "locations": [
-            { "name": "Bank", "location": [3730, 2161, 20] },
-            { "name": "Docks", "location": [3675, 2259, 20] },
-            { "name": "Park", "location": [3719, 2063, 25] },
-            { "name": "Parliament", "location": [3792, 2248, 20] }
-          ]
-        },
-        {
-          "name": "Minoc",
-          "locations": [
-            { "name": "Bridge", "location": [2539, 501, 30] },
-            { "name": "Gypsy Camp", "location": [2540, 651, 0] },
-            { "name": "Mining Camp", "location": [2583, 528, 15] },
-            { "name": "North", "location": [2475, 417, 15] },
-            { "name": "South", "location": [2526, 583, 0] }
-          ]
-        },
-        {
-          "name": "Moonglow",
-          "locations": [
-            { "name": "Cemetery", "location": [4546, 1338, 8] },
-            { "name": "Center", "location": [4442, 1122, 5] },
-            { "name": "Docks", "location": [4406, 1045, -2] },
-            { "name": "Telescope", "location": [4707, 1124, 0] },
-            { "name": "Zoo", "location": [4549, 1378, 8] }
-          ]
-        },
-        {
-          "name": "Nujel'm",
-          "locations": [
-            { "name": "Cemetery", "location": [3536, 1156, 20] },
-            { "name": "Chess Board", "location": [3728, 1360, 5] },
-            { "name": "Docks", "location": [3803, 1279, 5] },
-            { "name": "East", "location": [3755, 1227, 0] },
-            { "name": "North", "location": [3668, 1116, 0] },
-            { "name": "Palace", "location": [3698, 1279, 20] },
-            { "name": "West", "location": [3572, 1211, 0] }
-          ]
-        },
-        {
-          "name": "Haven",
-          "locations": [
-            { "name": "Old Haven", "location": [3650, 2592, 0] },
-            { "name": "Old Haven North", "location": [3650, 2516, 0] },
-            { "name": "New Haven", "location": [3506, 2570, 14] },
-            { "name": "New Haven North", "location": [3502, 2475, 34] },
-            { "name": "Farmlands", "location": [3722, 2647, 20] }
-          ]
-        },
-        {
-          "name": "Serpents Hold",
-          "locations": [
-            { "name": "North", "location": [3023, 3417, 15] },
-            { "name": "South", "location": [2906, 3505, 10] },
-            { "name": "Guard Post", "location": [3011, 3526, 15] }
-          ]
-        },
-        {
-          "name": "Skara Brae",
-          "locations": [
-            { "name": "East", "location": [811, 2243, 0] },
-            { "name": "East Docks", "location": [716, 2233, -3] },
-            { "name": "North", "location": [746, 2165, 0] },
-            { "name": "South", "location": [899, 2381, 0] },
-            { "name": "West", "location": [601, 2171, 0] },
-            { "name": "West Docks", "location": [639, 2236, -3] }
-          ]
-        },
-        {
-          "name": "Trinsic",
-          "locations": [
-            { "name": "Center", "location": [1927, 2779, 0] },
-            { "name": "East Docks", "location": [2071, 2855, -3] },
-            { "name": "Island Park", "location": [2108, 2793, 2] },
-            { "name": "North", "location": [1894, 2666, 0] },
-            { "name": "South", "location": [1891, 2850, 20] },
-            { "name": "South Gate", "location": [2000, 2930, 0] },
-            { "name": "West Gate", "location": [1832, 2779, 0] }
-          ]
-        },
-        {
-          "name": "Vesper",
-          "locations": [
-            { "name": "Cemetery", "location": [2786, 867, 0] },
-            { "name": "Center", "location": [2882, 788, 0] },
-            { "name": "Docks", "location": [3013, 828, -3] },
-            { "name": "East", "location": [2760, 981, 0] },
-            { "name": "North", "location": [2907, 603, 0] }
-          ]
-        },
-        {
-          "name": "Wind",
-          "locations": [
-            { "name": "Caves", "location": [5166, 244, 15] },
-            { "name": "East", "location": [5336, 88, 15] },
-            { "name": "Entrance", "location": [1362, 896, 0] },
-            { "name": "Park", "location": [5211, 22, 15] },
-            { "name": "South", "location": [5223, 189, 5] },
-            { "name": "West", "location": [5180, 90, 25] }
-          ]
-        },
-        {
-          "name": "Yew",
-          "locations": [
-            { "name": "Cemetery", "location": [724, 1138, 0] },
-            { "name": "Center", "location": [535, 992, 0] },
-            { "name": "Courts and Prisons", "location": [354, 836, 20] },
-            { "name": "Empath Abbey", "location": [635, 860, 0] },
-            { "name": "Hidden Cave", "location": [313, 787, -24] },
-            { "name": "Orc Fort", "location": [633, 1499, 0] }
-          ]
-        },
-        {
-          "name": "Delucia",
-          "locations": [
-            { "name": "Watch Tower", "location": [5276, 3945, 37] },
-            { "name": "Center", "location": [5228, 3978, 37] },
-            { "name": "Orc Fort", "location": [5210, 3636, 3] }
-          ]
-        },
-        {
-          "name": "Papua",
-          "locations": [
-            { "name": "The Just Inn", "location": [5769, 3176, 0] },
-            { "name": "Center", "location": [5730, 3208, -4] },
-            { "name": "Docks", "location": [5825, 3256, 2] }
-          ]
-        }
-      ]
-    }
-  ]
-}
+{
+  "name": "Trammel",
+  "categories": [
+    {
+      "name": "Dungeons",
+      "categories": [
+        { "name": "Blighted Grove", "locations": [{ "name": "Entrance", "location": [586, 1643, -5] }] },
+        {
+          "name": "Covetous",
+          "locations": [
+            { "name": "Entrance", "location": [2499, 919, 0] },
+            { "name": "Level 1", "location": [5456, 1863, 0] },
+            { "name": "Level 2", "location": [5614, 1997, 0] },
+            { "name": "Level 3", "location": [5579, 1924, 0] },
+            { "name": "Lake Cave", "location": [5467, 1805, 7] },
+            { "name": "Torture Chambers", "location": [5552, 1807, 0] }
+          ]
+        },
+        {
+          "name": "Deceit",
+          "locations": [
+            { "name": "Entrance", "location": [4111, 432, 5] },
+            { "name": "Level 1", "location": [5188, 638, 0] },
+            { "name": "Level 2", "location": [5305, 533, 2] },
+            { "name": "Level 3", "location": [5137, 650, 5] },
+            { "name": "Level 4", "location": [5306, 652, 2] }
+          ]
+        },
+        {
+          "name": "Despise",
+          "locations": [
+            { "name": "Entrance", "location": [1298, 1080, 0] },
+            { "name": "Entryway", "location": [5587, 631, 30] },
+            { "name": "Level 1", "location": [5501, 570, 59] },
+            { "name": "Level 2", "location": [5519, 673, 20] },
+            { "name": "Level 3", "location": [5407, 859, 45] }
+          ]
+        },
+        {
+          "name": "Destard",
+          "locations": [
+            { "name": "Entrance", "location": [1176, 2637, 0] },
+            { "name": "Level 1", "location": [5243, 1006, 0] },
+            { "name": "Level 2", "location": [5143, 801, 4] },
+            { "name": "Level 3", "location": [5137, 986, 5] }
+          ]
+        },
+        {
+          "name": "Hythloth",
+          "locations": [
+            { "name": "Entrance", "location": [4721, 3822, 0] },
+            { "name": "Level 1", "location": [5905, 20, 46] },
+            { "name": "Level 2", "location": [5976, 169, 0] },
+            { "name": "Level 3", "location": [6083, 145, -20] },
+            { "name": "Level 4", "location": [6059, 89, 24] }
+          ]
+        },
+        {
+          "name": "Shame",
+          "locations": [
+            { "name": "Entrance", "location": [514, 1561, 0] },
+            { "name": "Level 1", "location": [5395, 126, 0] },
+            { "name": "Level 2", "location": [5515, 11, 5] },
+            { "name": "Level 3", "location": [5514, 148, 25] },
+            { "name": "Level 4", "location": [5875, 20, -5] }
+          ]
+        },
+        {
+          "name": "Wrong",
+          "locations": [
+            { "name": "Entrance", "location": [2043, 238, 10] },
+            { "name": "Level 1", "location": [5825, 630, 0] },
+            { "name": "Level 2", "location": [5690, 569, 25] },
+            { "name": "Level 3", "location": [5703, 639, 0] }
+          ]
+        },
+        {
+          "name": "Miscellaneous",
+          "locations": [
+            { "name": "Hyloth Fire Pit", "location": [4596, 3630, 30] },
+            { "name": "Yew-Britain Brigand Camp", "location": [885, 1682, 0] },
+            { "name": "Yew Fort of the Damned", "location": [972, 768, 0] }
+          ]
+        },
+        {
+          "name": "Terathan Keep",
+          "locations": [
+            { "name": "Entrance", "location": [5451, 3143, -60] },
+            { "name": "Level 1", "location": [5342, 1601, 0] },
+            { "name": "Champion Room", "location": [5205, 1585, 0] },
+            { "name": "Starroom", "location": [5139, 1767, 0] }
+          ]
+        },
+        {
+          "name": "Fire",
+          "locations": [
+            { "name": "Entrance", "location": [5760, 2908, 15] },
+            { "name": "Brit Entrance", "location": [2923, 3407, 8] },
+            { "name": "Level 1", "location": [5790, 1416, 40] },
+            { "name": "Level 2", "location": [5702, 1316, 1] }
+          ]
+        },
+        {
+          "name": "Ice",
+          "locations": [
+            { "name": "Entrance", "location": [5210, 2322, 30] },
+            { "name": "Brit Entrance", "location": [1999, 81, 4] },
+            { "name": "Level 1", "location": [5875, 150, 15] },
+            { "name": "Ratman Room", "location": [5834, 327, 18] },
+            { "name": "Ice Demon Lair", "location": [5700, 305, 0] }
+          ]
+        },
+        {
+          "name": "Orc Cave",
+          "locations": [
+            { "name": "Entrance", "location": [1019, 1431, 0] },
+            { "name": "Level 1", "location": [5137, 2014, 0] },
+            { "name": "Level 2", "location": [5332, 1376, 0] },
+            { "name": "Level 3", "location": [5272, 2036, 0] }
+          ]
+        },
+        { "name": "Painted Caves", "locations": [{ "name": "Entrance", "location": [1716, 2993, 0] }] },
+        {
+          "name": "Palace of Paroxysmus",
+          "locations": [{ "name": "Entrance", "location": [5576, 3018, 25] }]
+        },
+        { "name": "Prism of Light", "locations": [{ "name": "Entrance", "location": [3784, 1097, 14] }] },
+        { "name": "Sanctuary", "locations": [{ "name": "Entrance", "location": [764, 1646, 0] }] },
+        {
+          "name": "Solen Hives",
+          "categories": [
+            {
+              "name": "Area A",
+              "locations": [
+                { "name": "Entrance", "location": [729, 1451, 0] },
+                { "name": "Level 1", "location": [5658, 1795, 3] },
+                { "name": "Level 2", "location": [5726, 1891, 1] }
+              ]
+            },
+            {
+              "name": "Area B",
+              "locations": [
+                { "name": "Entrance", "location": [2607, 763, 0] },
+                { "name": "Level 1", "location": [5921, 1797, 1] },
+                { "name": "Level 2", "location": [5875, 1866, 2] }
+              ]
+            },
+            {
+              "name": "Area C",
+              "locations": [
+                { "name": "Entrance", "location": [1689, 2789, 0] },
+                { "name": "Level 1", "location": [5659, 2022, 0] },
+                { "name": "Level 2", "location": [5708, 1955, 0] }
+              ]
+            },
+            {
+              "name": "Area D",
+              "locations": [
+                { "name": "Entrance", "location": [1723, 814, 0] },
+                { "name": "Level 1", "location": [5916, 2019, 3] },
+                { "name": "Level 2", "location": [5813, 2012, -1] }
+              ]
+            },
+            { "name": "Area E", "locations": [{ "name": "Entrance", "location": [5732, 1858, 0] }] }
+          ],
+          "locations": [{ "name": "Central Area", "location": [5774, 1896, 20] }]
+        }
+      ]
+    },
+    {
+      "name": "Internal",
+      "categories": [
+        {
+          "name": "Jail Cells",
+          "locations": [
+            { "name": "Cell 1", "location": [5276, 1164, 0] },
+            { "name": "Cell 2", "location": [5286, 1164, 0] },
+            { "name": "Cell 3", "location": [5296, 1164, 0] },
+            { "name": "Cell 4", "location": [5306, 1164, 0] },
+            { "name": "Cell 5", "location": [5276, 1174, 0] },
+            { "name": "Cell 6", "location": [5286, 1174, 0] },
+            { "name": "Cell 7", "location": [5286, 1174, 0] },
+            { "name": "Cell 8", "location": [5306, 1174, 0] },
+            { "name": "Cell 9", "location": [5283, 1184, 0] },
+            { "name": "Cell 10", "location": [5304, 1184, 0] }
+          ]
+        }
+      ],
+      "locations": [{ "name": "Green Acres", "location": [5445, 1153, 0] }]
+    },
+    {
+      "name": "Shrines",
+      "locations": [
+        { "name": "Chaos", "location": [1456, 854, 0] },
+        { "name": "Compassion", "location": [1856, 872, -1] },
+        { "name": "Honesty", "location": [4217, 564, 36] },
+        { "name": "Honor", "location": [1730, 3528, 3] },
+        { "name": "Humility", "location": [4276, 3699, 0] },
+        { "name": "Justice", "location": [1301, 639, 16] },
+        { "name": "Sacrifice", "location": [3355, 299, 9] },
+        { "name": "Spirituality", "location": [1589, 2485, 5] },
+        { "name": "Valor", "location": [2496, 3932, 0] }
+      ]
+    },
+    {
+      "name": "Towns",
+      "categories": [
+        {
+          "name": "Britain",
+          "locations": [
+            { "name": "Blackthorn Castle", "location": [1533, 1415, 56] },
+            { "name": "Blackthorn Entrance", "location": [1523, 1456, 15] },
+            { "name": "British Castle", "location": [1323, 1624, 55] },
+            { "name": "British Entrance", "location": [1401, 1625, 28] },
+            { "name": "Cemetery", "location": [1384, 1497, 10] },
+            { "name": "Center", "location": [1475, 1645, 20] },
+            { "name": "Farmlands", "location": [1228, 1705, 0] },
+            { "name": "Park", "location": [1614, 1641, 35] },
+            { "name": "Suburbs", "location": [1662, 1572, 5] }
+          ]
+        },
+        {
+          "name": "Buccaneers Den",
+          "locations": [
+            { "name": "Bathhouse", "location": [2667, 2084, 5] },
+            { "name": "Docks", "location": [2736, 2166, 0] },
+            { "name": "Tunnels", "location": [2667, 2069, -20] }
+          ]
+        },
+        {
+          "name": "Cove",
+          "locations": [
+            { "name": "Cemetery", "location": [2443, 1123, 5] },
+            { "name": "Gates", "location": [2285, 1209, 0] },
+            { "name": "Guard Post", "location": [2218, 1116, 19] },
+            { "name": "Orc Fort", "location": [2171, 1332, 0] }
+          ]
+        },
+        { "name": "Heartwood", "locations": [{ "name": "Entrance", "location": [6986, 340, 0] }] },
+        {
+          "name": "Jhelom",
+          "locations": [
+            { "name": "Cemetery", "location": [1296, 3719, 0] },
+            { "name": "East Docks", "location": [1492, 3696, -3] },
+            { "name": "Fighting Pit", "location": [1398, 3742, -21] },
+            { "name": "Main Island", "location": [1414, 3816, 0] },
+            { "name": "Medium Island", "location": [1124, 3623, 5] },
+            { "name": "Small Island", "location": [1466, 4015, 5] }
+          ]
+        },
+        {
+          "name": "Magincia",
+          "locations": [
+            { "name": "Bank", "location": [3730, 2161, 20] },
+            { "name": "Docks", "location": [3675, 2259, 20] },
+            { "name": "Park", "location": [3719, 2063, 25] },
+            { "name": "Parliament", "location": [3792, 2248, 20] }
+          ]
+        },
+        {
+          "name": "Minoc",
+          "locations": [
+            { "name": "Bridge", "location": [2539, 501, 30] },
+            { "name": "Gypsy Camp", "location": [2540, 651, 0] },
+            { "name": "Mining Camp", "location": [2583, 528, 15] },
+            { "name": "North", "location": [2475, 417, 15] },
+            { "name": "South", "location": [2526, 583, 0] }
+          ]
+        },
+        {
+          "name": "Moonglow",
+          "locations": [
+            { "name": "Cemetery", "location": [4546, 1338, 8] },
+            { "name": "Center", "location": [4442, 1122, 5] },
+            { "name": "Docks", "location": [4406, 1045, -2] },
+            { "name": "Telescope", "location": [4707, 1124, 0] },
+            { "name": "Zoo", "location": [4549, 1378, 8] }
+          ]
+        },
+        {
+          "name": "Nujel'm",
+          "locations": [
+            { "name": "Cemetery", "location": [3536, 1156, 20] },
+            { "name": "Chess Board", "location": [3728, 1360, 5] },
+            { "name": "Docks", "location": [3803, 1279, 5] },
+            { "name": "East", "location": [3755, 1227, 0] },
+            { "name": "North", "location": [3668, 1116, 0] },
+            { "name": "Palace", "location": [3698, 1279, 20] },
+            { "name": "West", "location": [3572, 1211, 0] }
+          ]
+        },
+        {
+          "name": "Haven",
+          "locations": [
+            { "name": "Old Haven", "location": [3650, 2592, 0] },
+            { "name": "Old Haven North", "location": [3650, 2516, 0] },
+            { "name": "New Haven", "location": [3506, 2570, 14] },
+            { "name": "New Haven North", "location": [3502, 2475, 34] },
+            { "name": "Farmlands", "location": [3722, 2647, 20] }
+          ]
+        },
+        {
+          "name": "Serpents Hold",
+          "locations": [
+            { "name": "North", "location": [3023, 3417, 15] },
+            { "name": "South", "location": [2906, 3505, 10] },
+            { "name": "Guard Post", "location": [3011, 3526, 15] }
+          ]
+        },
+        {
+          "name": "Skara Brae",
+          "locations": [
+            { "name": "East", "location": [811, 2243, 0] },
+            { "name": "East Docks", "location": [716, 2233, -3] },
+            { "name": "North", "location": [746, 2165, 0] },
+            { "name": "South", "location": [899, 2381, 0] },
+            { "name": "West", "location": [601, 2171, 0] },
+            { "name": "West Docks", "location": [639, 2236, -3] }
+          ]
+        },
+        {
+          "name": "Trinsic",
+          "locations": [
+            { "name": "Center", "location": [1927, 2779, 0] },
+            { "name": "East Docks", "location": [2071, 2855, -3] },
+            { "name": "Island Park", "location": [2108, 2793, 2] },
+            { "name": "North", "location": [1894, 2666, 0] },
+            { "name": "South", "location": [1891, 2850, 20] },
+            { "name": "South Gate", "location": [2000, 2930, 0] },
+            { "name": "West Gate", "location": [1832, 2779, 0] }
+          ]
+        },
+        {
+          "name": "Vesper",
+          "locations": [
+            { "name": "Cemetery", "location": [2786, 867, 0] },
+            { "name": "Center", "location": [2882, 788, 0] },
+            { "name": "Docks", "location": [3013, 828, -3] },
+            { "name": "East", "location": [2760, 981, 0] },
+            { "name": "North", "location": [2907, 603, 0] }
+          ]
+        },
+        {
+          "name": "Wind",
+          "locations": [
+            { "name": "Caves", "location": [5166, 244, 15] },
+            { "name": "East", "location": [5336, 88, 15] },
+            { "name": "Entrance", "location": [1362, 896, 0] },
+            { "name": "Park", "location": [5211, 22, 15] },
+            { "name": "South", "location": [5223, 189, 5] },
+            { "name": "West", "location": [5180, 90, 25] }
+          ]
+        },
+        {
+          "name": "Yew",
+          "locations": [
+            { "name": "Cemetery", "location": [724, 1138, 0] },
+            { "name": "Center", "location": [535, 992, 0] },
+            { "name": "Courts and Prisons", "location": [354, 836, 20] },
+            { "name": "Empath Abbey", "location": [635, 860, 0] },
+            { "name": "Hidden Cave", "location": [313, 787, -24] },
+            { "name": "Orc Fort", "location": [633, 1499, 0] }
+          ]
+        },
+        {
+          "name": "Delucia",
+          "locations": [
+            { "name": "Watch Tower", "location": [5276, 3945, 37] },
+            { "name": "Center", "location": [5228, 3978, 37] },
+            { "name": "Orc Fort", "location": [5210, 3636, 3] }
+          ]
+        },
+        {
+          "name": "Papua",
+          "locations": [
+            { "name": "The Just Inn", "location": [5769, 3176, 0] },
+            { "name": "Center", "location": [5730, 3208, -4] },
+            { "name": "Docks", "location": [5825, 3256, 2] }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/Distribution/Data/items.json b/Distribution/Data/items.json
index 80730ea71..d49312df0 100644
--- a/Distribution/Data/items.json
+++ b/Distribution/Data/items.json
@@ -1,508 +1,508 @@
-[
-  { "category": "Items", "types": ["Item"] },
-  {
-    "category": "Items.Bods & Rewards",
-    "types": [
-      "SmallBOD", "LargeBOD", "BulkOrderBook", "SturdyPickaxe", "SturdyShovel", "BaseGlovesOfMining",
-      "GargoylesPickaxe", "ProspectorsTool", "PowderOfTemperament", "ColoredAnvil", "RunicHammer",
-      "AncientSmithyHammer", "SmallStretchedHideEastDeed", "SmallStretchedHideEastAddon",
-      "SmallStretchedHideSouthDeed", "SmallStretchedHideSouthAddon", "MediumStretchedHideEastDeed",
-      "MediumStretchedHideEastAddon", "MediumStretchedHideSouthDeed", "MediumStretchedHideSouthAddon",
-      "LightFlowerTapestryEastDeed", "LightFlowerTapestryEastAddon", "LightFlowerTapestrySouthDeed",
-      "LightFlowerTapestrySouthAddon", "DarkFlowerTapestryEastDeed", "DarkFlowerTapestryEastAddon",
-      "DarkFlowerTapestrySouthDeed", "DarkFlowerTapestrySouthAddon", "BrownBearRugEastDeed",
-      "BrownBearRugEastAddon", "BrownBearRugSouthDeed", "BrownBearRugSouthAddon", "PolarBearRugEastDeed",
-      "PolarBearRugEastAddon", "PolarBearRugSouthDeed", "PolarBearRugSouthAddon", "ClothingBlessDeed",
-      "RunicSewingKit"
-    ]
-  },
-  {
-    "category": "Items.Bods & Rewards.Smithing",
-    "types": [
-      "SmallSmithBOD", "LargeSmithBOD", "SturdyPickaxe", "SturdyShovel", "BaseGlovesOfMining",
-      "GargoylesPickaxe", "ProspectorsTool", "PowderOfTemperament", "ColoredAnvil", "RunicHammer",
-      "AncientSmithyHammer"
-    ]
-  },
-  {
-    "category": "Items.Bods & Rewards.Tailoring",
-    "types": [
-      "SmallTailorBOD", "LargeTailorBOD", "SmallStretchedHideEastDeed", "SmallStretchedHideEastAddon",
-      "SmallStretchedHideSouthDeed", "SmallStretchedHideSouthAddon", "MediumStretchedHideEastDeed",
-      "MediumStretchedHideEastAddon", "MediumStretchedHideSouthDeed", "MediumStretchedHideSouthAddon",
-      "LightFlowerTapestryEastDeed", "LightFlowerTapestryEastAddon", "LightFlowerTapestrySouthDeed",
-      "LightFlowerTapestrySouthAddon", "DarkFlowerTapestryEastDeed", "DarkFlowerTapestryEastAddon",
-      "DarkFlowerTapestrySouthDeed", "DarkFlowerTapestrySouthAddon", "BrownBearRugEastDeed",
-      "BrownBearRugEastAddon", "BrownBearRugSouthDeed", "BrownBearRugSouthAddon", "PolarBearRugEastDeed",
-      "PolarBearRugEastAddon", "PolarBearRugSouthDeed", "PolarBearRugSouthAddon", "ClothingBlessDeed",
-      "RunicSewingKit"
-    ]
-  },
-  { "category": "Items.Bods & Rewards.Tailoring.Addons", "types": ["BaseAddon", "BaseAddonDeed"] },
-  { "category": "Items.Bods & Rewards.Tailoring.Addons.Constructed", "types": ["BaseAddon"] },
-  { "category": "Items.Bods & Rewards.Tailoring.Addons.Deeds", "types": ["BaseAddonDeed"] },
-  {
-    "category": "Items.Wearables",
-    "types": ["BaseArmor", "BaseClothing", "BaseSuit", "BaseJewel", "BaseWeapon"]
-  },
-  { "category": "Items.Wearables.Armor", "types": ["BaseArmor"] },
-  {
-    "category": "Items.Wearables.Armor.Artifacts",
-    "types": [
-      "ArmorOfFortune", "GauntletsOfNobility", "HelmOfInsight", "HolyKnightsBreastplate",
-      "InquisitorsResolution", "JackalsCollar", "LeggingsOfBane", "MidnightBracers",
-      "OrnateCrownOfTheHarrower", "ShadowDancerLeggings", "TunicOfFire", "VoiceOfTheFallenKing"
-    ]
-  },
-  {
-    "category": "Items.Wearables.Armor.Bone",
-    "types": ["BoneArms", "BoneChest", "BoneGloves", "BoneLegs", "BoneHelm"]
-  },
-  { "category": "Items.Wearables.Armor.Chain", "types": ["ChainChest", "ChainLegs", "ChainCoif"] },
-  {
-    "category": "Items.Wearables.Armor.Daemon Bone",
-    "types": ["DaemonArms", "DaemonChest", "DaemonGloves", "DaemonLegs", "DaemonHelm"]
-  },
-  {
-    "category": "Items.Wearables.Armor.Dragon",
-    "types": ["DragonArms", "DragonChest", "DragonGloves", "DragonLegs", "DragonHelm"]
-  },
-  {
-    "category": "Items.Wearables.Armor.Helmets",
-    "types": ["Bascinet", "CloseHelm", "Helmet", "NorseHelm", "OrcHelm"]
-  },
-  {
-    "category": "Items.Wearables.Armor.Leather",
-    "types": [
-      "FemaleLeatherChest", "LeatherArms", "LeatherBustierArms", "LeatherChest", "LeatherGloves",
-      "LeatherGorget", "LeatherLegs", "LeatherShorts", "LeatherSkirt", "LeatherCap"
-    ]
-  },
-  {
-    "category": "Items.Wearables.Armor.Plate",
-    "types": [
-      "FemalePlateChest", "PlateArms", "PlateChest", "PlateGloves", "PlateGorget", "PlateLegs",
-      "PlateHelm"
-    ]
-  },
-  {
-    "category": "Items.Wearables.Armor.Ranger",
-    "types": ["RangerArms", "RangerChest", "RangerGloves", "RangerGorget", "RangerLegs"]
-  },
-  {
-    "category": "Items.Wearables.Armor.Ring",
-    "types": ["RingmailArms", "RingmailChest", "RingmailGloves", "RingmailLegs"]
-  },
-  {
-    "category": "Items.Wearables.Armor.Studded Leather",
-    "types": [
-      "FemaleStuddedChest", "StuddedArms", "StuddedBustierArms", "StuddedChest", "StuddedGloves",
-      "StuddedGorget", "StuddedLegs"
-    ]
-  },
-  { "category": "Items.Wearables.Armor.Shields", "types": ["BaseShield"] },
-  { "category": "Items.Wearables.Armor.Shields.Artifacts", "types": ["Aegis", "ArcaneShield"] },
-  { "category": "Items.Wearables.Weapons", "types": ["BaseWeapon"] },
-  {
-    "category": "Items.Wearables.Weapons.Artifacts",
-    "types": [
-      "AxeOfTheHeavens", "BladeOfInsanity", "BladeOfTheRighteous", "BoneCrusher", "BreathOfTheDead",
-      "Frostbringer", "LegacyOfTheDreadLord", "SerpentsFang", "StaffOfTheMagi", "TheBeserkersMaul",
-      "TheDragonSlayer", "TheTaskmaster", "TitansHammer", "ZyronicClaw"
-    ]
-  },
-  { "category": "Items.Wearables.Weapons.Wands", "types": ["BaseWand"] },
-  { "category": "Items.Wearables.Weapons.Axes", "types": ["BaseAxe"] },
-  { "category": "Items.Wearables.Weapons.Knives", "types": ["BaseKnife"] },
-  { "category": "Items.Wearables.Weapons.Bashing", "types": ["BaseBashing"] },
-  { "category": "Items.Wearables.Weapons.Pole Arms", "types": ["BasePoleArm"] },
-  { "category": "Items.Wearables.Weapons.Ranged", "types": ["BaseRanged"] },
-  { "category": "Items.Wearables.Weapons.Spears", "types": ["BaseSpear"] },
-  { "category": "Items.Wearables.Weapons.Staves", "types": ["BaseStaff"] },
-  { "category": "Items.Wearables.Weapons.Swords", "types": ["BaseSword"] },
-  { "category": "Items.Wearables.Clothing", "types": ["BaseClothing"] },
-  { "category": "Items.Wearables.Clothing.Cloaks", "types": ["BaseCloak"] },
-  { "category": "Items.Wearables.Clothing.Hats", "types": ["BaseHat"] },
-  { "category": "Items.Wearables.Clothing.Robes", "types": ["BaseOuterTorso"] },
-  { "category": "Items.Wearables.Clothing.Shirts", "types": ["BaseShirt"] },
-  { "category": "Items.Wearables.Clothing.Pants", "types": ["BasePants", "BaseOuterLegs"] },
-  { "category": "Items.Wearables.Clothing.Shoes", "types": ["BaseShoes"] },
-  { "category": "Items.Wearables.Clothing.Misc", "types": ["BaseWaist", "BaseMiddleTorso"] },
-  { "category": "Items.Wearables.Jewelry", "types": ["BaseJewel"] },
-  {
-    "category": "Items.Wearables.Jewelry.Artifacts",
-    "types": ["BraceletOfHealth", "OrnamentOfTheMagician", "RingOfTheElements", "RingOfTheVile"]
-  },
-  { "category": "Items.Wearables.Suits", "types": ["BaseSuit"] },
-  { "category": "Items.Addons", "types": ["BaseAddonDeed", "BaseAddon"] },
-  { "category": "Items.Addons.Constructed", "types": ["BaseAddon"] },
-  {
-    "category": "Items.Addons.Constructed.Smithing",
-    "types": [
-      "LargeForgeEastAddon", "LargeForgeSouthAddon", "SmallForgeAddon", "AnvilEastAddon",
-      "AnvilSouthAddon"
-    ]
-  },
-  {
-    "category": "Items.Addons.Constructed.Tailoring",
-    "types": ["LoomEastAddon", "LoomSouthAddon", "SpinningWheelEastAddon", "SpinningWheelSouthAddon"]
-  },
-  {
-    "category": "Items.Addons.Constructed.Cooking",
-    "types": ["FlourMillEastAddon", "FlourMillSouthAddon", "StoneOvenEastAddon", "StoneOvenSouthAddon"]
-  },
-  {
-    "category": "Items.Addons.Constructed.Bedding",
-    "types": ["LargeBedEastAddon", "LargeBedSouthAddon", "SmallBedSouthAddon", "SmallBedEastAddon"]
-  },
-  {
-    "category": "Items.Addons.Constructed.Training",
-    "types": [
-      "TrainingDummyEastAddon", "TrainingDummySouthAddon", "PickpocketDipEastAddon",
-      "PickpocketDipSouthAddon", "ArcheryButteAddon"
-    ]
-  },
-  {
-    "category": "Items.Addons.Constructed.Spiritual",
-    "types": ["PentagramAddon", "BloodPentagram", "AbbatoirAddon"]
-  },
-  {
-    "category": "Items.Addons.Constructed.Furniture",
-    "types": [
-      "LargeStoneTableEastAddon", "LargeStoneTableSouthAddon", "MediumStoneTableEastAddon",
-      "MediumStoneTableSouthAddon"
-    ]
-  },
-  { "category": "Items.Addons.Constructed.Misc", "types": ["BaseAddon"] },
-  { "category": "Items.Addons.Deeds", "types": ["BaseAddonDeed"] },
-  {
-    "category": "Items.Addons.Deeds.Smithing",
-    "types": ["LargeForgeEastDeed", "LargeForgeSouthDeed", "SmallForgeDeed", "AnvilEastDeed", "AnvilSouthDeed"]
-  },
-  {
-    "category": "Items.Addons.Deeds.Tailoring",
-    "types": ["LoomEastDeed", "LoomSouthDeed", "SpinningWheelEastDeed", "SpinningWheelSouthDeed"]
-  },
-  {
-    "category": "Items.Addons.Deeds.Cooking",
-    "types": ["FlourMillEastDeed", "FlourMillSouthDeed", "StoneOvenEastDeed", "StoneOvenSouthDeed"]
-  },
-  {
-    "category": "Items.Addons.Deeds.Bedding",
-    "types": ["LargeBedEastDeed", "LargeBedSouthDeed", "SmallBedEastDeed", "SmallBedSouthDeed"]
-  },
-  {
-    "category": "Items.Addons.Deeds.Training",
-    "types": [
-      "TrainingDummyEastDeed", "TrainingDummySouthDeed", "PickpocketDipEastDeed", "PickpocketDipSouthDeed",
-      "ArcheryButteDeed"
-    ]
-  },
-  { "category": "Items.Addons.Deeds.Spiritual", "types": ["PentagramDeed", "AbbatoirDeed"] },
-  {
-    "category": "Items.Addons.Deeds.Furniture",
-    "types": [
-      "LargeStoneTableEastDeed", "LargeStoneTableSouthDeed", "MediumStoneTableEastDeed",
-      "MediumStoneTableSouthDeed"
-    ]
-  },
-  { "category": "Items.Addons.Deeds.Misc", "types": ["BaseAddonDeed"] },
-  { "category": "Items.Books", "types": ["BaseBook"] },
-  {
-    "category": "Items.Resources",
-    "types": [
-      "BaseIngot", "BaseOre", "BaseGranite", "BaseScales", "BaseReagent", "BaseHides", "BaseLeather",
-      "Log", "Board", "BaseClothMaterial", "Bone", "UncutCloth", "BoltOfCloth", "Cloth", "Wool", "Flax",
-      "Cotton", "BagOfAllReagents", "BagOfNecroReagents", "BagOfReagents", "AlchemyBag", "BagOfIngots",
-      "ScribeBag", "SmithBag", "TailorBag", "Fish", "BigFish", "BaseMagicFish", "Arrow", "Bolt", "Feather",
-      "Shaft", "AlchemyStone", "IngotStone", "RegStone", "ScribeStone", "SmithStone", "TailorStone",
-      "Sand"
-    ]
-  },
-  { "category": "Items.Resources.Ingots", "types": ["BaseIngot"] },
-  { "category": "Items.Resources.Ore", "types": ["BaseOre"] },
-  { "category": "Items.Resources.Granite", "types": ["BaseGranite"] },
-  { "category": "Items.Resources.Scales", "types": ["BaseScales"] },
-  { "category": "Items.Resources.Reagents", "types": ["BaseReagent"] },
-  {
-    "category": "Items.Resources.Reagents.Standard",
-    "types": [
-      "BlackPearl", "Bloodmoss", "Garlic", "Ginseng", "MandrakeRoot", "Nightshade", "SpidersSilk",
-      "SulfurousAsh"
-    ]
-  },
-  {
-    "category": "Items.Resources.Reagents.Necromancy",
-    "types": ["BatWing", "DaemonBlood", "GraveDust", "NoxCrystal", "PigIron"]
-  },
-  { "category": "Items.Resources.Wood", "types": ["Log", "Board"] },
-  { "category": "Items.Resources.Fish", "types": ["Fish", "BigFish", "BaseMagicFish"] },
-  {
-    "category": "Items.Resources.Tailoring",
-    "types": [
-      "BaseHides", "BaseLeather", "BaseClothMaterial", "Bone", "BoltOfCloth", "Cloth", "UncutCloth",
-      "Wool", "Flax", "Cotton"
-    ]
-  },
-  { "category": "Items.Resources.Tailoring.Hides", "types": ["BaseHides"] },
-  { "category": "Items.Resources.Tailoring.Leather", "types": ["BaseLeather"] },
-  { "category": "Items.Resources.Tailoring.Cloth", "types": ["BoltOfCloth", "Cloth", "UncutCloth"] },
-  {
-    "category": "Items.Resources.Tailoring.Materials",
-    "types": ["BaseClothMaterial", "Wool", "Flax", "Cotton"]
-  },
-  { "category": "Items.Resources.Fletching", "types": ["Arrow", "Bolt", "Feather", "Shaft"] },
-  {
-    "category": "Items.Resources.Bags",
-    "types": [
-      "BagOfAllReagents", "BagOfNecroReagents", "BagOfReagents", "AlchemyBag", "BagOfIngots", "ScribeBag",
-      "SmithBag", "TailorBag"
-    ]
-  },
-  {
-    "category": "Items.Resources.Stones",
-    "types": ["AlchemyStone", "IngotStone", "RegStone", "ScribeStone", "SmithStone", "TailorStone"]
-  },
-  { "category": "Items.Entertainment", "types": ["BaseInstrument", "BaseBoard", "Dices"] },
-  { "category": "Items.Entertainment.Instruments", "types": ["BaseInstrument"] },
-  { "category": "Items.Entertainment.Games", "types": ["BaseBoard", "Dices"] },
-  {
-    "category": "Items.Construction",
-    "types": [
-      "BaseDoor", "BaseFloor", "Container", "DecorativeShield1", "DecorativeShield2", "DecorativeShield3",
-      "DecorativeShield4", "DecorativeShield5", "DecorativeShield6", "DecorativeShield7",
-      "DecorativeShield8", "DecorativeShield9", "DecorativeShield10", "DecorativeShield11",
-      "DecorativeShieldSword1North", "DecorativeShieldSword1West", "DecorativeShieldSword2North",
-      "DecorativeShieldSword2West", "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth",
-      "DecorativeAxeWest", "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth",
-      "DecorativeDAxeWest", "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1",
-      "ManPortrait2", "LadyPortrait1", "LadyPortrait2", "Tapestry1N", "Tapestry2N", "Tapestry2W",
-      "Tapestry3N", "Tapestry3W", "Tapestry4N", "Tapestry4W", "Tapestry5N", "Tapestry5W", "Tapestry6N",
-      "Tapestry6W", "RuinedFallenChairA", "RuinedArmoire", "RuinedBookcase", "RuinedBooks", "CoveredChair",
-      "RuinedFallenChairB", "RuinedChair", "RuinedClock", "RuinedDrawers", "RuinedPainting", "WoodDebris",
-      "Rope", "IronWire", "SilverWire", "GoldWire", "CopperWire", "Whip", "PaintsAndBrush", "WoodenBench",
-      "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair", "Stool", "FootStool",
-      "Throne", "WoodenThrone", "LargeTable", "Nightstand", "YewWoodTable", "WritingTable", "Easel",
-      "TallMusicStand", "ShortMusicStand"
-    ]
-  },
-  {
-    "category": "Items.Construction.Decoration",
-    "types": [
-      "DecorativeShield1", "DecorativeShield2", "DecorativeShield3", "DecorativeShield4",
-      "DecorativeShield5", "DecorativeShield6", "DecorativeShield7", "DecorativeShield8",
-      "DecorativeShield9", "DecorativeShield10", "DecorativeShield11", "DecorativeShieldSword1North",
-      "DecorativeShieldSword1West", "DecorativeShieldSword2North", "DecorativeShieldSword2West",
-      "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth", "DecorativeAxeWest",
-      "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth", "DecorativeDAxeWest",
-      "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1", "ManPortrait2", "LadyPortrait1",
-      "LadyPortrait2", "Tapestry1N", "Tapestry2N", "Tapestry2W", "Tapestry3N", "Tapestry3W", "Tapestry4N",
-      "Tapestry4W", "Tapestry5N", "Tapestry5W", "Tapestry6N", "Tapestry6W"
-    ]
-  },
-  {
-    "category": "Items.Construction.Decoration.Shields",
-    "types": [
-      "DecorativeShield1", "DecorativeShield2", "DecorativeShield3", "DecorativeShield4",
-      "DecorativeShield5", "DecorativeShield6", "DecorativeShield7", "DecorativeShield8",
-      "DecorativeShield9", "DecorativeShield10", "DecorativeShield11", "DecorativeShieldSword1North",
-      "DecorativeShieldSword1West", "DecorativeShieldSword2North", "DecorativeShieldSword2West"
-    ]
-  },
-  {
-    "category": "Items.Construction.Decoration.Weapons",
-    "types": [
-      "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth", "DecorativeAxeWest",
-      "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth", "DecorativeDAxeWest"
-    ]
-  },
-  {
-    "category": "Items.Construction.Decoration.Paintings & Portraits",
-    "types": [
-      "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1", "ManPortrait2", "LadyPortrait1",
-      "LadyPortrait2"
-    ]
-  },
-  {
-    "category": "Items.Construction.Decoration.Tapestries",
-    "types": [
-      "Tapestry1N", "Tapestry2N", "Tapestry2W", "Tapestry3N", "Tapestry3W", "Tapestry4N", "Tapestry4W",
-      "Tapestry5N", "Tapestry5W", "Tapestry6N", "Tapestry6W"
-    ]
-  },
-  {
-    "category": "Items.Construction.Broken",
-    "types": [
-      "RuinedFallenChairA", "RuinedArmoire", "RuinedBookcase", "RuinedBooks", "CoveredChair",
-      "RuinedFallenChairB", "RuinedChair", "RuinedClock", "RuinedDrawers", "RuinedPainting", "WoodDebris"
-    ]
-  },
-  {
-    "category": "Items.Construction.Rares",
-    "types": ["Rope", "IronWire", "SilverWire", "GoldWire", "CopperWire", "Whip", "PaintsAndBrush"]
-  },
-  { "category": "Items.Construction.Doors", "types": ["BaseDoor"] },
-  { "category": "Items.Construction.Floors", "types": ["BaseFloor"] },
-  { "category": "Items.Construction.Containers", "types": ["Container"] },
-  {
-    "category": "Items.Construction.Furniture",
-    "types": [
-      "WoodenBench", "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair",
-      "Stool", "FootStool", "Throne", "WoodenThrone", "LargeTable", "Nightstand", "YewWoodTable",
-      "WritingTable", "Easel", "TallMusicStand", "ShortMusicStand"
-    ]
-  },
-  {
-    "category": "Items.Construction.Furniture.Chairs",
-    "types": [
-      "WoodenBench", "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair",
-      "Stool", "FootStool", "Throne", "WoodenThrone"
-    ]
-  },
-  {
-    "category": "Items.Construction.Furniture.Tables",
-    "types": ["LargeTable", "Nightstand", "YewWoodTable", "WritingTable"]
-  },
-  {
-    "category": "Items.Construction.Furniture.Other",
-    "types": ["Easel", "TallMusicStand", "ShortMusicStand"]
-  },
-  { "category": "Items.Lights", "types": ["BaseLight"] },
-  { "category": "Items.Food & Drink", "types": ["Food", "CookableFood", "BaseBeverage", "Glass"] },
-  { "category": "Items.Food & Drink.Ready to eat", "types": ["Food"] },
-  { "category": "Items.Food & Drink.Needs cooking", "types": ["CookableFood"] },
-  { "category": "Items.Food & Drink.Beverages", "types": ["BaseBeverage", "Glass"] },
-  { "category": "Items.Cartography", "types": ["MapItem"] },
-  {
-    "category": "Items.Stonecraft",
-    "types": ["Vase", "LargeVase", "StatueSouth", "StatueNorth", "StatueEast", "StatuePegasus", "StoneChair"]
-  },
-  {
-    "category": "Items.Glassblowing",
-    "types": [
-      "SmallFlask", "MediumFlask", "LargeFlask", "CurvedFlask", "LongFlask", "SpinningHourglass",
-      "GreenBottle", "RedBottle", "SmallBrownBottle", "SmallVioletBottle", "TinyYellowBottle",
-      "SmallBlueFlask", "SmallYellowFlask", "SmallRedFlask", "SmallEmptyFlask", "YellowBeaker",
-      "RedBeaker", "BlueBeaker", "GreenBeaker", "EmptyCurvedFlaskW", "RedCurvedFlask", "LtBlueCurvedFlask",
-      "EmptyCurvedFlaskE", "BlueCurvedFlask", "GreenCurvedFlask", "RedRibbedFlask", "VioletRibbedFlask",
-      "EmptyRibbedFlask", "LargeYellowFlask", "LargeVioletFlask", "LargeEmptyFlask", "AniRedRibbedFlask",
-      "AniLargeVioletFlask", "AniSmallBlueFlask", "SmallBlueBottle", "SmallGreenBottle", "EmptyVIalsWRack",
-      "FullVialsWRack", "EmptyJar", "FullJar", "HalfEmptyJar", "VioletStemmedBottle", "EmptyJars3",
-      "EmptyJars4", "FullJars3", "FullJars4", "EmptyJars2", "FullJars2", "HalfEmptyJars2", "EmptyVial",
-      "HourglassAni", "Hourglass", "TinyRedBottle", "SmallGreenBottle2", "Glass"
-    ]
-  },
-  {
-    "category": "Items.Pots & Plants",
-    "types": [
-      "SmallEmptyPot", "LargeEmptyPot", "PottedCactus", "PottedCactus1", "PottedCactus2", "PottedCactus3",
-      "PottedCactus4", "PottedCactus5", "PottedPlant", "PottedPlant1", "PottedPlant2", "PottedTree",
-      "PottedTree1"
-    ]
-  },
-  {
-    "category": "Items.Components",
-    "types": [
-      "BarrelLid", "BarrelStaves", "BarrelHoops", "BarrelTap", "Gears", "Springs", "Hinge", "Axle",
-      "AxleGears", "SextantParts", "ClockParts", "ClockFrame", "Clock", "ClockRight", "ClockLeft"
-    ]
-  },
-  { "category": "Items.Tools", "types": ["BaseTool", "BaseHarvestTool"] },
-  { "category": "Items.Tools.Crafting", "types": ["BaseTool"] },
-  { "category": "Items.Tools.Harvesting", "types": ["BaseHarvestTool"] },
-  { "category": "Items.Traps", "types": ["BaseTrap"] },
-  {
-    "category": "Items.Gems",
-    "types": [
-      "Amber", "Amethyst", "Citrine", "Diamond", "Emerald", "Ruby", "Sapphire", "StarSapphire",
-      "Tourmaline"
-    ]
-  },
-  { "category": "Items.Boats", "types": ["BaseBoat", "BaseBoatDeed"] },
-  { "category": "Items.Boats.Constructed", "types": ["BaseBoat"] },
-  { "category": "Items.Boats.Deeds", "types": ["BaseBoatDeed"] },
-  { "category": "Items.House Deeds", "types": ["HouseDeed", "HousePlacementTool"] },
-  { "category": "Items.Camps", "types": ["BaseCamp"] },
-  {
-    "category": "Items.Magical",
-    "types": ["Spellbook", "SpellScroll", "BlankScroll", "BasePotion", "EtherealMount"]
-  },
-  { "category": "Items.Magical.Scrolls", "types": ["SpellScroll", "BlankScroll"] },
-  {
-    "category": "Items.Magical.Scrolls.Necromancy",
-    "types": [
-      "AnimateDeadScroll", "BloodOathScroll", "CorpseSkinScroll", "CurseWeaponScroll", "EvilOmenScroll",
-      "HorrificBeastScroll", "LichFormScroll", "MindRotScroll", "PainSpikeScroll", "PoisonStrikeScroll",
-      "StrangleScroll", "SummonFamiliarScroll", "VampiricEmbraceScroll", "VengefulSpiritScroll",
-      "WitherScroll", "WraithFormScroll"
-    ]
-  },
-  { "category": "Items.Magical.Scrolls.Standard", "types": ["SpellScroll"] },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #1",
-    "types": [
-      "ClumsyScroll", "CreateFoodScroll", "FeeblemindScroll", "HealScroll", "MagicArrowScroll",
-      "NightSightScroll", "ReactiveArmorScroll", "WeakenScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #2",
-    "types": [
-      "AgilityScroll", "CunningScroll", "CureScroll", "HarmScroll", "MagicTrapScroll", "MagicUnTrapScroll",
-      "ProtectionScroll", "StrengthScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #3",
-    "types": [
-      "BlessScroll", "FireballScroll", "MagicLockScroll", "PoisonScroll", "TelekinesisScroll",
-      "TeleportScroll", "UnlockScroll", "WallOfStoneScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #4",
-    "types": [
-      "ArchCureScroll", "ArchProtectionScroll", "CurseScroll", "FireFieldScroll", "GreaterHealScroll",
-      "LightningScroll", "ManaDrainScroll", "RecallScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #5",
-    "types": [
-      "BladeSpiritsScroll", "DispelFieldScroll", "IncognitoScroll", "MagicReflectScroll",
-      "MindBlastScroll", "ParalyzeScroll", "PoisonFieldScroll", "SummonCreatureScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #6",
-    "types": [
-      "DispelScroll", "EnergyBoltScroll", "ExplosionScroll", "InvisibilityScroll", "MarkScroll",
-      "MassCurseScroll", "ParalyzeFieldScroll", "RevealScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #7",
-    "types": [
-      "ChainLightningScroll", "EnergyFieldScroll", "FlamestrikeScroll", "GateTravelScroll",
-      "ManaVampireScroll", "MassDispelScroll", "MeteorSwarmScroll", "PolymorphScroll"
-    ]
-  },
-  {
-    "category": "Items.Magical.Scrolls.Standard.Circle #8",
-    "types": [
-      "EarthquakeScroll", "EnergyVortexScroll", "ResurrectionScroll", "SummonAirElementalScroll",
-      "SummonDaemonScroll", "SummonEarthElementalScroll", "SummonFireElementalScroll",
-      "SummonWaterElementalScroll"
-    ]
-  },
-  { "category": "Items.Magical.Potions", "types": ["BasePotion"] },
-  { "category": "Items.Magical.Potions.Agility", "types": ["BaseAgilityPotion"] },
-  { "category": "Items.Magical.Potions.Cure", "types": ["BaseCurePotion"] },
-  { "category": "Items.Magical.Potions.Explosion", "types": ["BaseExplosionPotion"] },
-  { "category": "Items.Magical.Potions.Heal", "types": ["BaseHealPotion"] },
-  { "category": "Items.Magical.Potions.Poison", "types": ["BasePoisonPotion"] },
-  { "category": "Items.Magical.Potions.Refresh", "types": ["BaseRefreshPotion"] },
-  { "category": "Items.Magical.Potions.Strength", "types": ["BaseStrengthPotion"] },
-  { "category": "Items.Magical.Ethereal Mounts", "types": ["EtherealMount"] },
-  { "category": "Items.Uncategorized", "types": ["Item"] }
-]
+[
+  { "category": "Items", "types": ["Item"] },
+  {
+    "category": "Items.Bods & Rewards",
+    "types": [
+      "SmallBOD", "LargeBOD", "BulkOrderBook", "SturdyPickaxe", "SturdyShovel", "BaseGlovesOfMining",
+      "GargoylesPickaxe", "ProspectorsTool", "PowderOfTemperament", "ColoredAnvil", "RunicHammer",
+      "AncientSmithyHammer", "SmallStretchedHideEastDeed", "SmallStretchedHideEastAddon",
+      "SmallStretchedHideSouthDeed", "SmallStretchedHideSouthAddon", "MediumStretchedHideEastDeed",
+      "MediumStretchedHideEastAddon", "MediumStretchedHideSouthDeed", "MediumStretchedHideSouthAddon",
+      "LightFlowerTapestryEastDeed", "LightFlowerTapestryEastAddon", "LightFlowerTapestrySouthDeed",
+      "LightFlowerTapestrySouthAddon", "DarkFlowerTapestryEastDeed", "DarkFlowerTapestryEastAddon",
+      "DarkFlowerTapestrySouthDeed", "DarkFlowerTapestrySouthAddon", "BrownBearRugEastDeed",
+      "BrownBearRugEastAddon", "BrownBearRugSouthDeed", "BrownBearRugSouthAddon", "PolarBearRugEastDeed",
+      "PolarBearRugEastAddon", "PolarBearRugSouthDeed", "PolarBearRugSouthAddon", "ClothingBlessDeed",
+      "RunicSewingKit"
+    ]
+  },
+  {
+    "category": "Items.Bods & Rewards.Smithing",
+    "types": [
+      "SmallSmithBOD", "LargeSmithBOD", "SturdyPickaxe", "SturdyShovel", "BaseGlovesOfMining",
+      "GargoylesPickaxe", "ProspectorsTool", "PowderOfTemperament", "ColoredAnvil", "RunicHammer",
+      "AncientSmithyHammer"
+    ]
+  },
+  {
+    "category": "Items.Bods & Rewards.Tailoring",
+    "types": [
+      "SmallTailorBOD", "LargeTailorBOD", "SmallStretchedHideEastDeed", "SmallStretchedHideEastAddon",
+      "SmallStretchedHideSouthDeed", "SmallStretchedHideSouthAddon", "MediumStretchedHideEastDeed",
+      "MediumStretchedHideEastAddon", "MediumStretchedHideSouthDeed", "MediumStretchedHideSouthAddon",
+      "LightFlowerTapestryEastDeed", "LightFlowerTapestryEastAddon", "LightFlowerTapestrySouthDeed",
+      "LightFlowerTapestrySouthAddon", "DarkFlowerTapestryEastDeed", "DarkFlowerTapestryEastAddon",
+      "DarkFlowerTapestrySouthDeed", "DarkFlowerTapestrySouthAddon", "BrownBearRugEastDeed",
+      "BrownBearRugEastAddon", "BrownBearRugSouthDeed", "BrownBearRugSouthAddon", "PolarBearRugEastDeed",
+      "PolarBearRugEastAddon", "PolarBearRugSouthDeed", "PolarBearRugSouthAddon", "ClothingBlessDeed",
+      "RunicSewingKit"
+    ]
+  },
+  { "category": "Items.Bods & Rewards.Tailoring.Addons", "types": ["BaseAddon", "BaseAddonDeed"] },
+  { "category": "Items.Bods & Rewards.Tailoring.Addons.Constructed", "types": ["BaseAddon"] },
+  { "category": "Items.Bods & Rewards.Tailoring.Addons.Deeds", "types": ["BaseAddonDeed"] },
+  {
+    "category": "Items.Wearables",
+    "types": ["BaseArmor", "BaseClothing", "BaseSuit", "BaseJewel", "BaseWeapon"]
+  },
+  { "category": "Items.Wearables.Armor", "types": ["BaseArmor"] },
+  {
+    "category": "Items.Wearables.Armor.Artifacts",
+    "types": [
+      "ArmorOfFortune", "GauntletsOfNobility", "HelmOfInsight", "HolyKnightsBreastplate",
+      "InquisitorsResolution", "JackalsCollar", "LeggingsOfBane", "MidnightBracers",
+      "OrnateCrownOfTheHarrower", "ShadowDancerLeggings", "TunicOfFire", "VoiceOfTheFallenKing"
+    ]
+  },
+  {
+    "category": "Items.Wearables.Armor.Bone",
+    "types": ["BoneArms", "BoneChest", "BoneGloves", "BoneLegs", "BoneHelm"]
+  },
+  { "category": "Items.Wearables.Armor.Chain", "types": ["ChainChest", "ChainLegs", "ChainCoif"] },
+  {
+    "category": "Items.Wearables.Armor.Daemon Bone",
+    "types": ["DaemonArms", "DaemonChest", "DaemonGloves", "DaemonLegs", "DaemonHelm"]
+  },
+  {
+    "category": "Items.Wearables.Armor.Dragon",
+    "types": ["DragonArms", "DragonChest", "DragonGloves", "DragonLegs", "DragonHelm"]
+  },
+  {
+    "category": "Items.Wearables.Armor.Helmets",
+    "types": ["Bascinet", "CloseHelm", "Helmet", "NorseHelm", "OrcHelm"]
+  },
+  {
+    "category": "Items.Wearables.Armor.Leather",
+    "types": [
+      "FemaleLeatherChest", "LeatherArms", "LeatherBustierArms", "LeatherChest", "LeatherGloves",
+      "LeatherGorget", "LeatherLegs", "LeatherShorts", "LeatherSkirt", "LeatherCap"
+    ]
+  },
+  {
+    "category": "Items.Wearables.Armor.Plate",
+    "types": [
+      "FemalePlateChest", "PlateArms", "PlateChest", "PlateGloves", "PlateGorget", "PlateLegs",
+      "PlateHelm"
+    ]
+  },
+  {
+    "category": "Items.Wearables.Armor.Ranger",
+    "types": ["RangerArms", "RangerChest", "RangerGloves", "RangerGorget", "RangerLegs"]
+  },
+  {
+    "category": "Items.Wearables.Armor.Ring",
+    "types": ["RingmailArms", "RingmailChest", "RingmailGloves", "RingmailLegs"]
+  },
+  {
+    "category": "Items.Wearables.Armor.Studded Leather",
+    "types": [
+      "FemaleStuddedChest", "StuddedArms", "StuddedBustierArms", "StuddedChest", "StuddedGloves",
+      "StuddedGorget", "StuddedLegs"
+    ]
+  },
+  { "category": "Items.Wearables.Armor.Shields", "types": ["BaseShield"] },
+  { "category": "Items.Wearables.Armor.Shields.Artifacts", "types": ["Aegis", "ArcaneShield"] },
+  { "category": "Items.Wearables.Weapons", "types": ["BaseWeapon"] },
+  {
+    "category": "Items.Wearables.Weapons.Artifacts",
+    "types": [
+      "AxeOfTheHeavens", "BladeOfInsanity", "BladeOfTheRighteous", "BoneCrusher", "BreathOfTheDead",
+      "Frostbringer", "LegacyOfTheDreadLord", "SerpentsFang", "StaffOfTheMagi", "TheBeserkersMaul",
+      "TheDragonSlayer", "TheTaskmaster", "TitansHammer", "ZyronicClaw"
+    ]
+  },
+  { "category": "Items.Wearables.Weapons.Wands", "types": ["BaseWand"] },
+  { "category": "Items.Wearables.Weapons.Axes", "types": ["BaseAxe"] },
+  { "category": "Items.Wearables.Weapons.Knives", "types": ["BaseKnife"] },
+  { "category": "Items.Wearables.Weapons.Bashing", "types": ["BaseBashing"] },
+  { "category": "Items.Wearables.Weapons.Pole Arms", "types": ["BasePoleArm"] },
+  { "category": "Items.Wearables.Weapons.Ranged", "types": ["BaseRanged"] },
+  { "category": "Items.Wearables.Weapons.Spears", "types": ["BaseSpear"] },
+  { "category": "Items.Wearables.Weapons.Staves", "types": ["BaseStaff"] },
+  { "category": "Items.Wearables.Weapons.Swords", "types": ["BaseSword"] },
+  { "category": "Items.Wearables.Clothing", "types": ["BaseClothing"] },
+  { "category": "Items.Wearables.Clothing.Cloaks", "types": ["BaseCloak"] },
+  { "category": "Items.Wearables.Clothing.Hats", "types": ["BaseHat"] },
+  { "category": "Items.Wearables.Clothing.Robes", "types": ["BaseOuterTorso"] },
+  { "category": "Items.Wearables.Clothing.Shirts", "types": ["BaseShirt"] },
+  { "category": "Items.Wearables.Clothing.Pants", "types": ["BasePants", "BaseOuterLegs"] },
+  { "category": "Items.Wearables.Clothing.Shoes", "types": ["BaseShoes"] },
+  { "category": "Items.Wearables.Clothing.Misc", "types": ["BaseWaist", "BaseMiddleTorso"] },
+  { "category": "Items.Wearables.Jewelry", "types": ["BaseJewel"] },
+  {
+    "category": "Items.Wearables.Jewelry.Artifacts",
+    "types": ["BraceletOfHealth", "OrnamentOfTheMagician", "RingOfTheElements", "RingOfTheVile"]
+  },
+  { "category": "Items.Wearables.Suits", "types": ["BaseSuit"] },
+  { "category": "Items.Addons", "types": ["BaseAddonDeed", "BaseAddon"] },
+  { "category": "Items.Addons.Constructed", "types": ["BaseAddon"] },
+  {
+    "category": "Items.Addons.Constructed.Smithing",
+    "types": [
+      "LargeForgeEastAddon", "LargeForgeSouthAddon", "SmallForgeAddon", "AnvilEastAddon",
+      "AnvilSouthAddon"
+    ]
+  },
+  {
+    "category": "Items.Addons.Constructed.Tailoring",
+    "types": ["LoomEastAddon", "LoomSouthAddon", "SpinningWheelEastAddon", "SpinningWheelSouthAddon"]
+  },
+  {
+    "category": "Items.Addons.Constructed.Cooking",
+    "types": ["FlourMillEastAddon", "FlourMillSouthAddon", "StoneOvenEastAddon", "StoneOvenSouthAddon"]
+  },
+  {
+    "category": "Items.Addons.Constructed.Bedding",
+    "types": ["LargeBedEastAddon", "LargeBedSouthAddon", "SmallBedSouthAddon", "SmallBedEastAddon"]
+  },
+  {
+    "category": "Items.Addons.Constructed.Training",
+    "types": [
+      "TrainingDummyEastAddon", "TrainingDummySouthAddon", "PickpocketDipEastAddon",
+      "PickpocketDipSouthAddon", "ArcheryButteAddon"
+    ]
+  },
+  {
+    "category": "Items.Addons.Constructed.Spiritual",
+    "types": ["PentagramAddon", "BloodPentagram", "AbbatoirAddon"]
+  },
+  {
+    "category": "Items.Addons.Constructed.Furniture",
+    "types": [
+      "LargeStoneTableEastAddon", "LargeStoneTableSouthAddon", "MediumStoneTableEastAddon",
+      "MediumStoneTableSouthAddon"
+    ]
+  },
+  { "category": "Items.Addons.Constructed.Misc", "types": ["BaseAddon"] },
+  { "category": "Items.Addons.Deeds", "types": ["BaseAddonDeed"] },
+  {
+    "category": "Items.Addons.Deeds.Smithing",
+    "types": ["LargeForgeEastDeed", "LargeForgeSouthDeed", "SmallForgeDeed", "AnvilEastDeed", "AnvilSouthDeed"]
+  },
+  {
+    "category": "Items.Addons.Deeds.Tailoring",
+    "types": ["LoomEastDeed", "LoomSouthDeed", "SpinningWheelEastDeed", "SpinningWheelSouthDeed"]
+  },
+  {
+    "category": "Items.Addons.Deeds.Cooking",
+    "types": ["FlourMillEastDeed", "FlourMillSouthDeed", "StoneOvenEastDeed", "StoneOvenSouthDeed"]
+  },
+  {
+    "category": "Items.Addons.Deeds.Bedding",
+    "types": ["LargeBedEastDeed", "LargeBedSouthDeed", "SmallBedEastDeed", "SmallBedSouthDeed"]
+  },
+  {
+    "category": "Items.Addons.Deeds.Training",
+    "types": [
+      "TrainingDummyEastDeed", "TrainingDummySouthDeed", "PickpocketDipEastDeed", "PickpocketDipSouthDeed",
+      "ArcheryButteDeed"
+    ]
+  },
+  { "category": "Items.Addons.Deeds.Spiritual", "types": ["PentagramDeed", "AbbatoirDeed"] },
+  {
+    "category": "Items.Addons.Deeds.Furniture",
+    "types": [
+      "LargeStoneTableEastDeed", "LargeStoneTableSouthDeed", "MediumStoneTableEastDeed",
+      "MediumStoneTableSouthDeed"
+    ]
+  },
+  { "category": "Items.Addons.Deeds.Misc", "types": ["BaseAddonDeed"] },
+  { "category": "Items.Books", "types": ["BaseBook"] },
+  {
+    "category": "Items.Resources",
+    "types": [
+      "BaseIngot", "BaseOre", "BaseGranite", "BaseScales", "BaseReagent", "BaseHides", "BaseLeather",
+      "Log", "Board", "BaseClothMaterial", "Bone", "UncutCloth", "BoltOfCloth", "Cloth", "Wool", "Flax",
+      "Cotton", "BagOfAllReagents", "BagOfNecroReagents", "BagOfReagents", "AlchemyBag", "BagOfIngots",
+      "ScribeBag", "SmithBag", "TailorBag", "Fish", "BigFish", "BaseMagicFish", "Arrow", "Bolt", "Feather",
+      "Shaft", "AlchemyStone", "IngotStone", "RegStone", "ScribeStone", "SmithStone", "TailorStone",
+      "Sand"
+    ]
+  },
+  { "category": "Items.Resources.Ingots", "types": ["BaseIngot"] },
+  { "category": "Items.Resources.Ore", "types": ["BaseOre"] },
+  { "category": "Items.Resources.Granite", "types": ["BaseGranite"] },
+  { "category": "Items.Resources.Scales", "types": ["BaseScales"] },
+  { "category": "Items.Resources.Reagents", "types": ["BaseReagent"] },
+  {
+    "category": "Items.Resources.Reagents.Standard",
+    "types": [
+      "BlackPearl", "Bloodmoss", "Garlic", "Ginseng", "MandrakeRoot", "Nightshade", "SpidersSilk",
+      "SulfurousAsh"
+    ]
+  },
+  {
+    "category": "Items.Resources.Reagents.Necromancy",
+    "types": ["BatWing", "DaemonBlood", "GraveDust", "NoxCrystal", "PigIron"]
+  },
+  { "category": "Items.Resources.Wood", "types": ["Log", "Board"] },
+  { "category": "Items.Resources.Fish", "types": ["Fish", "BigFish", "BaseMagicFish"] },
+  {
+    "category": "Items.Resources.Tailoring",
+    "types": [
+      "BaseHides", "BaseLeather", "BaseClothMaterial", "Bone", "BoltOfCloth", "Cloth", "UncutCloth",
+      "Wool", "Flax", "Cotton"
+    ]
+  },
+  { "category": "Items.Resources.Tailoring.Hides", "types": ["BaseHides"] },
+  { "category": "Items.Resources.Tailoring.Leather", "types": ["BaseLeather"] },
+  { "category": "Items.Resources.Tailoring.Cloth", "types": ["BoltOfCloth", "Cloth", "UncutCloth"] },
+  {
+    "category": "Items.Resources.Tailoring.Materials",
+    "types": ["BaseClothMaterial", "Wool", "Flax", "Cotton"]
+  },
+  { "category": "Items.Resources.Fletching", "types": ["Arrow", "Bolt", "Feather", "Shaft"] },
+  {
+    "category": "Items.Resources.Bags",
+    "types": [
+      "BagOfAllReagents", "BagOfNecroReagents", "BagOfReagents", "AlchemyBag", "BagOfIngots", "ScribeBag",
+      "SmithBag", "TailorBag"
+    ]
+  },
+  {
+    "category": "Items.Resources.Stones",
+    "types": ["AlchemyStone", "IngotStone", "RegStone", "ScribeStone", "SmithStone", "TailorStone"]
+  },
+  { "category": "Items.Entertainment", "types": ["BaseInstrument", "BaseBoard", "Dices"] },
+  { "category": "Items.Entertainment.Instruments", "types": ["BaseInstrument"] },
+  { "category": "Items.Entertainment.Games", "types": ["BaseBoard", "Dices"] },
+  {
+    "category": "Items.Construction",
+    "types": [
+      "BaseDoor", "BaseFloor", "Container", "DecorativeShield1", "DecorativeShield2", "DecorativeShield3",
+      "DecorativeShield4", "DecorativeShield5", "DecorativeShield6", "DecorativeShield7",
+      "DecorativeShield8", "DecorativeShield9", "DecorativeShield10", "DecorativeShield11",
+      "DecorativeShieldSword1North", "DecorativeShieldSword1West", "DecorativeShieldSword2North",
+      "DecorativeShieldSword2West", "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth",
+      "DecorativeAxeWest", "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth",
+      "DecorativeDAxeWest", "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1",
+      "ManPortrait2", "LadyPortrait1", "LadyPortrait2", "Tapestry1N", "Tapestry2N", "Tapestry2W",
+      "Tapestry3N", "Tapestry3W", "Tapestry4N", "Tapestry4W", "Tapestry5N", "Tapestry5W", "Tapestry6N",
+      "Tapestry6W", "RuinedFallenChairA", "RuinedArmoire", "RuinedBookcase", "RuinedBooks", "CoveredChair",
+      "RuinedFallenChairB", "RuinedChair", "RuinedClock", "RuinedDrawers", "RuinedPainting", "WoodDebris",
+      "Rope", "IronWire", "SilverWire", "GoldWire", "CopperWire", "Whip", "PaintsAndBrush", "WoodenBench",
+      "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair", "Stool", "FootStool",
+      "Throne", "WoodenThrone", "LargeTable", "Nightstand", "YewWoodTable", "WritingTable", "Easel",
+      "TallMusicStand", "ShortMusicStand"
+    ]
+  },
+  {
+    "category": "Items.Construction.Decoration",
+    "types": [
+      "DecorativeShield1", "DecorativeShield2", "DecorativeShield3", "DecorativeShield4",
+      "DecorativeShield5", "DecorativeShield6", "DecorativeShield7", "DecorativeShield8",
+      "DecorativeShield9", "DecorativeShield10", "DecorativeShield11", "DecorativeShieldSword1North",
+      "DecorativeShieldSword1West", "DecorativeShieldSword2North", "DecorativeShieldSword2West",
+      "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth", "DecorativeAxeWest",
+      "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth", "DecorativeDAxeWest",
+      "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1", "ManPortrait2", "LadyPortrait1",
+      "LadyPortrait2", "Tapestry1N", "Tapestry2N", "Tapestry2W", "Tapestry3N", "Tapestry3W", "Tapestry4N",
+      "Tapestry4W", "Tapestry5N", "Tapestry5W", "Tapestry6N", "Tapestry6W"
+    ]
+  },
+  {
+    "category": "Items.Construction.Decoration.Shields",
+    "types": [
+      "DecorativeShield1", "DecorativeShield2", "DecorativeShield3", "DecorativeShield4",
+      "DecorativeShield5", "DecorativeShield6", "DecorativeShield7", "DecorativeShield8",
+      "DecorativeShield9", "DecorativeShield10", "DecorativeShield11", "DecorativeShieldSword1North",
+      "DecorativeShieldSword1West", "DecorativeShieldSword2North", "DecorativeShieldSword2West"
+    ]
+  },
+  {
+    "category": "Items.Construction.Decoration.Weapons",
+    "types": [
+      "DecorativeBowWest", "DecorativeBowNorth", "DecorativeAxeNorth", "DecorativeAxeWest",
+      "DecorativeSwordNorth", "DecorativeSwordWest", "DecorativeDAxeNorth", "DecorativeDAxeWest"
+    ]
+  },
+  {
+    "category": "Items.Construction.Decoration.Paintings & Portraits",
+    "types": [
+      "LargePainting", "WomanPortrait1", "WomanPortrait2", "ManPortrait1", "ManPortrait2", "LadyPortrait1",
+      "LadyPortrait2"
+    ]
+  },
+  {
+    "category": "Items.Construction.Decoration.Tapestries",
+    "types": [
+      "Tapestry1N", "Tapestry2N", "Tapestry2W", "Tapestry3N", "Tapestry3W", "Tapestry4N", "Tapestry4W",
+      "Tapestry5N", "Tapestry5W", "Tapestry6N", "Tapestry6W"
+    ]
+  },
+  {
+    "category": "Items.Construction.Broken",
+    "types": [
+      "RuinedFallenChairA", "RuinedArmoire", "RuinedBookcase", "RuinedBooks", "CoveredChair",
+      "RuinedFallenChairB", "RuinedChair", "RuinedClock", "RuinedDrawers", "RuinedPainting", "WoodDebris"
+    ]
+  },
+  {
+    "category": "Items.Construction.Rares",
+    "types": ["Rope", "IronWire", "SilverWire", "GoldWire", "CopperWire", "Whip", "PaintsAndBrush"]
+  },
+  { "category": "Items.Construction.Doors", "types": ["BaseDoor"] },
+  { "category": "Items.Construction.Floors", "types": ["BaseFloor"] },
+  { "category": "Items.Construction.Containers", "types": ["Container"] },
+  {
+    "category": "Items.Construction.Furniture",
+    "types": [
+      "WoodenBench", "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair",
+      "Stool", "FootStool", "Throne", "WoodenThrone", "LargeTable", "Nightstand", "YewWoodTable",
+      "WritingTable", "Easel", "TallMusicStand", "ShortMusicStand"
+    ]
+  },
+  {
+    "category": "Items.Construction.Furniture.Chairs",
+    "types": [
+      "WoodenBench", "FancyWoodenChairCushion", "WoodenChairCushion", "WoodenChair", "BambooChair",
+      "Stool", "FootStool", "Throne", "WoodenThrone"
+    ]
+  },
+  {
+    "category": "Items.Construction.Furniture.Tables",
+    "types": ["LargeTable", "Nightstand", "YewWoodTable", "WritingTable"]
+  },
+  {
+    "category": "Items.Construction.Furniture.Other",
+    "types": ["Easel", "TallMusicStand", "ShortMusicStand"]
+  },
+  { "category": "Items.Lights", "types": ["BaseLight"] },
+  { "category": "Items.Food & Drink", "types": ["Food", "CookableFood", "BaseBeverage", "Glass"] },
+  { "category": "Items.Food & Drink.Ready to eat", "types": ["Food"] },
+  { "category": "Items.Food & Drink.Needs cooking", "types": ["CookableFood"] },
+  { "category": "Items.Food & Drink.Beverages", "types": ["BaseBeverage", "Glass"] },
+  { "category": "Items.Cartography", "types": ["MapItem"] },
+  {
+    "category": "Items.Stonecraft",
+    "types": ["Vase", "LargeVase", "StatueSouth", "StatueNorth", "StatueEast", "StatuePegasus", "StoneChair"]
+  },
+  {
+    "category": "Items.Glassblowing",
+    "types": [
+      "SmallFlask", "MediumFlask", "LargeFlask", "CurvedFlask", "LongFlask", "SpinningHourglass",
+      "GreenBottle", "RedBottle", "SmallBrownBottle", "SmallVioletBottle", "TinyYellowBottle",
+      "SmallBlueFlask", "SmallYellowFlask", "SmallRedFlask", "SmallEmptyFlask", "YellowBeaker",
+      "RedBeaker", "BlueBeaker", "GreenBeaker", "EmptyCurvedFlaskW", "RedCurvedFlask", "LtBlueCurvedFlask",
+      "EmptyCurvedFlaskE", "BlueCurvedFlask", "GreenCurvedFlask", "RedRibbedFlask", "VioletRibbedFlask",
+      "EmptyRibbedFlask", "LargeYellowFlask", "LargeVioletFlask", "LargeEmptyFlask", "AniRedRibbedFlask",
+      "AniLargeVioletFlask", "AniSmallBlueFlask", "SmallBlueBottle", "SmallGreenBottle", "EmptyVIalsWRack",
+      "FullVialsWRack", "EmptyJar", "FullJar", "HalfEmptyJar", "VioletStemmedBottle", "EmptyJars3",
+      "EmptyJars4", "FullJars3", "FullJars4", "EmptyJars2", "FullJars2", "HalfEmptyJars2", "EmptyVial",
+      "HourglassAni", "Hourglass", "TinyRedBottle", "SmallGreenBottle2", "Glass"
+    ]
+  },
+  {
+    "category": "Items.Pots & Plants",
+    "types": [
+      "SmallEmptyPot", "LargeEmptyPot", "PottedCactus", "PottedCactus1", "PottedCactus2", "PottedCactus3",
+      "PottedCactus4", "PottedCactus5", "PottedPlant", "PottedPlant1", "PottedPlant2", "PottedTree",
+      "PottedTree1"
+    ]
+  },
+  {
+    "category": "Items.Components",
+    "types": [
+      "BarrelLid", "BarrelStaves", "BarrelHoops", "BarrelTap", "Gears", "Springs", "Hinge", "Axle",
+      "AxleGears", "SextantParts", "ClockParts", "ClockFrame", "Clock", "ClockRight", "ClockLeft"
+    ]
+  },
+  { "category": "Items.Tools", "types": ["BaseTool", "BaseHarvestTool"] },
+  { "category": "Items.Tools.Crafting", "types": ["BaseTool"] },
+  { "category": "Items.Tools.Harvesting", "types": ["BaseHarvestTool"] },
+  { "category": "Items.Traps", "types": ["BaseTrap"] },
+  {
+    "category": "Items.Gems",
+    "types": [
+      "Amber", "Amethyst", "Citrine", "Diamond", "Emerald", "Ruby", "Sapphire", "StarSapphire",
+      "Tourmaline"
+    ]
+  },
+  { "category": "Items.Boats", "types": ["BaseBoat", "BaseBoatDeed"] },
+  { "category": "Items.Boats.Constructed", "types": ["BaseBoat"] },
+  { "category": "Items.Boats.Deeds", "types": ["BaseBoatDeed"] },
+  { "category": "Items.House Deeds", "types": ["HouseDeed", "HousePlacementTool"] },
+  { "category": "Items.Camps", "types": ["BaseCamp"] },
+  {
+    "category": "Items.Magical",
+    "types": ["Spellbook", "SpellScroll", "BlankScroll", "BasePotion", "EtherealMount"]
+  },
+  { "category": "Items.Magical.Scrolls", "types": ["SpellScroll", "BlankScroll"] },
+  {
+    "category": "Items.Magical.Scrolls.Necromancy",
+    "types": [
+      "AnimateDeadScroll", "BloodOathScroll", "CorpseSkinScroll", "CurseWeaponScroll", "EvilOmenScroll",
+      "HorrificBeastScroll", "LichFormScroll", "MindRotScroll", "PainSpikeScroll", "PoisonStrikeScroll",
+      "StrangleScroll", "SummonFamiliarScroll", "VampiricEmbraceScroll", "VengefulSpiritScroll",
+      "WitherScroll", "WraithFormScroll"
+    ]
+  },
+  { "category": "Items.Magical.Scrolls.Standard", "types": ["SpellScroll"] },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #1",
+    "types": [
+      "ClumsyScroll", "CreateFoodScroll", "FeeblemindScroll", "HealScroll", "MagicArrowScroll",
+      "NightSightScroll", "ReactiveArmorScroll", "WeakenScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #2",
+    "types": [
+      "AgilityScroll", "CunningScroll", "CureScroll", "HarmScroll", "MagicTrapScroll", "MagicUnTrapScroll",
+      "ProtectionScroll", "StrengthScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #3",
+    "types": [
+      "BlessScroll", "FireballScroll", "MagicLockScroll", "PoisonScroll", "TelekinesisScroll",
+      "TeleportScroll", "UnlockScroll", "WallOfStoneScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #4",
+    "types": [
+      "ArchCureScroll", "ArchProtectionScroll", "CurseScroll", "FireFieldScroll", "GreaterHealScroll",
+      "LightningScroll", "ManaDrainScroll", "RecallScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #5",
+    "types": [
+      "BladeSpiritsScroll", "DispelFieldScroll", "IncognitoScroll", "MagicReflectScroll",
+      "MindBlastScroll", "ParalyzeScroll", "PoisonFieldScroll", "SummonCreatureScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #6",
+    "types": [
+      "DispelScroll", "EnergyBoltScroll", "ExplosionScroll", "InvisibilityScroll", "MarkScroll",
+      "MassCurseScroll", "ParalyzeFieldScroll", "RevealScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #7",
+    "types": [
+      "ChainLightningScroll", "EnergyFieldScroll", "FlamestrikeScroll", "GateTravelScroll",
+      "ManaVampireScroll", "MassDispelScroll", "MeteorSwarmScroll", "PolymorphScroll"
+    ]
+  },
+  {
+    "category": "Items.Magical.Scrolls.Standard.Circle #8",
+    "types": [
+      "EarthquakeScroll", "EnergyVortexScroll", "ResurrectionScroll", "SummonAirElementalScroll",
+      "SummonDaemonScroll", "SummonEarthElementalScroll", "SummonFireElementalScroll",
+      "SummonWaterElementalScroll"
+    ]
+  },
+  { "category": "Items.Magical.Potions", "types": ["BasePotion"] },
+  { "category": "Items.Magical.Potions.Agility", "types": ["BaseAgilityPotion"] },
+  { "category": "Items.Magical.Potions.Cure", "types": ["BaseCurePotion"] },
+  { "category": "Items.Magical.Potions.Explosion", "types": ["BaseExplosionPotion"] },
+  { "category": "Items.Magical.Potions.Heal", "types": ["BaseHealPotion"] },
+  { "category": "Items.Magical.Potions.Poison", "types": ["BasePoisonPotion"] },
+  { "category": "Items.Magical.Potions.Refresh", "types": ["BaseRefreshPotion"] },
+  { "category": "Items.Magical.Potions.Strength", "types": ["BaseStrengthPotion"] },
+  { "category": "Items.Magical.Ethereal Mounts", "types": ["EtherealMount"] },
+  { "category": "Items.Uncategorized", "types": ["Item"] }
+]
diff --git a/ModernUO.sln b/ModernUO.sln
index c469a81f0..cdbc49c36 100644
--- a/ModernUO.sln
+++ b/ModernUO.sln
@@ -1,51 +1,51 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Projects\Server\Server.csproj", "{5E93BB35-3661-4822-9A8A-859726BAD87F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent", "Projects\UOContent\UOContent.csproj", "{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.Tests", "Projects\Server.Tests\Server.Tests.csproj", "{D7A5D3AF-D607-46EF-BAAD-0D424190311F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent.Tests", "Projects\UOContent.Tests\UOContent.Tests.csproj", "{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Analyze|x64 = Analyze|x64
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Analyze|x64.ActiveCfg = Analyze|x64
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Analyze|x64.Build.0 = Analyze|x64
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Debug|x64.ActiveCfg = Debug|x64
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Debug|x64.Build.0 = Debug|x64
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Release|x64.ActiveCfg = Release|x64
-		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Release|x64.Build.0 = Release|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Analyze|x64.ActiveCfg = Analyze|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Analyze|x64.Build.0 = Analyze|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Debug|x64.ActiveCfg = Debug|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Debug|x64.Build.0 = Debug|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Release|x64.ActiveCfg = Release|x64
-		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Release|x64.Build.0 = Release|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Analyze|x64.ActiveCfg = Analyze|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Analyze|x64.Build.0 = Analyze|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Debug|x64.ActiveCfg = Debug|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Debug|x64.Build.0 = Debug|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Release|x64.ActiveCfg = Release|x64
-		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Release|x64.Build.0 = Release|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Analyze|x64.ActiveCfg = Analyze|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Analyze|x64.Build.0 = Analyze|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Debug|x64.ActiveCfg = Debug|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Debug|x64.Build.0 = Debug|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Release|x64.ActiveCfg = Release|x64
-		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8F69EF13-E193-40B9-BA9F-4862A9F0C038}
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29102.190
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Projects\Server\Server.csproj", "{5E93BB35-3661-4822-9A8A-859726BAD87F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent", "Projects\UOContent\UOContent.csproj", "{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.Tests", "Projects\Server.Tests\Server.Tests.csproj", "{D7A5D3AF-D607-46EF-BAAD-0D424190311F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent.Tests", "Projects\UOContent.Tests\UOContent.Tests.csproj", "{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Analyze|x64 = Analyze|x64
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Analyze|x64.ActiveCfg = Analyze|x64
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Analyze|x64.Build.0 = Analyze|x64
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Debug|x64.ActiveCfg = Debug|x64
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Debug|x64.Build.0 = Debug|x64
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Release|x64.ActiveCfg = Release|x64
+		{5E93BB35-3661-4822-9A8A-859726BAD87F}.Release|x64.Build.0 = Release|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Analyze|x64.ActiveCfg = Analyze|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Analyze|x64.Build.0 = Analyze|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Debug|x64.ActiveCfg = Debug|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Debug|x64.Build.0 = Debug|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Release|x64.ActiveCfg = Release|x64
+		{83CF2484-BCCB-4B7C-9C5F-7AB43AEA5E8F}.Release|x64.Build.0 = Release|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Analyze|x64.ActiveCfg = Analyze|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Analyze|x64.Build.0 = Analyze|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Debug|x64.ActiveCfg = Debug|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Debug|x64.Build.0 = Debug|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Release|x64.ActiveCfg = Release|x64
+		{D7A5D3AF-D607-46EF-BAAD-0D424190311F}.Release|x64.Build.0 = Release|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Analyze|x64.ActiveCfg = Analyze|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Analyze|x64.Build.0 = Analyze|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Debug|x64.ActiveCfg = Debug|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Debug|x64.Build.0 = Debug|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Release|x64.ActiveCfg = Release|x64
+		{3C4797F9-603E-44EF-8E8C-9275CC9EA74B}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8F69EF13-E193-40B9-BA9F-4862A9F0C038}
+	EndGlobalSection
+EndGlobal