diff --git a/Data/expansions/classic/dbc_layouts.json b/Data/expansions/classic/dbc_layouts.json
index e5d0793f..a3cba2f8 100644
--- a/Data/expansions/classic/dbc_layouts.json
+++ b/Data/expansions/classic/dbc_layouts.json
@@ -1,108 +1,256 @@
 {
   "Spell": {
-    "ID": 0, "Attributes": 5, "AttributesEx": 6, "IconID": 117,
-    "Name": 120, "Tooltip": 147, "Rank": 129, "SchoolEnum": 1,
-    "CastingTimeIndex": 15, "PowerType": 28, "ManaCost": 29, "RangeIndex": 33,
+    "ID": 0,
+    "Attributes": 5,
+    "AttributesEx": 6,
+    "IconID": 117,
+    "Name": 120,
+    "Tooltip": 147,
+    "Rank": 129,
+    "SchoolEnum": 1,
+    "CastingTimeIndex": 15,
+    "PowerType": 28,
+    "ManaCost": 29,
+    "RangeIndex": 33,
     "DispelType": 4
   },
-  "SpellRange": { "MaxRange": 2 },
+  "SpellRange": {
+    "MaxRange": 2
+  },
   "ItemDisplayInfo": {
-    "ID": 0, "LeftModel": 1, "LeftModelTexture": 3,
-    "InventoryIcon": 5, "GeosetGroup1": 7, "GeosetGroup3": 9,
-    "TextureArmUpper": 14, "TextureArmLower": 15, "TextureHand": 16,
-    "TextureTorsoUpper": 17, "TextureTorsoLower": 18,
-    "TextureLegUpper": 19, "TextureLegLower": 20, "TextureFoot": 21
+    "ID": 0,
+    "LeftModel": 1,
+    "LeftModelTexture": 3,
+    "InventoryIcon": 5,
+    "GeosetGroup1": 7,
+    "GeosetGroup3": 9,
+    "TextureArmUpper": 14,
+    "TextureArmLower": 15,
+    "TextureHand": 16,
+    "TextureTorsoUpper": 17,
+    "TextureTorsoLower": 18,
+    "TextureLegUpper": 19,
+    "TextureLegLower": 20,
+    "TextureFoot": 21
   },
   "CharSections": {
-    "RaceID": 1, "SexID": 2, "BaseSection": 3,
-    "VariationIndex": 4, "ColorIndex": 5,
-    "Texture1": 6, "Texture2": 7, "Texture3": 8,
-    "Flags": 9
+    "RaceID": 1,
+    "SexID": 2,
+    "BaseSection": 3,
+    "Texture1": 4,
+    "Texture2": 5,
+    "Texture3": 6,
+    "Flags": 7,
+    "VariationIndex": 8,
+    "ColorIndex": 9
+  },
+  "SpellIcon": {
+    "ID": 0,
+    "Path": 1
   },
-  "SpellIcon": { "ID": 0, "Path": 1 },
   "FactionTemplate": {
-    "ID": 0, "Faction": 1, "FactionGroup": 3,
-    "FriendGroup": 4, "EnemyGroup": 5,
-    "Enemy0": 6, "Enemy1": 7, "Enemy2": 8, "Enemy3": 9
+    "ID": 0,
+    "Faction": 1,
+    "FactionGroup": 3,
+    "FriendGroup": 4,
+    "EnemyGroup": 5,
+    "Enemy0": 6,
+    "Enemy1": 7,
+    "Enemy2": 8,
+    "Enemy3": 9
   },
   "Faction": {
-    "ID": 0, "ReputationRaceMask0": 2, "ReputationRaceMask1": 3,
-    "ReputationRaceMask2": 4, "ReputationRaceMask3": 5,
-    "ReputationBase0": 10, "ReputationBase1": 11,
-    "ReputationBase2": 12, "ReputationBase3": 13
+    "ID": 0,
+    "ReputationRaceMask0": 2,
+    "ReputationRaceMask1": 3,
+    "ReputationRaceMask2": 4,
+    "ReputationRaceMask3": 5,
+    "ReputationBase0": 10,
+    "ReputationBase1": 11,
+    "ReputationBase2": 12,
+    "ReputationBase3": 13
+  },
+  "AreaTable": {
+    "ID": 0,
+    "MapID": 1,
+    "ParentAreaNum": 2,
+    "ExploreFlag": 3
   },
-  "AreaTable": { "ID": 0, "MapID": 1, "ParentAreaNum": 2, "ExploreFlag": 3 },
   "CreatureDisplayInfoExtra": {
-    "ID": 0, "RaceID": 1, "SexID": 2, "SkinID": 3, "FaceID": 4,
-    "HairStyleID": 5, "HairColorID": 6, "FacialHairID": 7,
-    "EquipDisplay0": 8, "EquipDisplay1": 9, "EquipDisplay2": 10,
-    "EquipDisplay3": 11, "EquipDisplay4": 12, "EquipDisplay5": 13,
-    "EquipDisplay6": 14, "EquipDisplay7": 15, "EquipDisplay8": 16,
-    "EquipDisplay9": 17, "EquipDisplay10": 18, "BakeName": 20
+    "ID": 0,
+    "RaceID": 1,
+    "SexID": 2,
+    "SkinID": 3,
+    "FaceID": 4,
+    "HairStyleID": 5,
+    "HairColorID": 6,
+    "FacialHairID": 7,
+    "EquipDisplay0": 8,
+    "EquipDisplay1": 9,
+    "EquipDisplay2": 10,
+    "EquipDisplay3": 11,
+    "EquipDisplay4": 12,
+    "EquipDisplay5": 13,
+    "EquipDisplay6": 14,
+    "EquipDisplay7": 15,
+    "EquipDisplay8": 16,
+    "EquipDisplay9": 17,
+    "EquipDisplay10": 18,
+    "BakeName": 20
   },
   "CreatureDisplayInfo": {
-    "ID": 0, "ModelID": 1, "ExtraDisplayId": 3,
-    "Skin1": 6, "Skin2": 7, "Skin3": 8
+    "ID": 0,
+    "ModelID": 1,
+    "ExtraDisplayId": 3,
+    "Skin1": 6,
+    "Skin2": 7,
+    "Skin3": 8
   },
   "TaxiNodes": {
-    "ID": 0, "MapID": 1, "X": 2, "Y": 3, "Z": 4, "Name": 5
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Y": 3,
+    "Z": 4,
+    "Name": 5
+  },
+  "TaxiPath": {
+    "ID": 0,
+    "FromNode": 1,
+    "ToNode": 2,
+    "Cost": 3
   },
-  "TaxiPath": { "ID": 0, "FromNode": 1, "ToNode": 2, "Cost": 3 },
   "TaxiPathNode": {
-    "ID": 0, "PathID": 1, "NodeIndex": 2, "MapID": 3,
-    "X": 4, "Y": 5, "Z": 6
+    "ID": 0,
+    "PathID": 1,
+    "NodeIndex": 2,
+    "MapID": 3,
+    "X": 4,
+    "Y": 5,
+    "Z": 6
   },
   "TalentTab": {
-    "ID": 0, "Name": 1, "ClassMask": 12,
-    "OrderIndex": 14, "BackgroundFile": 15
+    "ID": 0,
+    "Name": 1,
+    "ClassMask": 12,
+    "OrderIndex": 14,
+    "BackgroundFile": 15
   },
   "Talent": {
-    "ID": 0, "TabID": 1, "Row": 2, "Column": 3,
-    "RankSpell0": 4, "PrereqTalent0": 9, "PrereqRank0": 12
+    "ID": 0,
+    "TabID": 1,
+    "Row": 2,
+    "Column": 3,
+    "RankSpell0": 4,
+    "PrereqTalent0": 9,
+    "PrereqRank0": 12
+  },
+  "SkillLineAbility": {
+    "SkillLineID": 1,
+    "SpellID": 2
+  },
+  "SkillLine": {
+    "ID": 0,
+    "Category": 1,
+    "Name": 3
+  },
+  "Map": {
+    "ID": 0,
+    "InternalName": 1
+  },
+  "CreatureModelData": {
+    "ID": 0,
+    "ModelPath": 2
   },
-  "SkillLineAbility": { "SkillLineID": 1, "SpellID": 2 },
-  "SkillLine": { "ID": 0, "Category": 1, "Name": 3 },
-  "Map": { "ID": 0, "InternalName": 1 },
-  "CreatureModelData": { "ID": 0, "ModelPath": 2 },
   "CharHairGeosets": {
-    "RaceID": 1, "SexID": 2, "Variation": 3, "GeosetID": 4
+    "RaceID": 1,
+    "SexID": 2,
+    "Variation": 3,
+    "GeosetID": 4
   },
   "CharacterFacialHairStyles": {
-    "RaceID": 0, "SexID": 1, "Variation": 2,
-    "Geoset100": 3, "Geoset300": 4, "Geoset200": 5
+    "RaceID": 0,
+    "SexID": 1,
+    "Variation": 2,
+    "Geoset100": 3,
+    "Geoset300": 4,
+    "Geoset200": 5
+  },
+  "GameObjectDisplayInfo": {
+    "ID": 0,
+    "ModelName": 1
+  },
+  "Emotes": {
+    "ID": 0,
+    "AnimID": 2
   },
-  "GameObjectDisplayInfo": { "ID": 0, "ModelName": 1 },
-  "Emotes": { "ID": 0, "AnimID": 2 },
   "EmotesText": {
-    "ID": 0, "Command": 1, "EmoteRef": 2,
-    "OthersTargetTextID": 3, "SenderTargetTextID": 5,
-    "OthersNoTargetTextID": 7, "SenderNoTargetTextID": 9
+    "ID": 0,
+    "Command": 1,
+    "EmoteRef": 2,
+    "OthersTargetTextID": 3,
+    "SenderTargetTextID": 5,
+    "OthersNoTargetTextID": 7,
+    "SenderNoTargetTextID": 9
+  },
+  "EmotesTextData": {
+    "ID": 0,
+    "Text": 1
   },
-  "EmotesTextData": { "ID": 0, "Text": 1 },
   "Light": {
-    "ID": 0, "MapID": 1, "X": 2, "Z": 3, "Y": 4,
-    "InnerRadius": 5, "OuterRadius": 6, "LightParamsID": 7,
-    "LightParamsIDRain": 8, "LightParamsIDUnderwater": 9
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Z": 3,
+    "Y": 4,
+    "InnerRadius": 5,
+    "OuterRadius": 6,
+    "LightParamsID": 7,
+    "LightParamsIDRain": 8,
+    "LightParamsIDUnderwater": 9
+  },
+  "LightParams": {
+    "LightParamsID": 0
   },
-  "LightParams": { "LightParamsID": 0 },
   "LightIntBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "LightFloatBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "WorldMapArea": {
-    "ID": 0, "MapID": 1, "AreaID": 2, "AreaName": 3,
-    "LocLeft": 4, "LocRight": 5, "LocTop": 6, "LocBottom": 7,
-    "DisplayMapID": 8, "ParentWorldMapID": 10
+    "ID": 0,
+    "MapID": 1,
+    "AreaID": 2,
+    "AreaName": 3,
+    "LocLeft": 4,
+    "LocRight": 5,
+    "LocTop": 6,
+    "LocBottom": 7,
+    "DisplayMapID": 8,
+    "ParentWorldMapID": 10
   },
   "SpellVisual": {
-    "ID": 0, "CastKit": 2, "ImpactKit": 3, "MissileModel": 8
+    "ID": 0,
+    "CastKit": 2,
+    "ImpactKit": 3,
+    "MissileModel": 8
   },
   "SpellVisualKit": {
-    "ID": 0, "BaseEffect": 5, "SpecialEffect0": 11, "SpecialEffect1": 12, "SpecialEffect2": 13
+    "ID": 0,
+    "BaseEffect": 5,
+    "SpecialEffect0": 11,
+    "SpecialEffect1": 12,
+    "SpecialEffect2": 13
   },
   "SpellVisualEffectName": {
-    "ID": 0, "FilePath": 2
+    "ID": 0,
+    "FilePath": 2
   }
 }
