diff --git a/definitions/AreaTrigger.dbd b/definitions/AreaTrigger.dbd
index 9f6d3023a9b..42bd406d5ff 100644
--- a/definitions/AreaTrigger.dbd
+++ b/definitions/AreaTrigger.dbd
@@ -16,22 +16,6 @@ int<AreaTriggerActionSet::ID> AreaTriggerActionSetID
 int Flags
 int PhaseShift
 locstring Message_lang?
-locstring Field_1_15_5_57537_000_lang?
-float Field_1_15_5_57537_001?
-int Field_1_15_5_57537_002?
-int Field_1_15_5_57537_003?
-int Field_1_15_5_57537_004?
-int Field_1_15_5_57537_005?
-int Field_1_15_5_57537_006?
-float Field_1_15_5_57537_007?
-float Field_1_15_5_57537_008?
-float Field_1_15_5_57537_009?
-float Field_1_15_5_57537_010?
-float Field_1_15_5_57537_011?
-int Field_1_15_5_57537_012?
-int Field_1_15_5_57537_013?
-int Field_1_15_5_57537_014?
-int Field_1_15_5_57537_015?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.9.1.3810
@@ -61,22 +45,22 @@ Flags<8>
 
 LAYOUT B4ACA6C2
 BUILD 1.15.5.57537
-Field_1_15_5_57537_000_lang
-Field_1_15_5_57537_001[3]
-$id$Field_1_15_5_57537_002<32>
-$relation$Field_1_15_5_57537_003<16>
-Field_1_15_5_57537_004<32>
-Field_1_15_5_57537_005<16>
-Field_1_15_5_57537_006<16>
-Field_1_15_5_57537_007
-Field_1_15_5_57537_008
-Field_1_15_5_57537_009
-Field_1_15_5_57537_010
-Field_1_15_5_57537_011
-Field_1_15_5_57537_012<8>
-Field_1_15_5_57537_013<16>
-Field_1_15_5_57537_014<32>
-Field_1_15_5_57537_015<8>
+Message_lang
+Pos[3]
+$id$ID<32>
+$relation$ContinentID<16>
+PhaseUseFlags<32>
+PhaseID<16>
+PhaseGroupID<16>
+Radius
+Box_length
+Box_width
+Box_height
+Box_yaw
+ShapeType<8>
+ShapeID<16>
+AreaTriggerActionSetID<32>
+Flags<8>
 
 LAYOUT DE028A76, B4CC10CD
 BUILD 2.5.4.42581, 2.5.4.42695, 2.5.4.42757, 2.5.4.42800, 2.5.4.42869, 2.5.4.42870, 2.5.4.42873, 2.5.4.42917, 2.5.4.42940, 2.5.4.43400, 2.5.4.43638, 2.5.4.43861, 2.5.4.44036, 2.5.4.44171, 2.5.4.44400, 2.5.4.44833
diff --git a/definitions/ChrCustomizationOption.dbd b/definitions/ChrCustomizationOption.dbd
index e47d3f512ee..d7677d01bed 100644
--- a/definitions/ChrCustomizationOption.dbd
+++ b/definitions/ChrCustomizationOption.dbd
@@ -14,33 +14,21 @@ int<ChrCustomizationReq::ID> Requirement
 int AddedInPatch?
 int<ChrRaces::ID> ChrRacesID?
 int Sex?
-locstring Field_1_15_5_57537_000_lang?
-int Field_1_15_5_57537_001?
-int Field_1_15_5_57537_002?
-int Field_1_15_5_57537_003?
-int Field_1_15_5_57537_004?
-int Field_1_15_5_57537_005?
-int Field_1_15_5_57537_006?
-int Field_1_15_5_57537_007?
-float Field_1_15_5_57537_008?
-int Field_1_15_5_57537_009?
-int Field_1_15_5_57537_010?
-int Field_1_15_5_57537_011?
 
 LAYOUT 6714C155
 BUILD 1.15.5.57537
-Field_1_15_5_57537_000_lang
-$id$Field_1_15_5_57537_001<32>
-Field_1_15_5_57537_002<u16>
-Field_1_15_5_57537_003<32>
-$relation$Field_1_15_5_57537_004<32>
-Field_1_15_5_57537_005<32>
-Field_1_15_5_57537_006<32>
-Field_1_15_5_57537_007<32>
-Field_1_15_5_57537_008
-Field_1_15_5_57537_009<32>
-Field_1_15_5_57537_010<32>
-Field_1_15_5_57537_011<32>
+Name_lang
+$id$ID<32>
+SecondaryID<u16>
+Flags<32>
+$relation$ChrModelID<32>
+OrderIndex<32>
+ChrCustomizationCategoryID<32>
+OptionType<32>
+BarberShopCostModifier
+ChrCustomizationID<32>
+Requirement<32>
+SecondaryOrderIndex<32>
 
 LAYOUT 26DBFCD5
 BUILD 4.4.0.53627, 4.4.0.53750, 4.4.0.53863, 4.4.0.53973, 4.4.0.54027, 4.4.0.54137, 4.4.0.54217, 4.4.0.54339, 4.4.0.54377, 4.4.0.54427, 4.4.0.54481, 4.4.0.54500, 4.4.0.54501, 4.4.0.54525, 4.4.0.54558, 4.4.0.54647, 4.4.0.54670, 4.4.0.54737, 4.4.0.54851, 4.4.0.54901, 4.4.0.54986, 4.4.0.55006
diff --git a/definitions/GameMode.dbd b/definitions/GameMode.dbd
index f0ef9f24659..cd3c462a9b1 100644
--- a/definitions/GameMode.dbd
+++ b/definitions/GameMode.dbd
@@ -8,9 +8,9 @@ int Field_10_1_0_48661_004?
 int Field_10_1_0_48661_005?
 string Field_11_0_7_57409_000?
 int Field_11_0_7_57409_001?
-string Field_1_15_5_57537_000?
+string Tag? // cera = Classic Era, csod = Classic Season of Discovery, chc = Classic Hardcore, csom = Classic Season of Mastery, cprog = Classic Progression (e.g. Cata/MoP Classic), mainline = Mainline, ps = Plunderstorm
 int Field_1_15_5_57537_001?
-int Field_1_15_5_57537_002?
+int<FileData::ID> LogoFileDataID?
 int Field_1_15_5_57537_003?
 int Field_1_15_5_57537_004?
 int Field_1_15_5_57537_005?
@@ -52,9 +52,9 @@ LAYOUT 02DC84DD
 BUILD 11.0.7.57528
 BUILD 1.15.5.57537
 $noninline,id$ID<32>
-Field_1_15_5_57537_000
+Tag
 Field_1_15_5_57537_001<32>
-Field_1_15_5_57537_002<32>
+LogoFileDataID<32>
 Field_1_15_5_57537_003<32>
 Field_1_15_5_57537_004<32>
 Field_1_15_5_57537_005<32>