diff --git a/definitions/CompositeSpellsUIRedirect.dbd b/definitions/CompositeSpellsUIRedirect.dbd
index dfe84e0eca9..6cf97fa55af 100644
--- a/definitions/CompositeSpellsUIRedirect.dbd
+++ b/definitions/CompositeSpellsUIRedirect.dbd
@@ -1,18 +1,18 @@
 COLUMNS
 int ID
-int Field_12_0_0_64741_000?
-int Field_12_0_0_64741_001?
+int<Spell::ID> ParentSpellID?
+int<Spell::ID> ChildSpellID?
 int Field_12_0_1_64889_002?
 
 LAYOUT DEA3511A
 BUILD 12.0.0.64741, 12.0.0.64774
 $noninline,id$ID<32>
-Field_12_0_0_64741_000<32>
-Field_12_0_0_64741_001<32>
+ParentSpellID<32>
+ChildSpellID<32>
 
 LAYOUT A041AC9D
 BUILD 12.0.1.64889
 $noninline,id$ID<32>
-Field_12_0_0_64741_000<32>
-Field_12_0_0_64741_001<32>
+ParentSpellID<32>
+ChildSpellID<32>
 Field_12_0_1_64889_002<32>
diff --git a/definitions/DamageMeterOverride.dbd b/definitions/DamageMeterOverride.dbd
index 0a50200eeb7..e557fb304b4 100644
--- a/definitions/DamageMeterOverride.dbd
+++ b/definitions/DamageMeterOverride.dbd
@@ -1,9 +1,9 @@
 COLUMNS
 int ID
-int Field_12_0_0_64741_000?
-int Field_12_0_0_64741_001?
-int Field_12_0_0_64741_002?
-int Field_12_0_0_64741_003?
+int<Spell::ID> Field_12_0_0_64741_000?
+int<Spell::ID> Field_12_0_0_64741_001?
+int Flags?
+int Type? // 0: Ignore, 1: RedirectSource, 2: AllowFriendlyFire
 
 LAYOUT 13515839
 BUILD 12.0.1.64889
@@ -11,5 +11,5 @@ BUILD 12.0.0.64741, 12.0.0.64774
 $noninline,id$ID<32>
 Field_12_0_0_64741_000<32>
 Field_12_0_0_64741_001<32>
-Field_12_0_0_64741_002<32>
-Field_12_0_0_64741_003<u8>
+Flags<32>
+Type<u8>
diff --git a/definitions/EncounterEvent.dbd b/definitions/EncounterEvent.dbd
index 8e1fdea63a9..1c1aac17c6c 100644
--- a/definitions/EncounterEvent.dbd
+++ b/definitions/EncounterEvent.dbd
@@ -3,10 +3,10 @@ int ID
 int<Spell::ID> SpellID?
 int Field_12_0_0_64741_001?
 int Field_12_0_0_64741_002?
-int Field_12_0_0_64741_003?
+int Severity?
 int Field_12_0_0_64741_004?
-int Field_12_0_0_64741_005?
-int Field_12_0_0_64741_006?
+int Flags?
+int<FileData::ID> IconFileDataID?
 int<DungeonEncounter::ID> DungeonEncounterID?
 
 LAYOUT 54A32DBB
@@ -16,8 +16,8 @@ $noninline,id$ID<32>
 SpellID<32>
 Field_12_0_0_64741_001<32>
 Field_12_0_0_64741_002<32>
-Field_12_0_0_64741_003<8>
+Severity<8>
 Field_12_0_0_64741_004<32>
-Field_12_0_0_64741_005<32>
-Field_12_0_0_64741_006<32>
+Flags<32>
+IconFileDataID<32>
 $noninline,relation$DungeonEncounterID<32>