diff --git a/Data/expansions/tbc/dbc_layouts.json b/Data/expansions/tbc/dbc_layouts.json
index da2fb9a5..8dc4bbe8 100644
--- a/Data/expansions/tbc/dbc_layouts.json
+++ b/Data/expansions/tbc/dbc_layouts.json
@@ -1,124 +1,303 @@
 {
   "Spell": {
-    "ID": 0, "Attributes": 5, "AttributesEx": 6, "IconID": 124,
-    "Name": 127, "Tooltip": 154, "Rank": 136, "SchoolMask": 215,
-    "CastingTimeIndex": 22, "PowerType": 35, "ManaCost": 36, "RangeIndex": 40,
+    "ID": 0,
+    "Attributes": 5,
+    "AttributesEx": 6,
+    "IconID": 124,
+    "Name": 127,
+    "Tooltip": 154,
+    "Rank": 136,
+    "SchoolMask": 215,
+    "CastingTimeIndex": 22,
+    "PowerType": 35,
+    "ManaCost": 36,
+    "RangeIndex": 40,
     "DispelType": 3
   },
-  "SpellRange": { "MaxRange": 4 },
+  "SpellRange": {
+    "MaxRange": 4
+  },
   "ItemDisplayInfo": {
-    "ID": 0, "LeftModel": 1, "LeftModelTexture": 3,
-    "InventoryIcon": 5, "GeosetGroup1": 7, "GeosetGroup3": 9,
-    "TextureArmUpper": 14, "TextureArmLower": 15, "TextureHand": 16,
-    "TextureTorsoUpper": 17, "TextureTorsoLower": 18,
-    "TextureLegUpper": 19, "TextureLegLower": 20, "TextureFoot": 21
+    "ID": 0,
+    "LeftModel": 1,
+    "LeftModelTexture": 3,
+    "InventoryIcon": 5,
+    "GeosetGroup1": 7,
+    "GeosetGroup3": 9,
+    "TextureArmUpper": 14,
+    "TextureArmLower": 15,
+    "TextureHand": 16,
+    "TextureTorsoUpper": 17,
+    "TextureTorsoLower": 18,
+    "TextureLegUpper": 19,
+    "TextureLegLower": 20,
+    "TextureFoot": 21
   },
   "CharSections": {
-    "RaceID": 1, "SexID": 2, "BaseSection": 3,
-    "VariationIndex": 4, "ColorIndex": 5,
-    "Texture1": 6, "Texture2": 7, "Texture3": 8,
-    "Flags": 9
+    "RaceID": 1,
+    "SexID": 2,
+    "BaseSection": 3,
+    "Texture1": 4,
+    "Texture2": 5,
+    "Texture3": 6,
+    "Flags": 7,
+    "VariationIndex": 8,
+    "ColorIndex": 9
+  },
+  "SpellIcon": {
+    "ID": 0,
+    "Path": 1
   },
-  "SpellIcon": { "ID": 0, "Path": 1 },
   "FactionTemplate": {
-    "ID": 0, "Faction": 1, "FactionGroup": 3,
-    "FriendGroup": 4, "EnemyGroup": 5,
-    "Enemy0": 6, "Enemy1": 7, "Enemy2": 8, "Enemy3": 9
+    "ID": 0,
+    "Faction": 1,
+    "FactionGroup": 3,
+    "FriendGroup": 4,
+    "EnemyGroup": 5,
+    "Enemy0": 6,
+    "Enemy1": 7,
+    "Enemy2": 8,
+    "Enemy3": 9
   },
   "Faction": {
-    "ID": 0, "ReputationRaceMask0": 2, "ReputationRaceMask1": 3,
-    "ReputationRaceMask2": 4, "ReputationRaceMask3": 5,
-    "ReputationBase0": 10, "ReputationBase1": 11,
-    "ReputationBase2": 12, "ReputationBase3": 13
+    "ID": 0,
+    "ReputationRaceMask0": 2,
+    "ReputationRaceMask1": 3,
+    "ReputationRaceMask2": 4,
+    "ReputationRaceMask3": 5,
+    "ReputationBase0": 10,
+    "ReputationBase1": 11,
+    "ReputationBase2": 12,
+    "ReputationBase3": 13
+  },
+  "CharTitles": {
+    "ID": 0,
+    "Title": 2,
+    "TitleBit": 20
+  },
+  "AreaTable": {
+    "ID": 0,
+    "MapID": 1,
+    "ParentAreaNum": 2,
+    "ExploreFlag": 3
   },
-  "CharTitles": { "ID": 0, "Title": 2, "TitleBit": 20 },
-  "AreaTable": { "ID": 0, "MapID": 1, "ParentAreaNum": 2, "ExploreFlag": 3 },
   "CreatureDisplayInfoExtra": {
-    "ID": 0, "RaceID": 1, "SexID": 2, "SkinID": 3, "FaceID": 4,
-    "HairStyleID": 5, "HairColorID": 6, "FacialHairID": 7,
-    "EquipDisplay0": 8, "EquipDisplay1": 9, "EquipDisplay2": 10,
-    "EquipDisplay3": 11, "EquipDisplay4": 12, "EquipDisplay5": 13,
-    "EquipDisplay6": 14, "EquipDisplay7": 15, "EquipDisplay8": 16,
-    "EquipDisplay9": 17, "EquipDisplay10": 18, "BakeName": 20
+    "ID": 0,
+    "RaceID": 1,
+    "SexID": 2,
+    "SkinID": 3,
+    "FaceID": 4,
+    "HairStyleID": 5,
+    "HairColorID": 6,
+    "FacialHairID": 7,
+    "EquipDisplay0": 8,
+    "EquipDisplay1": 9,
+    "EquipDisplay2": 10,
+    "EquipDisplay3": 11,
+    "EquipDisplay4": 12,
+    "EquipDisplay5": 13,
+    "EquipDisplay6": 14,
+    "EquipDisplay7": 15,
+    "EquipDisplay8": 16,
+    "EquipDisplay9": 17,
+    "EquipDisplay10": 18,
+    "BakeName": 20
   },
   "CreatureDisplayInfo": {
-    "ID": 0, "ModelID": 1, "ExtraDisplayId": 3,
-    "Skin1": 6, "Skin2": 7, "Skin3": 8
+    "ID": 0,
+    "ModelID": 1,
+    "ExtraDisplayId": 3,
+    "Skin1": 6,
+    "Skin2": 7,
+    "Skin3": 8
   },
   "TaxiNodes": {
-    "ID": 0, "MapID": 1, "X": 2, "Y": 3, "Z": 4, "Name": 5,
-    "MountDisplayIdAllianceFallback": 12, "MountDisplayIdHordeFallback": 13,
-    "MountDisplayIdAlliance": 14, "MountDisplayIdHorde": 15
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Y": 3,
+    "Z": 4,
+    "Name": 5,
+    "MountDisplayIdAllianceFallback": 12,
+    "MountDisplayIdHordeFallback": 13,
+    "MountDisplayIdAlliance": 14,
+    "MountDisplayIdHorde": 15
+  },
+  "TaxiPath": {
+    "ID": 0,
+    "FromNode": 1,
+    "ToNode": 2,
+    "Cost": 3
   },
-  "TaxiPath": { "ID": 0, "FromNode": 1, "ToNode": 2, "Cost": 3 },
   "TaxiPathNode": {
-    "ID": 0, "PathID": 1, "NodeIndex": 2, "MapID": 3,
-    "X": 4, "Y": 5, "Z": 6
+    "ID": 0,
+    "PathID": 1,
+    "NodeIndex": 2,
+    "MapID": 3,
+    "X": 4,
+    "Y": 5,
+    "Z": 6
   },
   "TalentTab": {
-    "ID": 0, "Name": 1, "ClassMask": 12,
-    "OrderIndex": 14, "BackgroundFile": 15
+    "ID": 0,
+    "Name": 1,
+    "ClassMask": 12,
+    "OrderIndex": 14,
+    "BackgroundFile": 15
   },
   "Talent": {
-    "ID": 0, "TabID": 1, "Row": 2, "Column": 3,
-    "RankSpell0": 4, "PrereqTalent0": 9, "PrereqRank0": 12
+    "ID": 0,
+    "TabID": 1,
+    "Row": 2,
+    "Column": 3,
+    "RankSpell0": 4,
+    "PrereqTalent0": 9,
+    "PrereqRank0": 12
+  },
+  "SkillLineAbility": {
+    "SkillLineID": 1,
+    "SpellID": 2
+  },
+  "SkillLine": {
+    "ID": 0,
+    "Category": 1,
+    "Name": 3
+  },
+  "Map": {
+    "ID": 0,
+    "InternalName": 1
+  },
+  "CreatureModelData": {
+    "ID": 0,
+    "ModelPath": 2
   },
-  "SkillLineAbility": { "SkillLineID": 1, "SpellID": 2 },
-  "SkillLine": { "ID": 0, "Category": 1, "Name": 3 },
-  "Map": { "ID": 0, "InternalName": 1 },
-  "CreatureModelData": { "ID": 0, "ModelPath": 2 },
   "CharHairGeosets": {
-    "RaceID": 1, "SexID": 2, "Variation": 3, "GeosetID": 4
+    "RaceID": 1,
+    "SexID": 2,
+    "Variation": 3,
+    "GeosetID": 4
   },
   "CharacterFacialHairStyles": {
-    "RaceID": 0, "SexID": 1, "Variation": 2,
-    "Geoset100": 3, "Geoset300": 4, "Geoset200": 5
+    "RaceID": 0,
+    "SexID": 1,
+    "Variation": 2,
+    "Geoset100": 3,
+    "Geoset300": 4,
+    "Geoset200": 5
+  },
+  "GameObjectDisplayInfo": {
+    "ID": 0,
+    "ModelName": 1
+  },
+  "Emotes": {
+    "ID": 0,
+    "AnimID": 2
   },
-  "GameObjectDisplayInfo": { "ID": 0, "ModelName": 1 },
-  "Emotes": { "ID": 0, "AnimID": 2 },
   "EmotesText": {
-    "ID": 0, "Command": 1, "EmoteRef": 2,
-    "OthersTargetTextID": 3, "SenderTargetTextID": 5,
-    "OthersNoTargetTextID": 7, "SenderNoTargetTextID": 9
+    "ID": 0,
+    "Command": 1,
+    "EmoteRef": 2,
+    "OthersTargetTextID": 3,
+    "SenderTargetTextID": 5,
+    "OthersNoTargetTextID": 7,
+    "SenderNoTargetTextID": 9
+  },
+  "EmotesTextData": {
+    "ID": 0,
+    "Text": 1
   },
-  "EmotesTextData": { "ID": 0, "Text": 1 },
   "Light": {
-    "ID": 0, "MapID": 1, "X": 2, "Z": 3, "Y": 4,
-    "InnerRadius": 5, "OuterRadius": 6, "LightParamsID": 7,
-    "LightParamsIDRain": 8, "LightParamsIDUnderwater": 9
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Z": 3,
+    "Y": 4,
+    "InnerRadius": 5,
+    "OuterRadius": 6,
+    "LightParamsID": 7,
+    "LightParamsIDRain": 8,
+    "LightParamsIDUnderwater": 9
+  },
+  "LightParams": {
+    "LightParamsID": 0
   },
-  "LightParams": { "LightParamsID": 0 },
   "LightIntBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "LightFloatBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "WorldMapArea": {
-    "ID": 0, "MapID": 1, "AreaID": 2, "AreaName": 3,
-    "LocLeft": 4, "LocRight": 5, "LocTop": 6, "LocBottom": 7,
-    "DisplayMapID": 8, "ParentWorldMapID": 10
+    "ID": 0,
+    "MapID": 1,
+    "AreaID": 2,
+    "AreaName": 3,
+    "LocLeft": 4,
+    "LocRight": 5,
+    "LocTop": 6,
+    "LocBottom": 7,
+    "DisplayMapID": 8,
+    "ParentWorldMapID": 10
   },
   "SpellItemEnchantment": {
-    "ID": 0, "Name": 8
+    "ID": 0,
+    "Name": 8
   },
   "ItemSet": {
-    "ID": 0, "Name": 1,
-    "Item0": 18, "Item1": 19, "Item2": 20, "Item3": 21, "Item4": 22,
-    "Item5": 23, "Item6": 24, "Item7": 25, "Item8": 26, "Item9": 27,
-    "Spell0": 28, "Spell1": 29, "Spell2": 30, "Spell3": 31, "Spell4": 32,
-    "Spell5": 33, "Spell6": 34, "Spell7": 35, "Spell8": 36, "Spell9": 37,
-    "Threshold0": 38, "Threshold1": 39, "Threshold2": 40, "Threshold3": 41,
-    "Threshold4": 42, "Threshold5": 43, "Threshold6": 44, "Threshold7": 45,
-    "Threshold8": 46, "Threshold9": 47
+    "ID": 0,
+    "Name": 1,
+    "Item0": 18,
+    "Item1": 19,
+    "Item2": 20,
+    "Item3": 21,
+    "Item4": 22,
+    "Item5": 23,
+    "Item6": 24,
+    "Item7": 25,
+    "Item8": 26,
+    "Item9": 27,
+    "Spell0": 28,
+    "Spell1": 29,
+    "Spell2": 30,
+    "Spell3": 31,
+    "Spell4": 32,
+    "Spell5": 33,
+    "Spell6": 34,
+    "Spell7": 35,
+    "Spell8": 36,
+    "Spell9": 37,
+    "Threshold0": 38,
+    "Threshold1": 39,
+    "Threshold2": 40,
+    "Threshold3": 41,
+    "Threshold4": 42,
+    "Threshold5": 43,
+    "Threshold6": 44,
+    "Threshold7": 45,
+    "Threshold8": 46,
+    "Threshold9": 47
   },
   "SpellVisual": {
-    "ID": 0, "CastKit": 2, "ImpactKit": 3, "MissileModel": 8
+    "ID": 0,
+    "CastKit": 2,
+    "ImpactKit": 3,
+    "MissileModel": 8
   },
   "SpellVisualKit": {
-    "ID": 0, "BaseEffect": 5, "SpecialEffect0": 11, "SpecialEffect1": 12, "SpecialEffect2": 13
+    "ID": 0,
+    "BaseEffect": 5,
+    "SpecialEffect0": 11,
+    "SpecialEffect1": 12,
+    "SpecialEffect2": 13
   },
   "SpellVisualEffectName": {
-    "ID": 0, "FilePath": 2
+    "ID": 0,
+    "FilePath": 2
   }
 }
diff --git a/Data/expansions/turtle/dbc_layouts.json b/Data/expansions/turtle/dbc_layouts.json
index cb44c54a..b7650ef5 100644
--- a/Data/expansions/turtle/dbc_layouts.json
+++ b/Data/expansions/turtle/dbc_layouts.json
@@ -1,121 +1,293 @@
 {
   "Spell": {
-    "ID": 0, "Attributes": 5, "AttributesEx": 6, "IconID": 117,
-    "Name": 120, "Tooltip": 147, "Rank": 129, "SchoolEnum": 1,
-    "CastingTimeIndex": 15, "PowerType": 28, "ManaCost": 29, "RangeIndex": 33,
+    "ID": 0,
+    "Attributes": 5,
+    "AttributesEx": 6,
+    "IconID": 117,
+    "Name": 120,
+    "Tooltip": 147,
+    "Rank": 129,
+    "SchoolEnum": 1,
+    "CastingTimeIndex": 15,
+    "PowerType": 28,
+    "ManaCost": 29,
+    "RangeIndex": 33,
     "DispelType": 4
   },
-  "SpellRange": { "MaxRange": 2 },
+  "SpellRange": {
+    "MaxRange": 2
+  },
   "ItemDisplayInfo": {
-    "ID": 0, "LeftModel": 1, "LeftModelTexture": 3,
-    "InventoryIcon": 5, "GeosetGroup1": 7, "GeosetGroup3": 9,
-    "TextureArmUpper": 14, "TextureArmLower": 15, "TextureHand": 16,
-    "TextureTorsoUpper": 17, "TextureTorsoLower": 18,
-    "TextureLegUpper": 19, "TextureLegLower": 20, "TextureFoot": 21
+    "ID": 0,
+    "LeftModel": 1,
+    "LeftModelTexture": 3,
+    "InventoryIcon": 5,
+    "GeosetGroup1": 7,
+    "GeosetGroup3": 9,
+    "TextureArmUpper": 14,
+    "TextureArmLower": 15,
+    "TextureHand": 16,
+    "TextureTorsoUpper": 17,
+    "TextureTorsoLower": 18,
+    "TextureLegUpper": 19,
+    "TextureLegLower": 20,
+    "TextureFoot": 21
   },
   "CharSections": {
-    "RaceID": 1, "SexID": 2, "BaseSection": 3,
-    "VariationIndex": 4, "ColorIndex": 5,
-    "Texture1": 6, "Texture2": 7, "Texture3": 8,
-    "Flags": 9
+    "RaceID": 1,
+    "SexID": 2,
+    "BaseSection": 3,
+    "Texture1": 4,
+    "Texture2": 5,
+    "Texture3": 6,
+    "Flags": 7,
+    "VariationIndex": 8,
+    "ColorIndex": 9
+  },
+  "SpellIcon": {
+    "ID": 0,
+    "Path": 1
   },
-  "SpellIcon": { "ID": 0, "Path": 1 },
   "FactionTemplate": {
-    "ID": 0, "Faction": 1, "FactionGroup": 3,
-    "FriendGroup": 4, "EnemyGroup": 5,
-    "Enemy0": 6, "Enemy1": 7, "Enemy2": 8, "Enemy3": 9
+    "ID": 0,
+    "Faction": 1,
+    "FactionGroup": 3,
+    "FriendGroup": 4,
+    "EnemyGroup": 5,
+    "Enemy0": 6,
+    "Enemy1": 7,
+    "Enemy2": 8,
+    "Enemy3": 9
   },
   "Faction": {
-    "ID": 0, "ReputationRaceMask0": 2, "ReputationRaceMask1": 3,
-    "ReputationRaceMask2": 4, "ReputationRaceMask3": 5,
-    "ReputationBase0": 10, "ReputationBase1": 11,
-    "ReputationBase2": 12, "ReputationBase3": 13
+    "ID": 0,
+    "ReputationRaceMask0": 2,
+    "ReputationRaceMask1": 3,
+    "ReputationRaceMask2": 4,
+    "ReputationRaceMask3": 5,
+    "ReputationBase0": 10,
+    "ReputationBase1": 11,
+    "ReputationBase2": 12,
+    "ReputationBase3": 13
+  },
+  "AreaTable": {
+    "ID": 0,
+    "MapID": 1,
+    "ParentAreaNum": 2,
+    "ExploreFlag": 3
   },
-  "AreaTable": { "ID": 0, "MapID": 1, "ParentAreaNum": 2, "ExploreFlag": 3 },
   "CreatureDisplayInfoExtra": {
-    "ID": 0, "RaceID": 1, "SexID": 2, "SkinID": 3, "FaceID": 4,
-    "HairStyleID": 5, "HairColorID": 6, "FacialHairID": 7,
-    "EquipDisplay0": 8, "EquipDisplay1": 9, "EquipDisplay2": 10,
-    "EquipDisplay3": 11, "EquipDisplay4": 12, "EquipDisplay5": 13,
-    "EquipDisplay6": 14, "EquipDisplay7": 15, "EquipDisplay8": 16,
-    "EquipDisplay9": 17, "BakeName": 18
+    "ID": 0,
+    "RaceID": 1,
+    "SexID": 2,
+    "SkinID": 3,
+    "FaceID": 4,
+    "HairStyleID": 5,
+    "HairColorID": 6,
+    "FacialHairID": 7,
+    "EquipDisplay0": 8,
+    "EquipDisplay1": 9,
+    "EquipDisplay2": 10,
+    "EquipDisplay3": 11,
+    "EquipDisplay4": 12,
+    "EquipDisplay5": 13,
+    "EquipDisplay6": 14,
+    "EquipDisplay7": 15,
+    "EquipDisplay8": 16,
+    "EquipDisplay9": 17,
+    "BakeName": 18
   },
   "CreatureDisplayInfo": {
-    "ID": 0, "ModelID": 1, "ExtraDisplayId": 3,
-    "Skin1": 6, "Skin2": 7, "Skin3": 8
+    "ID": 0,
+    "ModelID": 1,
+    "ExtraDisplayId": 3,
+    "Skin1": 6,
+    "Skin2": 7,
+    "Skin3": 8
   },
   "TaxiNodes": {
-    "ID": 0, "MapID": 1, "X": 2, "Y": 3, "Z": 4, "Name": 5
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Y": 3,
+    "Z": 4,
+    "Name": 5
+  },
+  "TaxiPath": {
+    "ID": 0,
+    "FromNode": 1,
+    "ToNode": 2,
+    "Cost": 3
   },
-  "TaxiPath": { "ID": 0, "FromNode": 1, "ToNode": 2, "Cost": 3 },
   "TaxiPathNode": {
-    "ID": 0, "PathID": 1, "NodeIndex": 2, "MapID": 3,
-    "X": 4, "Y": 5, "Z": 6
+    "ID": 0,
+    "PathID": 1,
+    "NodeIndex": 2,
+    "MapID": 3,
+    "X": 4,
+    "Y": 5,
+    "Z": 6
   },
   "TalentTab": {
-    "ID": 0, "Name": 1, "ClassMask": 12,
-    "OrderIndex": 14, "BackgroundFile": 15
+    "ID": 0,
+    "Name": 1,
+    "ClassMask": 12,
+    "OrderIndex": 14,
+    "BackgroundFile": 15
   },
   "Talent": {
-    "ID": 0, "TabID": 1, "Row": 2, "Column": 3,
-    "RankSpell0": 4, "PrereqTalent0": 9, "PrereqRank0": 12
+    "ID": 0,
+    "TabID": 1,
+    "Row": 2,
+    "Column": 3,
+    "RankSpell0": 4,
+    "PrereqTalent0": 9,
+    "PrereqRank0": 12
+  },
+  "SkillLineAbility": {
+    "SkillLineID": 1,
+    "SpellID": 2
+  },
+  "SkillLine": {
+    "ID": 0,
+    "Category": 1,
+    "Name": 3
+  },
+  "Map": {
+    "ID": 0,
+    "InternalName": 1
+  },
+  "CreatureModelData": {
+    "ID": 0,
+    "ModelPath": 2
   },
-  "SkillLineAbility": { "SkillLineID": 1, "SpellID": 2 },
-  "SkillLine": { "ID": 0, "Category": 1, "Name": 3 },
-  "Map": { "ID": 0, "InternalName": 1 },
-  "CreatureModelData": { "ID": 0, "ModelPath": 2 },
   "CharHairGeosets": {
-    "RaceID": 1, "SexID": 2, "Variation": 3, "GeosetID": 4
+    "RaceID": 1,
+    "SexID": 2,
+    "Variation": 3,
+    "GeosetID": 4
   },
   "CharacterFacialHairStyles": {
-    "RaceID": 0, "SexID": 1, "Variation": 2,
-    "Geoset100": 3, "Geoset300": 4, "Geoset200": 5
+    "RaceID": 0,
+    "SexID": 1,
+    "Variation": 2,
+    "Geoset100": 3,
+    "Geoset300": 4,
+    "Geoset200": 5
+  },
+  "GameObjectDisplayInfo": {
+    "ID": 0,
+    "ModelName": 1
+  },
+  "Emotes": {
+    "ID": 0,
+    "AnimID": 2
   },
-  "GameObjectDisplayInfo": { "ID": 0, "ModelName": 1 },
-  "Emotes": { "ID": 0, "AnimID": 2 },
   "EmotesText": {
-    "ID": 0, "Command": 1, "EmoteRef": 2,
-    "OthersTargetTextID": 3, "SenderTargetTextID": 5,
-    "OthersNoTargetTextID": 7, "SenderNoTargetTextID": 9
+    "ID": 0,
+    "Command": 1,
+    "EmoteRef": 2,
+    "OthersTargetTextID": 3,
+    "SenderTargetTextID": 5,
+    "OthersNoTargetTextID": 7,
+    "SenderNoTargetTextID": 9
+  },
+  "EmotesTextData": {
+    "ID": 0,
+    "Text": 1
   },
-  "EmotesTextData": { "ID": 0, "Text": 1 },
   "Light": {
-    "ID": 0, "MapID": 1, "X": 2, "Z": 3, "Y": 4,
-    "InnerRadius": 5, "OuterRadius": 6, "LightParamsID": 7,
-    "LightParamsIDRain": 8, "LightParamsIDUnderwater": 9
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Z": 3,
+    "Y": 4,
+    "InnerRadius": 5,
+    "OuterRadius": 6,
+    "LightParamsID": 7,
+    "LightParamsIDRain": 8,
+    "LightParamsIDUnderwater": 9
+  },
+  "LightParams": {
+    "LightParamsID": 0
   },
-  "LightParams": { "LightParamsID": 0 },
   "LightIntBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "LightFloatBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "WorldMapArea": {
-    "ID": 0, "MapID": 1, "AreaID": 2, "AreaName": 3,
-    "LocLeft": 4, "LocRight": 5, "LocTop": 6, "LocBottom": 7,
-    "DisplayMapID": 8, "ParentWorldMapID": 10
+    "ID": 0,
+    "MapID": 1,
+    "AreaID": 2,
+    "AreaName": 3,
+    "LocLeft": 4,
+    "LocRight": 5,
+    "LocTop": 6,
+    "LocBottom": 7,
+    "DisplayMapID": 8,
+    "ParentWorldMapID": 10
   },
   "SpellItemEnchantment": {
-    "ID": 0, "Name": 8
+    "ID": 0,
+    "Name": 8
   },
   "ItemSet": {
-    "ID": 0, "Name": 1,
-    "Item0": 10, "Item1": 11, "Item2": 12, "Item3": 13, "Item4": 14,
-    "Item5": 15, "Item6": 16, "Item7": 17, "Item8": 18, "Item9": 19,
-    "Spell0": 20, "Spell1": 21, "Spell2": 22, "Spell3": 23, "Spell4": 24,
-    "Spell5": 25, "Spell6": 26, "Spell7": 27, "Spell8": 28, "Spell9": 29,
-    "Threshold0": 30, "Threshold1": 31, "Threshold2": 32, "Threshold3": 33,
-    "Threshold4": 34, "Threshold5": 35, "Threshold6": 36, "Threshold7": 37,
-    "Threshold8": 38, "Threshold9": 39
+    "ID": 0,
+    "Name": 1,
+    "Item0": 10,
+    "Item1": 11,
+    "Item2": 12,
+    "Item3": 13,
+    "Item4": 14,
+    "Item5": 15,
+    "Item6": 16,
+    "Item7": 17,
+    "Item8": 18,
+    "Item9": 19,
+    "Spell0": 20,
+    "Spell1": 21,
+    "Spell2": 22,
+    "Spell3": 23,
+    "Spell4": 24,
+    "Spell5": 25,
+    "Spell6": 26,
+    "Spell7": 27,
+    "Spell8": 28,
+    "Spell9": 29,
+    "Threshold0": 30,
+    "Threshold1": 31,
+    "Threshold2": 32,
+    "Threshold3": 33,
+    "Threshold4": 34,
+    "Threshold5": 35,
+    "Threshold6": 36,
+    "Threshold7": 37,
+    "Threshold8": 38,
+    "Threshold9": 39
   },
   "SpellVisual": {
-    "ID": 0, "CastKit": 2, "ImpactKit": 3, "MissileModel": 8
+    "ID": 0,
+    "CastKit": 2,
+    "ImpactKit": 3,
+    "MissileModel": 8
   },
   "SpellVisualKit": {
-    "ID": 0, "BaseEffect": 5, "SpecialEffect0": 11, "SpecialEffect1": 12, "SpecialEffect2": 13
+    "ID": 0,
+    "BaseEffect": 5,
+    "SpecialEffect0": 11,
+    "SpecialEffect1": 12,
+    "SpecialEffect2": 13
   },
   "SpellVisualEffectName": {
-    "ID": 0, "FilePath": 2
+    "ID": 0,
+    "FilePath": 2
   }
 }