diff --git a/definitions/SpellVisualKitDecalAttach.dbd b/definitions/SpellVisualKitDecalAttach.dbd
index 5f88087790b..92038964645 100644
--- a/definitions/SpellVisualKitDecalAttach.dbd
+++ b/definitions/SpellVisualKitDecalAttach.dbd
@@ -10,19 +10,19 @@ int Field_12_0_0_64339_006?
 float Field_12_0_0_64741_000?
 float Field_12_0_0_64741_001?
 int Field_12_0_0_64741_002?
-int Field_12_0_0_64741_003?
+int<DecalProperties::ID> DecalPropertiesID?
 int Field_12_0_0_64741_004?
 int Field_12_0_0_64741_005?
 float Field_12_0_0_64741_006?
 float Field_12_0_0_64741_007?
 float Field_12_0_0_64741_008?
 float Field_12_0_0_64741_009?
-int Field_12_0_0_64741_010?
-float Field_12_0_0_64741_011?
-float Field_12_0_0_64741_012?
-float Field_12_0_0_64741_013?
+int Priority? // override for DecalProperties::Priority if != -1?
+float FadeIn? // override for DecalProperties::FadeIn?
+float FadeOut? // override for DecalProperties::FadeOut?
+float ArbitraryBoxHeight? // override for DecalProperties::ArbitraryBoxHeight if != 0?
 int Field_12_0_0_64741_014?
-int Field_12_0_0_64741_015?
+int<Spell::ID> SpellID?
 
 LAYOUT 953A9E08
 BUILD 12.0.0.64339, 12.0.0.64499, 12.0.0.64507, 12.0.0.64529, 12.0.0.64611
@@ -42,16 +42,16 @@ $noninline,id$ID<32>
 Field_12_0_0_64741_000[2]
 Field_12_0_0_64741_001[2]
 Field_12_0_0_64741_002<32>
-Field_12_0_0_64741_003<32>
+DecalPropertiesID<32>
 Field_12_0_0_64741_004<32>
 Field_12_0_0_64741_005<32>
 Field_12_0_0_64741_006
 Field_12_0_0_64741_007
 Field_12_0_0_64741_008
 Field_12_0_0_64741_009
-Field_12_0_0_64741_010<32>
-Field_12_0_0_64741_011
-Field_12_0_0_64741_012
-Field_12_0_0_64741_013
+Priority<32>
+FadeIn
+FadeOut
+ArbitraryBoxHeight
 Field_12_0_0_64741_014<32>
-Field_12_0_0_64741_015<32>
+SpellID<32>
diff --git a/definitions/UIExpansionDisplayInfo.dbd b/definitions/UIExpansionDisplayInfo.dbd
index 946b15a68ab..e207d101ef4 100644
--- a/definitions/UIExpansionDisplayInfo.dbd
+++ b/definitions/UIExpansionDisplayInfo.dbd
@@ -12,9 +12,9 @@ int Field_12_0_0_63854_008?
 int Field_5_5_2_63832_005?
 int Field_5_5_2_63832_006?
 int Field_5_5_2_63832_007?
-int Field_12_0_1_64889_008?
-int Field_12_0_1_64889_009?
-int Field_12_0_1_64889_010?
+int<SoundKit::ID> GlueAmbianceSoundKit?
+int<SoundKit::ID> GlueMusicSoundKit?
+int<SoundKit::ID> GlueCreditsSoundKit?
 
 LAYOUT 85273A08
 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, 4.4.0.55056, 4.4.0.55141, 4.4.0.55262, 4.4.0.55460, 4.4.0.55613, 4.4.0.55639, 4.4.0.56014, 4.4.0.56420, 4.4.0.56489, 4.4.0.56713, 4.4.0.57244
@@ -184,7 +184,7 @@ Field_12_0_0_63854_004<u8>
 HighResBackgroundID<32>
 LowResBackgroundID<32>
 UiTextureKitID<32>
-Field_12_0_1_64889_008<32>
-Field_12_0_1_64889_009<32>
-Field_12_0_1_64889_010<32>
+GlueAmbianceSoundKit<32>
+GlueMusicSoundKit<32>
+GlueCreditsSoundKit<32>
 Field_12_0_0_63854_008<32>