diff --git a/Data/expansions/wotlk/dbc_layouts.json b/Data/expansions/wotlk/dbc_layouts.json
index 4ecbfc32..505ae150 100644
--- a/Data/expansions/wotlk/dbc_layouts.json
+++ b/Data/expansions/wotlk/dbc_layouts.json
@@ -1,129 +1,319 @@
 {
   "Spell": {
-    "ID": 0, "Attributes": 4, "AttributesEx": 5, "IconID": 133,
-    "Name": 136, "Tooltip": 139, "Rank": 153, "SchoolMask": 225,
-    "PowerType": 14, "ManaCost": 39, "CastingTimeIndex": 47, "RangeIndex": 49,
+    "ID": 0,
+    "Attributes": 4,
+    "AttributesEx": 5,
+    "IconID": 133,
+    "Name": 136,
+    "Tooltip": 139,
+    "Rank": 153,
+    "SchoolMask": 225,
+    "PowerType": 14,
+    "ManaCost": 39,
+    "CastingTimeIndex": 47,
+    "RangeIndex": 49,
     "DispelType": 2
   },
-  "SpellRange": { "MaxRange": 4 },
+  "SpellRange": {
+    "MaxRange": 4
+  },
   "ItemDisplayInfo": {
-    "ID": 0, "LeftModel": 1, "LeftModelTexture": 3,
-    "InventoryIcon": 5, "GeosetGroup1": 7, "GeosetGroup3": 9,
-    "TextureArmUpper": 14, "TextureArmLower": 15, "TextureHand": 16,
-    "TextureTorsoUpper": 17, "TextureTorsoLower": 18,
-    "TextureLegUpper": 19, "TextureLegLower": 20, "TextureFoot": 21
+    "ID": 0,
+    "LeftModel": 1,
+    "LeftModelTexture": 3,
+    "InventoryIcon": 5,
+    "GeosetGroup1": 7,
+    "GeosetGroup3": 9,
+    "TextureArmUpper": 14,
+    "TextureArmLower": 15,
+    "TextureHand": 16,
+    "TextureTorsoUpper": 17,
+    "TextureTorsoLower": 18,
+    "TextureLegUpper": 19,
+    "TextureLegLower": 20,
+    "TextureFoot": 21
   },
   "CharSections": {
-    "RaceID": 1, "SexID": 2, "BaseSection": 3,
-    "VariationIndex": 4, "ColorIndex": 5,
-    "Texture1": 6, "Texture2": 7, "Texture3": 8,
-    "Flags": 9
+    "RaceID": 1,
+    "SexID": 2,
+    "BaseSection": 3,
+    "Texture1": 4,
+    "Texture2": 5,
+    "Texture3": 6,
+    "Flags": 7,
+    "VariationIndex": 8,
+    "ColorIndex": 9
+  },
+  "SpellIcon": {
+    "ID": 0,
+    "Path": 1
   },
-  "SpellIcon": { "ID": 0, "Path": 1 },
   "FactionTemplate": {
-    "ID": 0, "Faction": 1, "FactionGroup": 3,
-    "FriendGroup": 4, "EnemyGroup": 5,
-    "Enemy0": 6, "Enemy1": 7, "Enemy2": 8, "Enemy3": 9
+    "ID": 0,
+    "Faction": 1,
+    "FactionGroup": 3,
+    "FriendGroup": 4,
+    "EnemyGroup": 5,
+    "Enemy0": 6,
+    "Enemy1": 7,
+    "Enemy2": 8,
+    "Enemy3": 9
   },
   "Faction": {
-    "ID": 0, "ReputationRaceMask0": 2, "ReputationRaceMask1": 3,
-    "ReputationRaceMask2": 4, "ReputationRaceMask3": 5,
-    "ReputationBase0": 10, "ReputationBase1": 11,
-    "ReputationBase2": 12, "ReputationBase3": 13
+    "ID": 0,
+    "ReputationRaceMask0": 2,
+    "ReputationRaceMask1": 3,
+    "ReputationRaceMask2": 4,
+    "ReputationRaceMask3": 5,
+    "ReputationBase0": 10,
+    "ReputationBase1": 11,
+    "ReputationBase2": 12,
+    "ReputationBase3": 13
+  },
+  "CharTitles": {
+    "ID": 0,
+    "Title": 2,
+    "TitleBit": 36
+  },
+  "Achievement": {
+    "ID": 0,
+    "Title": 4,
+    "Description": 21,
+    "Points": 39
+  },
+  "AchievementCriteria": {
+    "ID": 0,
+    "AchievementID": 1,
+    "Quantity": 4,
+    "Description": 9
+  },
+  "AreaTable": {
+    "ID": 0,
+    "MapID": 1,
+    "ParentAreaNum": 2,
+    "ExploreFlag": 3
   },
-  "CharTitles": { "ID": 0, "Title": 2, "TitleBit": 36 },
-  "Achievement": { "ID": 0, "Title": 4, "Description": 21, "Points": 39 },
-  "AchievementCriteria": { "ID": 0, "AchievementID": 1, "Quantity": 4, "Description": 9 },
-  "AreaTable": { "ID": 0, "MapID": 1, "ParentAreaNum": 2, "ExploreFlag": 3 },
   "CreatureDisplayInfoExtra": {
-    "ID": 0, "RaceID": 1, "SexID": 2, "SkinID": 3, "FaceID": 4,
-    "HairStyleID": 5, "HairColorID": 6, "FacialHairID": 7,
-    "EquipDisplay0": 8, "EquipDisplay1": 9, "EquipDisplay2": 10,
-    "EquipDisplay3": 11, "EquipDisplay4": 12, "EquipDisplay5": 13,
-    "EquipDisplay6": 14, "EquipDisplay7": 15, "EquipDisplay8": 16,
-    "EquipDisplay9": 17, "EquipDisplay10": 18, "BakeName": 20
+    "ID": 0,
+    "RaceID": 1,
+    "SexID": 2,
+    "SkinID": 3,
+    "FaceID": 4,
+    "HairStyleID": 5,
+    "HairColorID": 6,
+    "FacialHairID": 7,
+    "EquipDisplay0": 8,
+    "EquipDisplay1": 9,
+    "EquipDisplay2": 10,
+    "EquipDisplay3": 11,
+    "EquipDisplay4": 12,
+    "EquipDisplay5": 13,
+    "EquipDisplay6": 14,
+    "EquipDisplay7": 15,
+    "EquipDisplay8": 16,
+    "EquipDisplay9": 17,
+    "EquipDisplay10": 18,
+    "BakeName": 20
   },
   "CreatureDisplayInfo": {
-    "ID": 0, "ModelID": 1, "ExtraDisplayId": 3,
-    "Skin1": 6, "Skin2": 7, "Skin3": 8
+    "ID": 0,
+    "ModelID": 1,
+    "ExtraDisplayId": 3,
+    "Skin1": 6,
+    "Skin2": 7,
+    "Skin3": 8
   },
   "TaxiNodes": {
-    "ID": 0, "MapID": 1, "X": 2, "Y": 3, "Z": 4, "Name": 5,
-    "MountDisplayIdAllianceFallback": 20, "MountDisplayIdHordeFallback": 21,
-    "MountDisplayIdAlliance": 22, "MountDisplayIdHorde": 23
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Y": 3,
+    "Z": 4,
+    "Name": 5,
+    "MountDisplayIdAllianceFallback": 20,
+    "MountDisplayIdHordeFallback": 21,
+    "MountDisplayIdAlliance": 22,
+    "MountDisplayIdHorde": 23
+  },
+  "TaxiPath": {
+    "ID": 0,
+    "FromNode": 1,
+    "ToNode": 2,
+    "Cost": 3
   },
-  "TaxiPath": { "ID": 0, "FromNode": 1, "ToNode": 2, "Cost": 3 },
   "TaxiPathNode": {
-    "ID": 0, "PathID": 1, "NodeIndex": 2, "MapID": 3,
-    "X": 4, "Y": 5, "Z": 6
+    "ID": 0,
+    "PathID": 1,
+    "NodeIndex": 2,
+    "MapID": 3,
+    "X": 4,
+    "Y": 5,
+    "Z": 6
   },
   "TalentTab": {
-    "ID": 0, "Name": 1, "ClassMask": 20,
-    "OrderIndex": 22, "BackgroundFile": 23
+    "ID": 0,
+    "Name": 1,
+    "ClassMask": 20,
+    "OrderIndex": 22,
+    "BackgroundFile": 23
   },
   "Talent": {
-    "ID": 0, "TabID": 1, "Row": 2, "Column": 3,
-    "RankSpell0": 4, "PrereqTalent0": 9, "PrereqRank0": 12
+    "ID": 0,
+    "TabID": 1,
+    "Row": 2,
+    "Column": 3,
+    "RankSpell0": 4,
+    "PrereqTalent0": 9,
+    "PrereqRank0": 12
+  },
+  "SkillLineAbility": {
+    "SkillLineID": 1,
+    "SpellID": 2
+  },
+  "SkillLine": {
+    "ID": 0,
+    "Category": 1,
+    "Name": 3
+  },
+  "Map": {
+    "ID": 0,
+    "InternalName": 1
+  },
+  "CreatureModelData": {
+    "ID": 0,
+    "ModelPath": 2
   },
-  "SkillLineAbility": { "SkillLineID": 1, "SpellID": 2 },
-  "SkillLine": { "ID": 0, "Category": 1, "Name": 3 },
-  "Map": { "ID": 0, "InternalName": 1 },
-  "CreatureModelData": { "ID": 0, "ModelPath": 2 },
   "CharHairGeosets": {
-    "RaceID": 1, "SexID": 2, "Variation": 3, "GeosetID": 4
+    "RaceID": 1,
+    "SexID": 2,
+    "Variation": 3,
+    "GeosetID": 4
   },
   "CharacterFacialHairStyles": {
-    "RaceID": 0, "SexID": 1, "Variation": 2,
-    "Geoset100": 3, "Geoset300": 4, "Geoset200": 5
+    "RaceID": 0,
+    "SexID": 1,
+    "Variation": 2,
+    "Geoset100": 3,
+    "Geoset300": 4,
+    "Geoset200": 5
+  },
+  "GameObjectDisplayInfo": {
+    "ID": 0,
+    "ModelName": 1
+  },
+  "Emotes": {
+    "ID": 0,
+    "AnimID": 2
   },
-  "GameObjectDisplayInfo": { "ID": 0, "ModelName": 1 },
-  "Emotes": { "ID": 0, "AnimID": 2 },
   "EmotesText": {
-    "ID": 0, "Command": 1, "EmoteRef": 2,
-    "OthersTargetTextID": 3, "SenderTargetTextID": 5,
-    "OthersNoTargetTextID": 7, "SenderNoTargetTextID": 9
+    "ID": 0,
+    "Command": 1,
+    "EmoteRef": 2,
+    "OthersTargetTextID": 3,
+    "SenderTargetTextID": 5,
+    "OthersNoTargetTextID": 7,
+    "SenderNoTargetTextID": 9
+  },
+  "EmotesTextData": {
+    "ID": 0,
+    "Text": 1
   },
-  "EmotesTextData": { "ID": 0, "Text": 1 },
   "Light": {
-    "ID": 0, "MapID": 1, "X": 2, "Z": 3, "Y": 4,
-    "InnerRadius": 5, "OuterRadius": 6, "LightParamsID": 7,
-    "LightParamsIDRain": 8, "LightParamsIDUnderwater": 9
+    "ID": 0,
+    "MapID": 1,
+    "X": 2,
+    "Z": 3,
+    "Y": 4,
+    "InnerRadius": 5,
+    "OuterRadius": 6,
+    "LightParamsID": 7,
+    "LightParamsIDRain": 8,
+    "LightParamsIDUnderwater": 9
+  },
+  "LightParams": {
+    "LightParamsID": 0
   },
-  "LightParams": { "LightParamsID": 0 },
   "LightIntBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "LightFloatBand": {
-    "BlockIndex": 1, "NumKeyframes": 2, "TimeKey0": 3, "Value0": 19
+    "BlockIndex": 1,
+    "NumKeyframes": 2,
+    "TimeKey0": 3,
+    "Value0": 19
   },
   "WorldMapArea": {
-    "ID": 0, "MapID": 1, "AreaID": 2, "AreaName": 3,
-    "LocLeft": 4, "LocRight": 5, "LocTop": 6, "LocBottom": 7,
-    "DisplayMapID": 8, "ParentWorldMapID": 10
+    "ID": 0,
+    "MapID": 1,
+    "AreaID": 2,
+    "AreaName": 3,
+    "LocLeft": 4,
+    "LocRight": 5,
+    "LocTop": 6,
+    "LocBottom": 7,
+    "DisplayMapID": 8,
+    "ParentWorldMapID": 10
   },
   "SpellItemEnchantment": {
-    "ID": 0, "Name": 8
+    "ID": 0,
+    "Name": 8
   },
   "ItemSet": {
-    "ID": 0, "Name": 1,
-    "Item0": 18, "Item1": 19, "Item2": 20, "Item3": 21, "Item4": 22,
-    "Item5": 23, "Item6": 24, "Item7": 25, "Item8": 26, "Item9": 27,
-    "Spell0": 28, "Spell1": 29, "Spell2": 30, "Spell3": 31, "Spell4": 32,
-    "Spell5": 33, "Spell6": 34, "Spell7": 35, "Spell8": 36, "Spell9": 37,
-    "Threshold0": 38, "Threshold1": 39, "Threshold2": 40, "Threshold3": 41,
-    "Threshold4": 42, "Threshold5": 43, "Threshold6": 44, "Threshold7": 45,
-    "Threshold8": 46, "Threshold9": 47
+    "ID": 0,
+    "Name": 1,
+    "Item0": 18,
+    "Item1": 19,
+    "Item2": 20,
+    "Item3": 21,
+    "Item4": 22,
+    "Item5": 23,
+    "Item6": 24,
+    "Item7": 25,
+    "Item8": 26,
+    "Item9": 27,
+    "Spell0": 28,
+    "Spell1": 29,
+    "Spell2": 30,
+    "Spell3": 31,
+    "Spell4": 32,
+    "Spell5": 33,
+    "Spell6": 34,
+    "Spell7": 35,
+    "Spell8": 36,
+    "Spell9": 37,
+    "Threshold0": 38,
+    "Threshold1": 39,
+    "Threshold2": 40,
+    "Threshold3": 41,
+    "Threshold4": 42,
+    "Threshold5": 43,
+    "Threshold6": 44,
+    "Threshold7": 45,
+    "Threshold8": 46,
+    "Threshold9": 47
   },
   "LFGDungeons": {
-    "ID": 0, "Name": 1
+    "ID": 0,
+    "Name": 1
   },
   "SpellVisual": {
-    "ID": 0, "CastKit": 2, "ImpactKit": 3, "MissileModel": 8
+    "ID": 0,
+    "CastKit": 2,
+    "ImpactKit": 3,
+    "MissileModel": 8
   },
   "SpellVisualKit": {
-    "ID": 0, "BaseEffect": 5, "SpecialEffect0": 11, "SpecialEffect1": 12, "SpecialEffect2": 13
+    "ID": 0,
+    "BaseEffect": 5,
+    "SpecialEffect0": 11,
+    "SpecialEffect1": 12,
+    "SpecialEffect2": 13
   },
   "SpellVisualEffectName": {
-    "ID": 0, "FilePath": 2
+    "ID": 0,
+    "FilePath": 2
   }
 }
diff --git a/src/rendering/character_preview.cpp b/src/rendering/character_preview.cpp
index 2cb6278e..31546026 100644
--- a/src/rendering/character_preview.cpp
+++ b/src/rendering/character_preview.cpp
@@ -336,8 +336,8 @@ bool CharacterPreview::loadCharacter(game::Race race, game::Gender gender,
         uint32_t fRace = csL ? (*csL)["RaceID"] : 1;
         uint32_t fSex = csL ? (*csL)["SexID"] : 2;
         uint32_t fBase = csL ? (*csL)["BaseSection"] : 3;
-        uint32_t fVar = csL ? (*csL)["VariationIndex"] : 4;
-        uint32_t fColor = csL ? (*csL)["ColorIndex"] : 5;
+        uint32_t fVar = csL ? (*csL)["VariationIndex"] : 8;
+        uint32_t fColor = csL ? (*csL)["ColorIndex"] : 9;
         for (uint32_t r = 0; r < charSectionsDbc->getRecordCount(); r++) {
             uint32_t raceId = charSectionsDbc->getUInt32(r, fRace);
             uint32_t sexId = charSectionsDbc->getUInt32(r, fSex);
@@ -350,7 +350,7 @@ bool CharacterPreview::loadCharacter(game::Race race, game::Gender gender,
             // Section 0: Body skin (variation=0, colorIndex = skin color)
             if (baseSection == 0 && !foundSkin &&
                 variationIndex == 0 && colorIndex == static_cast<uint32_t>(skin)) {
-                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 6);
+                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 4);
                 if (!tex1.empty()) {
                     bodySkinPath_ = tex1;
                     foundSkin = true;
@@ -360,8 +360,8 @@ bool CharacterPreview::loadCharacter(game::Race race, game::Gender gender,
             else if (baseSection == 1 && !foundFace &&
                      variationIndex == static_cast<uint32_t>(face) &&
                      colorIndex == static_cast<uint32_t>(skin)) {
-                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 6);
-                std::string tex2 = charSectionsDbc->getString(r, csL ? (*csL)["Texture2"] : 7);
+                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 4);
+                std::string tex2 = charSectionsDbc->getString(r, csL ? (*csL)["Texture2"] : 5);
                 if (!tex1.empty()) faceLowerPath = tex1;
                 if (!tex2.empty()) faceUpperPath = tex2;
                 foundFace = true;
@@ -370,7 +370,7 @@ bool CharacterPreview::loadCharacter(game::Race race, game::Gender gender,
             else if (baseSection == 3 && !foundHair &&
                      variationIndex == static_cast<uint32_t>(hairStyle) &&
                      colorIndex == static_cast<uint32_t>(hairColor)) {
-                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 6);
+                std::string tex1 = charSectionsDbc->getString(r, csL ? (*csL)["Texture1"] : 4);
                 if (!tex1.empty()) {
                     hairScalpPath = tex1;
                     foundHair = true;
@@ -379,7 +379,7 @@ bool CharacterPreview::loadCharacter(game::Race race, game::Gender gender,
             // Section 4: Underwear (variation=0, colorIndex = skin color)
             else if (baseSection == 4 && !foundUnderwear &&
                      variationIndex == 0 && colorIndex == static_cast<uint32_t>(skin)) {
-                uint32_t texBase = csL ? (*csL)["Texture1"] : 6;
+                uint32_t texBase = csL ? (*csL)["Texture1"] : 4;
                 for (uint32_t f = texBase; f <= texBase + 2; f++) {
                     std::string tex = charSectionsDbc->getString(r, f);
                     if (!tex.empty()) {