From 292a2dbafb4f91f16ca7c692550bfc3b0c60e659 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sat, 8 Jun 2024 11:55:18 -0600
Subject: [PATCH 1/5] Sync user interface structures to Toady headers

---
 df.buildings.xml  |  18 +-
 df.entities.xml   |  28 ++
 df.globals.xml    |   4 +-
 df.history.xml    |  74 ++--
 df.jobs.xml       |  24 +-
 df.ui-menus.xml   | 936 +++++++++++++++++++++++++---------------------
 df.ui.xml         |  35 +-
 df.viewscreen.xml | 697 +++++++++++++---------------------
 df.world-data.xml |   2 +-
 df.world.xml      |   2 +-
 10 files changed, 883 insertions(+), 937 deletions(-)

diff --git a/df.buildings.xml b/df.buildings.xml
index b181df69f..baa7292b3 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -1255,6 +1255,15 @@
         </bitfield>
     </struct-type>
 
+    <struct-type type-name='track_stop_profilest'>
+        <int32_t name='friction' init-value='50000' since='v0.34.08'/>
+        <bitfield name='track_flags' base-type='uint32_t'> bay12: TRACK_STOP_PROFILE_FLAG_*
+            <flag-bit name='use_dump'/>
+        </bitfield>
+        <int32_t name='dump_x_shift' since='v0.34.08'/>
+        <int32_t name='dump_y_shift' since='v0.34.08'/>
+    </struct-type>
+
     <class-type type-name='building_trapst' inherits-from='building_actual'>
         <enum base-type='int16_t' name='trap_type' type-name='trap_type'/>
         <int8_t name='state' comment='!=0 = pulled, tripped/needs reloading'/>
@@ -1272,14 +1281,7 @@
 
         <compound name='plate_info' type-name='pressure_plate_info'/>
 
-        <!-- <compound name='track_stop_info' comment='track_stop_profilest'> -->
-        <int32_t name='friction' init-value='50000' since='v0.34.08'/>
-        <bitfield name='track_flags' base-type='uint32_t'> bay12: TRACK_STOP_PROFILE_FLAG_*
-            <flag-bit name='use_dump'/>
-        </bitfield>
-        <int32_t name='dump_x_shift' since='v0.34.08'/>
-        <int32_t name='dump_y_shift' since='v0.34.08'/>
-        <!-- </compound> -->
+        <compound name='track_stop_info' type-name='track_stop_profilest'/>
         <int8_t name='stop_trigger_timer' since='v0.34.08'/>
     </class-type>
 
diff --git a/df.entities.xml b/df.entities.xml
index fee0bde66..5869c9b46 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -161,6 +161,34 @@
         </bitfield>
     </struct-type>
 
+    <struct-type type-name='tradegoodslistst'>
+        <pointer name='it' type-name='item'/>
+        <int32_t name='dist'/>
+        <int8_t name='tag'/>
+        <bool name='prohibited'/>
+        <int32_t name='value'/>
+        <bool name='expanded_container'/>
+        <int32_t name='container_amount'/>
+        <int32_t name='sort_value'/>
+    </struct-type>
+
+    <struct-type type-name='assign_trade_itemlistst'>
+        <stl-vector name='tgi' pointer-type='tradegoodslistst'/>
+    </struct-type>
+
+    <struct-type type-name='abstractitemlistst'>
+        <stl-vector name='type' type-name='int16_t'/>
+        <stl-vector name='subtype' type-name='int16_t'/>
+        <stl-vector name='subcat1' type-name='int16_t'/>
+        <stl-vector name='subcat2' type-name='int16_t'/>
+        <stl-vector name='amount' type-name='int32_t'/>
+        <stl-bit-vector name='expanded'/>
+    </struct-type>
+
+    <struct-type type-name='itemlistst'>
+        <stl-vector name='l_item' pointer-type='item'/>
+    </struct-type>
+
     <struct-type type-name='caravan_state' original-name='plot_merchantst'>
         <compound name='total_capacity' type-name='massst'/>
         <enum name='trade_state' base-type='int8_t' comment='bay12: stage'>
diff --git a/df.globals.xml b/df.globals.xml
index 4765e861f..ba0a9d1fa 100644
--- a/df.globals.xml
+++ b/df.globals.xml
@@ -185,7 +185,9 @@
     </global-object>
 
     <!-- To find: place loo'k' cursor over a unit, trace pointers to unit -->
-    <global-object name='ui_look_list' original-name='looklist' type-name='ui_look_list'/>
+    <global-object name='ui_look_list' original-name='looklist'>
+        <stl-vector pointer-type='lookinfost'/>
+    </global-object>
 
     <!-- To find: select a unit in 'v'iew, open inventory page, trace unit.inventory.* pointers -->
     <global-object name='game' type-name='gamest'/>
diff --git a/df.history.xml b/df.history.xml
index ece8b39c5..e60eee28a 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -560,36 +560,42 @@
         <int32_t name='last_holder_hf' ref-target='historical_figure'/>
     </struct-type>
 
+    <struct-type type-name='relationship_profile_hf_visualst'>
+        <int32_t name='histfig_id' ref-target='historical_figure'/>
+        <bitfield name='flags'> bay12: RELATIONSHIP_PROFILE_HF_FLAG_*
+            <flag-bit name='basic_name_known'/>
+        </bitfield>
+        <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity' comment="Involves adventurer knowing name?"/>
+        <stl-vector name="attitude" type-name='reputation_type' comment="Probably ordered"/>
+        <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element. Guess 0 - 100"/>
+        <enum name='rank' type-name='vague_relationship_type' since='v0.47.01'/>
+        <compound name='core' type-name='core_hf_relationshipst'/>
+        <int32_t name='meet_count' since='v0.44.10'/>
+        <int32_t name='last_meet_year' comment="probably latest contact. Seen -1"/>
+        <int32_t name='last_meet_season_tick'/>
+        <int32_t name='abs_x' since='v0.47.01'/>
+        <int32_t name='abs_y' since='v0.47.01'/>
+        <int32_t name='abs_z' since='v0.47.01'/>
+        <int32_t name='transient_attitude' since='v0.47.01'/>
+        <int32_t name='transient_patience' since='v0.47.01'/>
+        <int32_t name='transient_confidence' since='v0.47.01'/>
+        <int32_t name='transient_agitation' since='v0.47.01'/>
+        <int32_t name='transient_failed_persuade_attempts' since='v0.47.01'/>
+        <int32_t name='transient_failed_intimidate_attempts' since='v0.47.01'/>
+        <int32_t name='first_year' comment="transient_last_reset" since='v0.47.01'/>
+        <int32_t name='first_year_tick' since='v0.47.01'/>
+    </struct-type>
+
+    <struct-type type-name='relationship_profile_hf_historicalst'>
+        <int32_t name='histfig_id' ref-target='historical_figure'/>
+        <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity'/>
+        <stl-vector name="attitude" type-name='reputation_type'/>
+        <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element"/>
+        <compound name='core' type-name='core_hf_relationshipst'/>
+    </struct-type>
+
     <struct-type type-name='historical_figure_relationships' original-name='relationship_profilest'>
-        <stl-vector name='hf_visual'>
-            <pointer> bay12: relationship_profile_hf_visualst
-                <int32_t name='histfig_id' ref-target='historical_figure'/>
-                <bitfield name='flags'> bay12: RELATIONSHIP_PROFILE_HF_FLAG_
-                    <flag-bit name='basic_name_known'/>
-                </bitfield>
-                <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity' comment="Involves adventurer knowing name?"/>
-                <stl-vector name="attitude">
-                    <enum type-name='reputation_type' comment="Probably ordered"/>
-                </stl-vector>
-                <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element. Guess 0 - 100"/>
-                <enum name='rank' type-name='vague_relationship_type' since='v0.47.01'/>
-                <compound name='core' type-name='core_hf_relationshipst'/>
-                <int32_t name='meet_count' since='v0.44.10'/>
-                <int32_t name='last_meet_year' comment="probably latest contact. Seen -1"/>
-                <int32_t name='last_meet_season_tick'/>
-                <int32_t name='abs_x' since='v0.47.01'/>
-                <int32_t name='abs_y' since='v0.47.01'/>
-                <int32_t name='abs_z' since='v0.47.01'/>
-                <int32_t name='transient_attitude' since='v0.47.01'/>
-                <int32_t name='transient_patience' since='v0.47.01'/>
-                <int32_t name='transient_confidence' since='v0.47.01'/>
-                <int32_t name='transient_agitation' since='v0.47.01'/>
-                <int32_t name='transient_failed_persuade_attempts' since='v0.47.01'/>
-                <int32_t name='transient_failed_intimidate_attempts' since='v0.47.01'/>
-                <int32_t name='first_year' comment="transient_last_reset" since='v0.47.01'/>
-                <int32_t name='first_year_tick' since='v0.47.01'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='hf_visual' pointer-type='relationship_profile_hf_visualst'/>
         <!--
             Entries with a 'rank' value of zero are suppressed from display. Display order seems to depend on
             the value of the first 'attitude' entry.
@@ -604,15 +610,7 @@
             The role of 'counter' is unknown, but might somehow tick over into an increase in rank. It does not seem
             to play any part in the display sort order.
         -->
-        <stl-vector name='hf_historical' since='v0.44.01'>
-            <pointer> bay12: relationship_profile_hf_historicalst
-                <int32_t name='histfig_id' ref-target='historical_figure'/>
-                <stl-vector name='known_associated_identity_id' type-name='int32_t' ref-target='identity'/>
-                <stl-vector name="attitude" type-name='reputation_type'/>
-                <stl-vector name="counter" type-name='int32_t' comment="One element for each 'attitude' element"/>
-                <compound name='core' type-name='core_hf_relationshipst'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='hf_historical' since='v0.44.01' pointer-type='relationship_profile_hf_historicalst'/>
         <stl-vector name='hf_identity' since='v0.44.01'>
             <pointer> bay12: relationship_profile_hf_identityst
                 <int32_t name='identity_id' ref-target='identity'/>
diff --git a/df.jobs.xml b/df.jobs.xml
index 19e16f046..076cf3eeb 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -125,6 +125,12 @@
         <bitfield name='encrust_flags' type-name='stockpile_group_set'/>
     </struct-type>
 
+    <struct-type type-name='job_spec_data' is-union='true'>
+        <int32_t name="hist_figure_id" ref-target='historical_figure'/>
+        <int32_t name="race" ref-target='creature_raw'/>
+        <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
+    </struct-type>
+
     <struct-type type-name='job' original-name='jobst' df-list-link-type='job_list_link' df-list-link-field='list_link' key-field='id'>
         <int32_t name='id' init-value='-1'/>
         <pointer name='list_link' type-name='job_list_link'/>
@@ -150,11 +156,7 @@
         <int16_t name='item_subtype' init-value='-1' comment='when StoreInStockpile this is a unit_labor'/>
 
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name='material_category' type-name='job_material_category' comment='bay12: uint32_t job_item_flag'/>
 
         <stl-string name='reaction_name'/>
@@ -449,11 +451,7 @@
         <int32_t name="mat_index" init-value='-1'/>
 
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name="material_category" type-name='job_material_category'/>
 
         <compound name='art_spec' type-name='job_art_specification'/>
@@ -524,11 +522,7 @@
         <int16_t name="mat_type" ref-target='material' aux-value='$$.mat_index'/>
         <int32_t name="mat_index"/>
         <compound name='specflag' type-name='job_spec_flags'/>
-        <compound is-union='true'> bay12: spec_id
-            <int32_t name="hist_figure_id" ref-target='historical_figure'/>
-            <int32_t name="race" ref-target='creature_raw'/>
-            <enum base-type='int32_t' name="improvement" type-name='improvement_type'/>
-        </compound>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name="material_category" type-name='job_material_category'/>
         <int32_t name='match_value' init-value='1'/>
 
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index 005fb4762..c964f765c 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -1,7 +1,7 @@
 <data-definition>
     -- BUILDING COMPONENT ITEM SELECTION
 
-    <struct-type type-name='ui_build_item_req'>
+    <struct-type type-name='ui_build_item_req' original-name='build_req_stagest'>
         <comment>
             When creating a building, one record per required item type.
             E.g. Soap Maker's workshop requires a bucket and a building material.
@@ -19,7 +19,7 @@
         <int16_t name="count_provided"/>
     </struct-type>
 
-    <enum-type type-name='build_req_choice_type'>
+    <enum-type type-name='build_req_choice_type'> bay12: BuildReqChoice
         <enum-item name='General'/>
         <enum-item name='Specific'/>
     </enum-type>
@@ -27,8 +27,8 @@
     <class-type type-name='build_req_choicest'>
         <comment>One choice in the build item selector.</comment>
         <int32_t name="distance"/>
-        <bool/>
-        <stl-string/>
+        <bool name='on'/>
+        <stl-string name='compstr'/>
 
         <virtual-methods>
             <vmethod is-destructor='true'/>
@@ -36,22 +36,22 @@
             <vmethod name='getName'>
                 <pointer type-name='stl-string' name='str'/>
             </vmethod>
-            <vmethod ret-type='int32_t'/>
+            <vmethod ret-type='int32_t' name='select'/>
             <vmethod ret-type='bool' name='isCandidate'>
                 <int32_t name='item_id'/>
             </vmethod>
-            <vmethod ret-type='bool'/>
+            <vmethod ret-type='bool' name='deselect'/>
             <vmethod ret-type='int32_t' name='getUsedCount'/>
             <vmethod ret-type='int32_t' name='getNumCandidates'/>
-            <vmethod ret-type='bool'/>
-            <vmethod ret-type='bool' comment='get_unk1'/>
-            <vmethod comment='set_unk1'/>
-            <vmethod comment='clear_unk1'/>
+            <vmethod ret-type='bool' name='expandable'/>
+            <vmethod ret-type='bool' name='is_expanded'/>
+            <vmethod name='expand'/>
+            <vmethod name='unexpand'/>
         </virtual-methods>
     </class-type>
 
     <class-type type-name='build_req_choice_genst' inherits-from='build_req_choicest'>
-        <enum base-type='int16_t' name="item_type" type-name='item_type'/>
+        <enum name="item_type" type-name='item_type'/>
         <int16_t name='item_subtype' refers-to='(item-subtype-target $$._parent.item_type $)'/>
 
         <int16_t name='mat_type' ref-target='material' aux-value='$$.mat_index'/>
@@ -68,7 +68,7 @@
         </stl-vector>
 
         <int32_t name="used_count"/>
-        <bool name='unk_1'/>
+        <bool name='expanded'/>
     </class-type>
 
     <class-type type-name='build_req_choice_specst' inherits-from='build_req_choicest'>
@@ -82,28 +82,55 @@
         </int32_t>
     </class-type>
 
+    <enum-type type-name='build_square_type'> bay12: BuildSquare
+        <enum-item name='FINE'/>
+        <enum-item name='FINE_BLOCKED'/>
+        <enum-item name='FINE_WATER'/>
+        <enum-item name='FINE_MAGMA'/>
+        <enum-item name='SKIP'/>
+        <enum-item name='BAD_ANCHOR'/>
+        <enum-item name='BLOCKED'/>
+        <enum-item name='HIDDEN'/>
+        <enum-item name='NEED_WALL'/>
+        <enum-item name='OFF_MAP'/>
+        <enum-item name='WATER'/>
+        <enum-item name='MAGMA'/>
+        <enum-item name='BUILDING_PRESENT'/>
+        <enum-item name='CLOSE_TO_EDGE'/>
+        <enum-item name='INSIDE'/>
+        <enum-item name='NEED_OPEN_AIR'/>
+        <enum-item name='SURROUNDED_BY_AIR'/>
+        <enum-item name='TOO_HIGH'/>
+        <enum-item name='CONSTRUCTION_PRESENT'/>
+        <enum-item name='NEEDS_SOIL_OR_MUD'/>
+        <enum-item name='NEED_SOIL'/>
+    </enum-type>
+
     <class-type type-name='buildreq' original-name='buildreqst'>
         <stl-vector name='requirements' pointer-type='ui_build_item_req'/>
 
         <stl-vector name='choices' pointer-type='build_req_choicest'/>
 
-        <enum base-type='int32_t' name="building_type"
-              type-name='building_type' comment='if -1, in Build menu; otherwise select item'/>
+        <enum base-type='int32_t' name="building_type" type-name='building_type' comment='if -1, in Build menu; otherwise select item'/> Toady used the actual enum rather than the matching typedef
         <int16_t name="building_subtype"/>
         <int32_t name="custom_type" ref-target='building_def'/>
 
-        <int32_t name="stage" comment='0 no materials, 1 place, 2 select item'/>
+        <enum name="stage"> bay12: BuildReqMode
+            <enum-item name='INITIAL_FAILURE'/>
+            <enum-item name='PLACING'/>
+            <enum-item name='STAGES'/>
+        </enum>
 
         <int16_t name="req_index"/>
         <int16_t name="sel_index"/>
 
-        <int32_t name="is_grouped"/>
+        <bool name="general_choices"/>
 
         <stl-vector name='errors' pointer-type='stl-string'/>
-        <stl-vector name='unk4' pointer-type='stl-string'/>
+        <stl-vector name='warnings' pointer-type='stl-string'/>
 
         <static-array name='tiles' count='31'>
-            <static-array type-name='int32_t' count='31'/>
+            <static-array type-name='build_square_type' count='31'/>
         </static-array>
 
         <int16_t name='cur_walk_tag'/>
@@ -112,35 +139,39 @@
 
         <stl-vector name='min_weight_races' type-name='int16_t' ref-target='creature_raw'/>
         <stl-vector name='max_weight_races' type-name='int16_t' ref-target='creature_raw'/>
-        <stl-vector type-name='int32_t'/>
-        <stl-vector type-name='int16_t'/>
-        <stl-vector type-name='int16_t'/>
-        <int32_t/>
-        <int32_t/>
-        <int32_t name='friction' init-value='50000' since='v0.34.08'/>
-        <int32_t name='use_dump' since='v0.34.08'/>
-        <int32_t name='dump_x_shift' since='v0.34.08'/>
-        <int32_t name='dump_y_shift' since='v0.34.08'/>
+
+        <stl-vector name='trigger_track_weight' type-name='int32_t'/>
+        <stl-vector name='trigger_race_example' type-name='int16_t' ref-target='creature_raw'/>
+        <stl-vector name='trigger_race_size' type-name='int32_t'/>
+        <int32_t name='scroll_position_race'/>
+        <bool name='scrolling_race'/>
+
+        <compound name='track_stop' type-name='track_stop_profilest'/>
+
         <int32_t name='speed' init-value='50000' since='v0.34.08'/>
         <compound name='pos' type-name='coord' since='v0.50.01'/>
         <int32_t name='direction' since='v0.50.01'/>
-        <int16_t/>
+        <bool name='first_stage_pass'/>
+
         <compound name='selection_pos' type-name='coord' since='v0.50.01'/>
         <int32_t name='selection_area' since='v0.50.01'/>
-        <int32_t/>
-        <stl-vector type-name='int16_t' since='v0.50.01'/>
+        <int32_t name='total_sq'/>
+        <stl-vector name='total_sq_level_map' type-name='int16_t' since='v0.50.01'/>
+
+        <bool name='use_closest_material'/>
+        <bool name='use_same_material'/>
+        <bool name='build_after_placement'/>
 
-        dtor: 0x85272c0
         <virtual-methods>
-            <vmethod/>
-            <vmethod/>
-            <vmethod/>
+            <vmethod name='evaluate_buildability'><int16_t name='x'/><int16_t name='y'/><int16_t name='z'/><int32_t name='orientation'/></vmethod>
+            <vmethod name='evaluate_items_vs_placement'/>
+            <vmethod name='old_evaluate_buildability'/>
         </virtual-methods>
     </class-type>
 
     -- MISC. SIDEBAR MENUS
 
-    <enum-type type-name='interface_category_building' base-type='int32_t'>
+    <enum-type type-name='interface_category_building'> bay12: InterfaceCategoryBuilding
         <enum-item name='NONE' value='-1'/>
         <enum-item name='WEAPON'/>
         <enum-item name='ARMOR'/>
@@ -152,8 +183,7 @@
         <enum-item name='SELECT_MEMORIAL_UNIT'/>
     </enum-type>
 
-    <enum-type type-name='interface_category_construction' base-type='int32_t'>
-        <enum-item name='NONE' value='-1'/>
+    <enum-type type-name='interface_category_construction'> bay12: InterfaceCategoryConstruction
         <enum-item name='MAIN'/>
         <enum-item name='SIEGEENGINE'/>
         <enum-item name='TRAP'/>
@@ -165,9 +195,12 @@
     </enum-type>
 
     <class-type type-name='interface_button' original-name='interface_buttonst'>
-        <enum name='hotkey' type-name='interface_key' base-type='int32_t'/>
+        <enum name='hotkey' type-name='interface_key'/>
         <bool name="leave_button"/>
-        <uint32_t name='flag' since='v0.40.23'/>
+        <bitfield name='flag' base-type='uint32_t'> bay12: INTERFACE_BUTTON_FLAG_*
+            <flag-bit name='left'/>
+            <flag-bit name='right'/>
+        </bitfield>
         <stl-string name='filter_str'/>
 
         <virtual-methods>
@@ -187,7 +220,7 @@
             <vmethod name='tile' ret-type='uint8_t'/>
             <vmethod name='set_tile_color'/>
             <vmethod name='prepare_tool_tip'>
-                <pointer name='box'><stl-vector pointer-type='stl-string'/></pointer>
+                <pointer name='box' type-name='curses_text_boxst'/>
             </vmethod>
             <vmethod name='pressable' ret-type='bool'/>
             <vmethod name='has_view' ret-type='bool'/>
@@ -230,7 +263,7 @@
         <int16_t name='material' ref-target='material' aux-value='$$.matgloss'/>
         <int32_t name='matgloss'/>
         <compound name='specflag' type-name='job_spec_flags'/>
-        <int32_t name='spec_id' comment='refers to various things, such as histfigs OR races'/>
+        <compound name='specdata' type-name='job_spec_data'/>
         <bitfield name='job_item_flag' type-name='job_material_category'/>
         <bool name='add_building_location'/>
         <bool name='show_help_instead'/>
@@ -244,7 +277,7 @@
         <stl-string name='custom_category_token'/>
     </class-type>
 
-    <enum-type type-name='construction_category_type' base-type='int32_t'>
+    <enum-type type-name='construction_category_type' base-type='int32_t'> bay12: ConstructionCategoryType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='MAIN'/>
         <enum-item name='WORKSHOPS'/>
@@ -269,10 +302,10 @@
         <int32_t name='grid_height'/>
         <int32_t name='texpos'/>
         <stl-string name='str'/>
-        <enum name='hotkey' type-name='interface_key' base-type='int32_t'/>
+        <enum name='hotkey' type-name='interface_key'/>
     </struct-type>
 
-    <enum-type type-name='construction_interface_page_status_type' base-type='int32_t'>
+    <enum-type type-name='construction_interface_page_status_type' base-type='int32_t'> bay12: ConstructionInterfacePageStatusType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='FULL'/>
         <enum-item name='ICONS_ONLY'/>
@@ -299,14 +332,14 @@
         <int32_t name='scroll_position'/>
     </struct-type>
 
-    <enum-type type-name='room_flow_shape_type' base-type='int16_t'>
+    <enum-type type-name='room_flow_shape_type' base-type='int16_t'> bay12: RoomFlowShapeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='RECTANGLE'/>
         <enum-item name='WALL_FLOW'/>
         <enum-item name='FLOOR_FLOW'/>
     </enum-type>
 
-    <enum-type type-name='cannot_expel_reason_type' base-type='int32_t'>
+    <enum-type type-name='cannot_expel_reason_type' base-type='int32_t'> bay12: CannotExpelReasonType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='HEREDITARY'/>
         <enum-item name='ELECTED'/>
@@ -321,7 +354,7 @@
         <enum-item name='CHILD_MEET_WORKERS'/>
     </enum-type>
 
-    <enum-type type-name='mine_mode_type' base-type='int32_t'>
+    <enum-type type-name='mine_mode_type' base-type='int32_t'> bay12: MineModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ALL'/>
         <enum-item name='AUTOMINE_NON_LAYER_MATERIAL'/>
@@ -329,7 +362,7 @@
         <enum-item name='MARK_GEMS_ONLY'/>
     </enum-type>
 
-    <enum-type type-name='job_details_option_type' base-type='int32_t'>
+    <enum-type type-name='job_details_option_type' base-type='int32_t'> bay12: JobDetailsOptionType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='MATERIAL'/>
         <enum-item name='IMAGE'/>
@@ -337,7 +370,7 @@
         <enum-item name='IMPROVEMENT_TYPE'/>
     </enum-type>
 
-    <enum-type type-name='job_details_context_type' base-type='int32_t'>
+    <enum-type type-name='job_details_context_type' base-type='int32_t'> bay12: JobDetailsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='BUILDING_TASK_LIST'/>
         <enum-item name='CREATURES_LIST_TASK'/>
@@ -346,7 +379,7 @@
         <enum-item name='MANAGER_WORK_ORDER'/>
     </enum-type>
 
-    <enum-type type-name='stock_pile_pointer_type' base-type='int32_t'>
+    <enum-type type-name='stock_pile_pointer_type' base-type='int32_t'> bay12: StockPilePointerType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ANIMAL_EMPTY_CAGES'/>
         <enum-item name='ANIMAL_EMPTY_ANIMAL_TRAPS'/>
@@ -359,40 +392,40 @@
         <enum-item name='ARMOR_NON_USABLE'/>
     </enum-type>
 
-    <enum-type type-name='stockpile_tools_context_type' base-type='int32_t'>
+    <enum-type type-name='stockpile_tools_context_type' base-type='int32_t'> bay12: StockpileToolsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='STOCKPILE'/>
     </enum-type>
 
-    <enum-type type-name='stockpile_link_context_type' base-type='int32_t'>
+    <enum-type type-name='stockpile_link_context_type' base-type='int32_t'> bay12: StockpileLinkContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='STOCKPILE'/>
         <enum-item name='WORKSHOP'/>
         <enum-item name='HAULING_STOP'/>
     </enum-type>
 
-    <enum-type type-name='hauling_stop_conditions_context_type' base-type='int32_t'>
+    <enum-type type-name='hauling_stop_conditions_context_type' base-type='int32_t'> bay12: HaulingStopConditionsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='HAULING_MENU'/>
     </enum-type>
 
-    <enum-type type-name='assign_vehicle_context_type' base-type='int32_t'>
+    <enum-type type-name='assign_vehicle_context_type' base-type='int32_t'> bay12: AssignVehicleContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='HAULING_MENU'/>
     </enum-type>
 
-    <enum-type type-name='location_details_context_type' base-type='int32_t'>
+    <enum-type type-name='location_details_context_type' base-type='int32_t'> bay12: LocationDetailsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='FROM_ZONE'/>
         <enum-item name='FROM_LOCATION_SELECTOR'/>
     </enum-type>
 
-    <enum-type type-name='location_selector_context_type' base-type='int32_t'>
+    <enum-type type-name='location_selector_context_type' base-type='int32_t'> bay12: LocationSelectorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ZONE_MEETING_AREA_ASSIGNMENT'/>
     </enum-type>
 
-    <enum-type type-name='custom_symbol_context_type' base-type='int32_t'>
+    <enum-type type-name='custom_symbol_context_type' base-type='int32_t'> bay12: CustomSymbolContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='BURROW'/>
         <enum-item name='BURROW_PAINT'/>
@@ -400,7 +433,7 @@
         <enum-item name='SQUAD_MENU'/>
     </enum-type>
 
-    <enum-type type-name='name_creator_context_type' base-type='int32_t'>
+    <enum-type type-name='name_creator_context_type' base-type='int32_t'> bay12: NameCreatorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='EMBARK_FORT_NAME'/>
         <enum-item name='EMBARK_GROUP_NAME'/>
@@ -410,7 +443,7 @@
         <enum-item name='INFO_NOBLES_ELEVATING_POSITION_SYMBOL'/>
     </enum-type>
 
-    <enum-type type-name='image_creator_context_type' base-type='int32_t'>
+    <enum-type type-name='image_creator_context_type' base-type='int32_t'> bay12: ImageCreatorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='EMBARK_FORT_SYMBOL'/>
         <enum-item name='JOB_DETAILS_MAIN'/>
@@ -418,7 +451,7 @@
         <enum-item name='DESIGNATION_ENGRAVING'/>
     </enum-type>
 
-    <enum-type type-name='image_creator_option_type' base-type='int32_t'>
+    <enum-type type-name='image_creator_option_type' base-type='int32_t'> bay12: ImageCreatorOptionType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ALLOW_ARTIST_TO_CHOOSE'/>
         <enum-item name='RELATED_TO_HFID'/>
@@ -440,7 +473,7 @@
         <enum-item name='NEW_IMAGE_DELETE_ELEMENTS'/>
     </enum-type>
 
-    <enum-type type-name='unit_selector_context_type' base-type='int32_t'>
+    <enum-type type-name='unit_selector_context_type' base-type='int32_t'> bay12: UnitSelectorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ZONE_PEN_ASSIGNMENT'/>
         <enum-item name='ZONE_PIT_ASSIGNMENT'/>
@@ -457,33 +490,33 @@
         <enum-item name='SQUAD_FILL_POSITION'/>
     </enum-type>
 
-    <enum-type type-name='squad_selector_context_type' base-type='int32_t'>
+    <enum-type type-name='squad_selector_context_type' base-type='int32_t'> bay12: SquadSelectorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ZONE_BARRACKS_ASSIGNMENT'/>
         <enum-item name='ZONE_ARCHERY_RANGE_ASSIGNMENT'/>
     </enum-type>
 
-    <enum-type type-name='squad_schedule_context_type' base-type='int32_t'>
+    <enum-type type-name='squad_schedule_context_type' base-type='int32_t'> bay12: SquadScheduleContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='FROM_SQUAD_MENU'/>
     </enum-type>
 
-    <enum-type type-name='squad_equipment_context_type' base-type='int32_t'>
+    <enum-type type-name='squad_equipment_context_type' base-type='int32_t'> bay12: SquadEquipmentContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='FROM_SQUAD_MENU'/>
     </enum-type>
 
-    <enum-type type-name='patrol_routes_context_type' base-type='int32_t'>
+    <enum-type type-name='patrol_routes_context_type' base-type='int32_t'> bay12: PatrolRoutesContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='GIVING_SQUAD_PATROL_ORDER'/>
     </enum-type>
 
-    <enum-type type-name='burrow_selector_context_type' base-type='int32_t'>
+    <enum-type type-name='burrow_selector_context_type' base-type='int32_t'> bay12: BurrowSelectorContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='GIVING_SQUAD_ORDER'/>
     </enum-type>
 
-    <enum-type type-name='view_sheet_trait_type' base-type='int32_t'>
+    <enum-type type-name='view_sheet_trait_type' base-type='int32_t'> bay12: ViewSheetTraitType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='PHYS_ATT_PLUS'/>
         <enum-item name='PHYS_ATT_MINUS'/>
@@ -495,7 +528,7 @@
         <enum-item name='VALUE_LOW'/>
     </enum-type>
 
-    <enum-type type-name='view_sheet_unit_knowledge_type' base-type='int32_t'>
+    <enum-type type-name='view_sheet_unit_knowledge_type' base-type='int32_t'> bay12: ViewSheetUnitKnowledgeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='PHILOSOPHY_FLAG'/>
         <enum-item name='PHILOSOPHY_FLAG2'/>
@@ -517,13 +550,13 @@
         <enum-item name='WRITTEN_CONTENT'/>
     </enum-type>
 
-    <enum-type type-name='view_sheets_context_type' base-type='int32_t'>
+    <enum-type type-name='view_sheets_context_type' base-type='int32_t'> bay12: ViewSheetsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='REGULAR_PLAY'/>
         <enum-item name='PREPARE_CAREFULLY'/>
     </enum-type>
 
-    <enum-type type-name='view_sheet_type' base-type='int32_t'>
+    <enum-type type-name='view_sheet_type' base-type='int32_t'> bay12: ViewSheetType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='UNIT'/>
         <enum-item name='ITEM'/>
@@ -534,7 +567,7 @@
         <enum-item name='ITEM_LIST'/>
     </enum-type>
 
-    <enum-type type-name='unit_list_mode_type' base-type='int32_t'>
+    <enum-type type-name='unit_list_mode_type' base-type='int32_t'> bay12: UnitListModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='CITIZEN'/>
         <enum-item name='PET'/>
@@ -542,7 +575,7 @@
         <enum-item name='DECEASED'/>
     </enum-type>
 
-    <enum-type type-name='buildings_mode_type' base-type='int32_t'>
+    <enum-type type-name='buildings_mode_type' base-type='int32_t'> bay12: BuildingsModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ZONES'/>
         <enum-item name='LOCATIONS'/>
@@ -551,7 +584,7 @@
         <enum-item name='FARMPLOTS'/>
     </enum-type>
 
-    <enum-type type-name='kitchen_pref_category_type' base-type='int32_t' comment='bay12: KitchenPrefCategory'>
+    <enum-type type-name='kitchen_pref_category_type' base-type='int32_t'> bay12: KitchenPrefCategoryType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='PLANTS'/>
         <enum-item name='SEEDS'/>
@@ -559,7 +592,7 @@
         <enum-item name='OTHER'/>
     </enum-type>
 
-    <enum-type type-name='standing_orders_category_type' base-type='int32_t' comment='bay12: StandingOrdersCategory'>
+    <enum-type type-name='standing_orders_category_type' base-type='int32_t'> bay12: StandingOrdersCategoryType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='AUTOMATED_WORKSHOPS'/>
         <enum-item name='HAULING'/>
@@ -569,13 +602,13 @@
         <enum-item name='OTHER'/>
     </enum-type>
 
-    <enum-type type-name='stone_use_category_type' base-type='int32_t'>
+    <enum-type type-name='stone_use_category_type' base-type='int32_t'> bay12: StoneUseCategoryType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ECONOMIC'/>
         <enum-item name='OTHER'/>
     </enum-type>
 
-    <enum-type type-name='labor_mode_type' base-type='int32_t'>
+    <enum-type type-name='labor_mode_type' base-type='int32_t'> bay12: LaborModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='WORK_DETAILS'/>
         <enum-item name='STANDING_ORDERS'/>
@@ -583,7 +616,7 @@
         <enum-item name='STONE_USE'/>
     </enum-type>
 
-    <enum-type type-name='artifacts_mode_type' base-type='int32_t'>
+    <enum-type type-name='artifacts_mode_type' base-type='int32_t'> bay12: ArtifactsModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='ARTIFACTS'/>
         <enum-item name='SYMBOLS'/>
@@ -591,7 +624,7 @@
         <enum-item name='WRITTEN_CONTENT'/>
     </enum-type>
 
-    <enum-type type-name='counterintelligence_mode_type' base-type='int32_t'>
+    <enum-type type-name='counterintelligence_mode_type' base-type='int32_t'> bay12: CounterintelligenceModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='INTERROGATIONS'/>
         <enum-item name='ACTORS'/>
@@ -599,7 +632,7 @@
         <enum-item name='PLOTS'/>
     </enum-type>
 
-    <enum-type type-name='justice_interface_mode_type' base-type='int32_t' comment='bay12: JusticeInterfaceMode'>
+    <enum-type type-name='justice_interface_mode_type' base-type='int32_t'> bay12: JusticeInterfaceModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='OPEN_CASES'/>
         <enum-item name='CLOSED_CASES'/>
@@ -609,7 +642,7 @@
         <enum-item name='COUNTERINTELLIGENCE'/>
     </enum-type>
 
-    <enum-type type-name='info_interface_mode_type' base-type='int32_t'>
+    <enum-type type-name='info_interface_mode_type' base-type='int32_t'> bay12: InfoInterfaceModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='CREATURES'/>
         <enum-item name='JOBS'/>
@@ -621,7 +654,7 @@
         <enum-item name='JUSTICE'/>
     </enum-type>
 
-    <enum-type type-name='main_menu_option_type' base-type='int32_t'>
+    <enum-type type-name='main_menu_option_type' base-type='int32_t'> bay12: MainMenuOptionType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='RETURN'/>
         <enum-item name='SAVE_AND_QUIT'/>
@@ -639,7 +672,7 @@
         <enum-item name='CONTINUE'/>
     </enum-type>
 
-    <enum-type type-name='options_context_type' base-type='int32_t'>
+    <enum-type type-name='options_context_type' base-type='int32_t'> bay12: OptionsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='MAIN_DWARF'/>
         <enum-item name='MAIN_DWARF_GAME_OVER'/>
@@ -649,7 +682,7 @@
         <enum-item name='ABORT_FROM_STARTING_GAME'/>
     </enum-type>
 
-    <enum-type type-name='help_context_type' base-type='int32_t'>
+    <enum-type type-name='help_context_type' base-type='int32_t'> bay12: HelpContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='WORLD_GEN_MESSAGE'/>
         <enum-item name='EMBARK_TUTORIAL_CHOICE'/>
@@ -701,7 +734,7 @@
         <enum-item name='GUIDE_GOALS'/>
     </enum-type>
 
-    <enum-type type-name='settings_tab_type' base-type='int32_t'>
+    <enum-type type-name='settings_tab_type' base-type='int32_t'> bay12: SettingsTabType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='VIDEO'/>
         <enum-item name='AUDIO'/>
@@ -711,27 +744,27 @@
         <enum-item name='DIFFICULTY'/>
     </enum-type>
 
-    <enum-type type-name='settings_context_type' base-type='int32_t'>
+    <enum-type type-name='settings_context_type' base-type='int32_t'> bay12: SettingsContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='OUTSIDE_PLAY'/>
         <enum-item name='FORT_MODE'/>
     </enum-type>
 
-    <enum-type type-name='arena_context_type' base-type='int32_t'>
+    <enum-type type-name='arena_context_type' base-type='int32_t'> bay12: CreateCreatureModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='CREATURE'/>
         <enum-item name='SKILLS'/>
         <enum-item name='EQUIPMENT'/>
-        <enum-item name='CONDITIONS'/>
+        <enum-item name='CONDITION'/>
     </enum-type>
 
-    <enum-type type-name='assign_uniform_context_type' base-type='int32_t'>
+    <enum-type type-name='assign_uniform_context_type' base-type='int32_t'> bay12: AssignUniformContextType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='CREATE_SQUAD_FROM_SQUAD_MENU'/>
         <enum-item name='FROM_SQUAD_EQUIPMENT_MENU'/>
     </enum-type>
 
-    <enum-type type-name='main_bottom_mode_type' base-type='int32_t'>
+    <enum-type type-name='main_bottom_mode_type' base-type='int32_t'> bay12: MainBottomModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='BUILDING'/>
         <enum-item name='BUILDING_PLACEMENT'/>
@@ -749,10 +782,10 @@
         <enum-item name='ARENA_MAGMA_PAINT'/>
         <enum-item name='ARENA_SNOW_PAINT'/>
         <enum-item name='ARENA_MUD_PAINT'/>
-    <enum-item name='ARENA_REMOVE_PAINT'/>
+        <enum-item name='ARENA_REMOVE_PAINT'/>
     </enum-type>
 
-    <enum-type type-name='main_designation_type' base-type='int32_t'>
+    <enum-type type-name='main_designation_type' base-type='int32_t'> bay12: MainDesignationType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='DIG_DIG'/>
         <enum-item name='DIG_REMOVE_STAIRS_RAMPS'/>
@@ -800,7 +833,7 @@
         <pointer type-name='markup_text_boxst' name='box'/>
     </class-type>
 
-    <enum-type type-name='burrow_unit_selector_filter_type' comment='bay12: BurrowUnitSelectorFilter'>
+    <enum-type type-name='burrow_unit_selector_filter_type' base-type='uint8_t'> bay12: BurrowUnitSelectorFilter
         <enum-item name='ALL'/>
         <enum-item name='MILITARY'/>
         <enum-item name='CIVILIAN'/>
@@ -826,7 +859,7 @@
         <bool name='scrolling'/>
     </class-type>
 
-    <class-type type-name='creature_interfacest' inherits-from='widget_container'>
+    <class-type type-name='creatures_interfacest' inherits-from='widget_container'>
         <enum name='current_mode' type-name='unit_list_mode_type'/>
         <compound type-name='markup_text_boxst' name='activity_details_text'/>
     </class-type>
@@ -834,7 +867,7 @@
     <class-type type-name='labor_work_details_interfacest' inherits-from='widget_container'/>
 
     <struct-type type-name='labor_kitchen_interface_food_key'>
-        <int16_t name='type'/>
+        <enum name='type' type-name='item_type'/>
         <int16_t name='subtype'/>
         <int16_t name='mat'/>
         <int32_t name='matg'/>
@@ -846,14 +879,14 @@
         <stl-string name='name'/>
     </struct-type>
 
-    <struct-type type-name='labor_kitchen_food_entry'>
+    <struct-type type-name='labor_kitchen_interface_food_entry'>
         <compound type-name='labor_kitchen_interface_food_key' name='first'/>
         <compound type-name='labor_kitchen_interface_food_value' name='second'/>
     </struct-type>
 
     <struct-type type-name='labor_kitchen_interface_food_sort_entry' inherits-from='sort_entry'/>
 
-    <enum-type type-name='labor_kitchen_interface_type_filter' base-type='int8_t'>
+    <enum-type type-name='labor_kitchen_interface_type_filter' base-type='int8_t'> bay12: labor_kitchen_interface_type_filter
         <enum-item name='ALL' value='-1'/>
         <enum-item name='PLANTS'/>
         <enum-item name='SEEDS'/>
@@ -880,6 +913,7 @@
         <enum type-name='standing_orders_category_type' name='current_category'/>
         <stl-vector pointer-type='unit' name='unit'/>
         <stl-vector type-name='int32_t' name='labor_list'/>
+        <int32_t name='scroll_position_labor_list'/>
         <bool name='scrolling_labor_list'/>
         <int32_t name='scroll_position_units'/>
         <bool name='scrolling_units'/>
@@ -904,7 +938,7 @@
         <stl-shared-ptr type-name='labor_stone_use_interfacest' name='stone_use'/>
     </class-type>
 
-    <bitfield-type type-name='justice_screen_interrogation_list_flag' base-type='int32_t'>
+    <bitfield-type type-name='justice_screen_interrogation_list_flag' base-type='uint32_t'> bay12: JUSTICE_SCREEN_INTERROGATION_LIST_FLAG_*
         <flag-bit name='SCHEDULED_FOR_INTERVIEW'/>
         <flag-bit name='ALREADY_INTERVIEWED'/>
     </bitfield-type>
@@ -927,17 +961,17 @@
         <pointer type-name='unit' name='selected_convict'/>
 
         <stl-vector pointer-type='crime' name='convict_crime'/>
-        <pointer name='convict_lawaction' comment='lawactionst'/>
+        <pointer name='convict_lawaction' type-name='punishment'/>
 
         <bool name='convicting'/>
 
         <bool name='interrogating'/>
         <stl-vector type-name='uint32_t' name='interrogation_list_flag'/>
 
-        <stl-vector pointer-type='stl-string' name='interrogation_report_box'/>
+        <compound name='interrogation_report_box' type-name='curses_text_boxst'/>
         <int32_t name='interrogation_report_box_width'/>
-        <stl-vector name='interrogation_report' comment='interrogation_reportst'/>
-        <pointer name='viewing_interrogation_report' comment='interrogation_reportst'/>
+        <stl-vector name='interrogation_report' type-name='interrogation_report'/>
+        <pointer name='viewing_interrogation_report' type-name='interrogation_report'/>
         <int32_t name='scroll_position_interrogation_list'/>
         <bool name='scrolling_interrogation_list'/>
         <int32_t name='scroll_position_interrogation_report'/>
@@ -951,7 +985,7 @@
         <int32_t name='counterintelligence_selected'/>
         <stl-string name='counterintelligence_filter_str'/>
         <bool name='entering_counterintelligence_filter'/>
-        <pointer name='selected_counterintelligence_oen' comment='organization_entry_nodest'/>
+        <pointer name='selected_counterintelligence_oen' type-name='organization_entry_nodest'/>
         <int32_t name='scroll_position_counterintelligence'/>
         <bool name='scrolling_counterintelligence'/>
 
@@ -975,15 +1009,15 @@
 
         <enum name='current_mode' type-name='info_interface_mode_type'/>
 
-        <compound name='creatures' type-name='creature_interfacest'/>
+        <compound name='creatures' type-name='creatures_interfacest'/>
 
-        <compound name='jobs'>
+        <compound name='jobs'> bay12: jobs_interfacest
             <stl-vector pointer-type='cri_unitst' name='cri_job'/>
             <bool name='scrolling_cri_job'/>
             <int32_t name='scroll_position_cri_job'/>
         </compound>
 
-        <compound name='buildings'>
+        <compound name='buildings'> bay12: buildings_interfacest
             <enum name='mode' type-name='buildings_mode_type'/>
             <static-array count='5' index-enum='buildings_mode_type' name='list'><stl-vector pointer-type='building'/></static-array>
             <static-array count='5' index-enum='buildings_mode_type' name='scrolling_position' type-name='int32_t'/>
@@ -992,11 +1026,11 @@
 
         <compound type-name='labor_interfacest' name='labor'/>
 
-        <compound name='work_orders'>
+        <compound name='work_orders'> bay12: work_orders_interfacest
             <int32_t name='scroll_position_work_orders'/>
             <bool name='scrolling_work_orders'/>
 
-            <compound name='conditions'>
+            <compound name='conditions'> bay12: work_orders_conditions_interfacest
                 <bool name='open'/>
 
                 <pointer type-name='manager_order' name='wq'/>
@@ -1006,24 +1040,24 @@
                 <int32_t name='scroll_position_conditions'/>
                 <bool name='scrolling_conditions'/>
 
-                <stl-vector name='suggested_item_condition' comment='workquota_item_conditionst'/>
+                <stl-vector name='suggested_item_condition' type-name='manager_order_condition_item'/>
                 <int32_t name='scroll_position_suggested'/>
                 <bool name='scrolling_suggested'/>
 
                 <stl-string name='filter'/>
                 <stl-vector pointer-type='stl-string' name='compare_master'/>
                 <int32_t name='change_type'/>
-                <pointer name='change_wqc' comment='workquota_item_conditions'/>
+                <pointer name='change_wqc' type-name='manager_order_condition_item'/>
                 <int32_t name='scroll_position_change'/>
                 <int8_t name='scrolling_change'/>
 
-                <stl-vector type-name='int16_t' name='item_type_master'/>
+                <stl-vector type-name='item_type' name='item_type_master'/>
                 <stl-vector type-name='int16_t' name='item_subtype_master'/>
                 <stl-bit-vector name='item_type_on'/>
 
                 <stl-vector type-name='int16_t' name='item_material_master'/>
                 <stl-vector type-name='int32_t' name='item_matgloss_master'/>
-                <stl-vector type-name='int16_t' name='item_matstate_master'/>
+                <stl-vector type-name='matter_state' name='item_matstate_master'/>
                 <stl-bit-vector name='item_material_on'/>
 
                 <stl-vector pointer-type='wqc_item_traitst' name='item_trait_master'/>
@@ -1035,7 +1069,7 @@
 
                 <bool name='entering_logic_number'/>
                 <stl-string name='logic_number_str'/>
-                <pointer name='entering_logic_wqc' comment='workquota_item_conditionst'/>
+                <pointer name='entering_logic_wqc' type-name='manager_order_condition_item'/>
             </compound>
 
             <bool name='entering_number'/>
@@ -1047,33 +1081,63 @@
             <pointer type-name='manager_order' name='b_entering_wq'/>
         </compound>
 
-        <compound name='administrators'>
+        <compound name='administrators'> bay12: administrators_interfacest
             <stl-vector name='noblelist'>
-                <pointer>
+                <pointer> bay12: noblelistst
                     <pointer type-name='unit' name='un'/>
                     <pointer type-name='nemesis_record' name='nem'/>
-                    <pointer comment='unitpropertyplacementst' name='upplist'/>
+                    <pointer name='upplist'> bay12: unitpropertyplacementst
+                        <compound name='floor' type-name='coord'/>
+                        <compound name='box' type-name='coord'/>
+                        <int16_t name='maxfreebox'/>
+
+                        <compound name='cab' type-name='coord'/>
+                        <int16_t name='maxfreecab'/>
+
+                        <compound name='rack' type-name='coord'/>
+                        <int16_t name='maxfreerack'/>
+
+                        <int8_t name='freestand_armor'/>
+                        <int8_t name='freestand_helm'/>
+                        <int8_t name='freestand_shoes'/>
+                        <int8_t name='freestand_gloves'/>
+                        <int8_t name='freestand_pants'/>
+                        <int8_t name='freestand_shield'/>
+                        <compound name='stand_armor' type-name='coord'/>
+                        <compound name='stand_helm' type-name='coord'/>
+                        <compound name='stand_shoes' type-name='coord'/>
+                        <compound name='stand_gloves' type-name='coord'/>
+                        <compound name='stand_pants' type-name='coord'/>
+                        <compound name='stand_shield' type-name='coord'/>
+
+                        <int32_t name='flooritems'/>
+
+                        <int32_t name='boxcount'/>
+                        <int32_t name='cabcount'/>
+                        <int32_t name='rackcount'/>
+                        <int32_t name='standcount'/>
+                    </pointer>
                     <pointer type-name='entity_position' name='ep'/>
                     <pointer type-name='entity_position_assignment' name='epp'/>
-                    <int32_t name='enid'/>
+                    <int32_t name='enid' ref-target='historical_entity'/>
                     <int32_t name='value'/>
                 </pointer>
             </stl-vector>
             <stl-vector pointer-type='entity_position_assignment' name='spec_prof'/>
-            <stl-vector type-name='int32_t' name='spec_hfid'/>
-            <stl-vector type-name='int32_t' name='spec_enid'/>
+            <stl-vector type-name='int32_t' name='spec_hfid' ref-target='historical_figure'/>
+            <stl-vector type-name='int32_t' name='spec_enid' ref-target='historical_entity'/>
             <int32_t name='scroll_position_noblelist'/>
             <bool name='scrolling_noblelist'/>
 
-            <stl-vector pointer-type='stl-string' name='desc_hover_text'/>
+            <compound name='desc_hover_text' type-name='curses_text_boxst'/>
             <int32_t name='last_hover_width'/>
-            <int32_t name='last_hover_entity_id'/>
+            <int32_t name='last_hover_entity_id' ref-target='historical_entity'/>
             <int32_t name='last_hover_ep_id'/>
 
             <bool name='choosing_candidate'/>
             <int32_t name='candidate_noblelist_ind'/>
             <stl-vector name='candidate'>
-                <pointer>
+                <pointer> bay12: appointment_candidatest
                     <pointer type-name='unit' name='un'/>
                     <int32_t name='value'/>
                 </pointer>
@@ -1092,7 +1156,7 @@
             <int32_t name='handling_symbol_closure_ind'/>
         </compound>
 
-        <compound name='artifacts'>
+        <compound name='artifacts'> bay12: artifacts_interfacest
             <enum name='mode' type-name='artifacts_mode_type'/>
 
             <static-array count='4' index-enum='artifacts_mode_type' name='list'><stl-vector pointer-type='artifact_record'/></static-array>
@@ -1107,8 +1171,8 @@
         <compound type-name='widget_stack' name='stack'/>
     </struct-type>
 
-    <struct-type type-name='main_interface'>
-        <compound name='designation' since='v0.40.20'>
+    <struct-type type-name='main_interface' original-name='main_interfacest'>
+        <compound name='designation' since='v0.40.20'> bay12: designation_interfacest
             <bool name='marker_only'/>
             <bool name='show_priorities' comment='set to one if using +/-'/>
             <int32_t name='priority' init-value='4000' comment='*1000'/>
@@ -1128,7 +1192,7 @@
             <bool name='sliding_traffic_restricted'/>
         </compound>
 
-        <compound name='building'>
+        <compound name='building'> bay12: building_interfacest
             <stl-vector name='button' pointer-type='interface_button'/>
             <stl-vector name='press_button' pointer-type='interface_button'/>
             <stl-vector name='filtered_button' pointer-type='interface_button'/>
@@ -1141,10 +1205,10 @@
             <bitfield name='job_item_flag' type-name='job_material_category'/>
 
             <stl-string name='current_custom_category_token' since='v0.42.01'/>
-            <stl-vector name='current_tool_tip' pointer-type='stl-string' since='v0.42.01'/>
+            <compound name='current_tool_tip' type-name='curses_text_boxst'/>
         </compound>
 
-        <compound name='construction'>
+        <compound name='construction'> bay12: construction_interfacest
             <stl-vector name='button' pointer-type='interface_button'/>
             <stl-vector name='press_button' pointer-type='interface_button'/>
 
@@ -1164,7 +1228,7 @@
             <int32_t name='scroll_position_item'/>
         </compound>
 
-        <compound name='civzone'>
+        <compound name='civzone'> bay12: civzone_interfacest
             <bool name='remove'/>
             <enum name='flow_shape' type-name='room_flow_shape_type'/>
             <bool name='doing_rectangle'/>
@@ -1172,16 +1236,16 @@
             <bool name='last_doing_multizone'/>
             <bool name='box_on_left'/>
             <bool name='erasing'/>
-            <int32_t name='adding_new_type'/>
+            <enum name='adding_new_type' type-name='civzone_type'/>
             <pointer name='cur_bld' type-name='building_civzonest'/>
             <stl-vector name='list' pointer-type='building_civzonest'/>
             <stl-vector name='zone_just_created' pointer-type='building_civzonest'/>
             <int32_t name='furniture_rejected_in_use'/>
             <int32_t name='furniture_rejected_not_enclosed'/>
-            <int8_t name='repainting'/>
+            <bool name='repainting'/>
         </compound>
 
-        <compound name='burrow'>
+        <compound name='burrow'> bay12: burrow_interfacest
             <pointer name='painting_burrow' type-name='burrow'/>
             <bool name='doing_rectangle'/>
             <bool name='erasing'/>
@@ -1191,10 +1255,10 @@
             <int32_t name='entering_name_index'/>
         </compound>
 
-        <compound name='view'>
+        <compound name='view'> bay12: viewunit_interfacest
             <stl-vector name='inv' pointer-type='unit_inventory_item'/>
-            <stl-vector name='contam' pointer-type='spatter'/>
-            <stl-vector name='guest_text' since='v0.42.01'/>
+            <stl-vector name='contam' pointer-type='unit_spatter'/>
+            <compound name='guest_text' type-name='curses_text_boxst' since='v0.42.01'/>
 
             <bool name='uniform_selection' since='v0.34.08'/>
             <int32_t name='selected_uniform' since='v0.34.08'/>
@@ -1221,7 +1285,7 @@
             <enum name='expel_cannot_expel_reason' type-name='cannot_expel_reason_type' since='v0.44.11'/>
         </compound>
 
-        <compound name='hospital' since='v0.44.11'>
+        <compound name='hospital' since='v0.44.11'> bay12: hospital_interfacest
             <int32_t name='cur_scroll'/>
             <int32_t name='bed_count'/>
             <int32_t name='table_count'/>
@@ -1229,7 +1293,7 @@
             <int32_t name='box_count'/>
         </compound>
 
-        <compound name='location_list'>
+        <compound name='location_list'> bay12: location_list_interfacest
             <stl-vector name='valid_ab' pointer-type='abstract_building' since='v0.42.01'/>
             <int32_t name='selected_ab' since='v0.42.01'/>
 
@@ -1243,7 +1307,7 @@
             <int32_t name='selected_craft_guild'/>
         </compound>
 
-        <compound name='job_details' since='v0.42.06'>
+        <compound name='job_details' since='v0.42.06'> bay12: job_details_interfacest
             <bool name='open'/>
             <enum name='context' type-name='job_details_context_type'/>
             <pointer name='jb' type-name='job'/>
@@ -1281,17 +1345,17 @@
             <bool name='scrolling_improvement'/>
         </compound>
 
-        <compound name='buildjob'>
+        <compound name='buildjob'> bay12: buildjob_interfacest
             <pointer name='display_furniture_bld' type-name='building_display_furniturest' since='v0.44.01'/>
             <int32_t name='display_furniture_selected_item' since='v0.44.01'/>
         </compound>
 
-        <compound name='assign_trade'>
+        <compound name='assign_trade'> bay12: assign_trade_interfacest
             <bool name='open'/>
             <pointer type-name='building_tradedepotst' name='trade_depot_bld'/>
             <stl-vector type-name='int16_t' name='type_list'/>
             <stl-vector type-name='int16_t' name='filtered_type_list'/>
-            <enum type-name='item_type' base-type='int16_t' name='current_type'/>
+            <enum type-name='item_type' name='current_type'/>
             <int32_t name='scroll_position_type'/>
             <int32_t name='scroll_position_item'/>
             <bool name='scrolling_type'/>
@@ -1300,34 +1364,11 @@
             <bool name='entering_item_filter'/>
             <stl-vector type-name='int32_t' name='storeamount'/>
             <stl-vector type-name='int32_t' name='badamount'/>
-
-<!--
-        assign_trade_itemlistst master_i_list;
-        abstractitemlistst master_a_list;
--->
-
-            <stl-vector name='unk_a8'>
-                <pointer>
-                    <compound>
-                        <pointer name='item' type-name='item'/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                        <int32_t/>
-                    </compound>
-                </pointer>
-            </stl-vector>
-            <stl-vector name='unk_c0' type-name='int16_t'/>
-            <stl-vector name='unk_d8' type-name='int16_t'/>
-            <stl-vector name='unk_f0' type-name='int16_t'/>
-            <stl-vector name='unk_108' type-name='int16_t'/>
-            <stl-vector name='unk_120' type-name='int32_t'/>
-            <stl-bit-vector name='unk_138'/>
+            <compound name='master_i_list' type-name='assign_trade_itemlistst'/>
+            <compound name='master_a_list' type-name='abstractitemlistst'/>
 
             <int32_t name='i_height'/>
-            <stl-vector name='current_type_tgi'/>
+            <stl-vector name='current_type_tgi' pointer-type='tradegoodslistst'/>
             <stl-vector type-name='int32_t' name='current_type_a_subtype'/>
             <stl-vector type-name='int32_t' name='current_type_a_subcat1'/>
             <stl-vector type-name='int32_t' name='current_type_a_subcat2'/>
@@ -1340,7 +1381,7 @@
             <bool name='exclude_prohib'/>
         </compound>
 
-        <compound name='trade'>
+        <compound name='trade'> bay12: trade_interfacest
             <bool name='open'/>
 
             <bool name='choosing_merchant'/>
@@ -1394,22 +1435,24 @@
             <int8_t name='entering_amount'/>
             <stl-string name='amount_str'/>
 
-            <stl-vector pointer-type='stl-string' name='big_announce'/>
+            <compound name='big_announce' type-name='curses_text_boxst'/>
             <int32_t name='scroll_position_big_announce'/>
             <bool name='scrolling_big_announce'/>
         </compound>
 
-        <compound name='diplomacy'>
+        <compound name='diplomacy'> bay12: diplomacy_interfacest
             <bool name='open'/>
 
             <pointer type-name='dipscript_popup' name='mm'/>
             <pointer type-name='unit' name='actor'/>
             <pointer type-name='unit' name='target'/>
 
-            <int32_t name='actor_unid'/>
-            <int32_t name='target_unid'/>
+            <int32_t name='actor_unid' ref-target='unit'/>
+            <int32_t name='target_unid' ref-target='unit'/>
 
-            <uint32_t name='flag'/>
+            <bitfield name='flag' base-type='uint32_t'> bay12: DIPLOMACY_INTERFACE_FLAG_*
+                <flag-bit name='in_the_middle_of_stuff'/>
+            </bitfield>
 
             <compound type-name='markup_text_boxst' name='text'/>
             <bool name='selecting_land_holder_position'/>
@@ -1441,22 +1484,22 @@
             <compound type-name='script_environmentst' name='environment'/>
         </compound>
 
-        <compound name='petitions'>
+        <compound name='petitions'> bay12: petitions_interfacest
             <bool name='open'/>
             <bool name='have_responsible_person'/>
 
-            <stl-vector name='agreement_id' type-name='int32_t'/>
+            <stl-vector name='agreement_id' type-name='int32_t' ref-target='agreement'/>
             <int32_t name='selected_agreement_id'/>
             <int32_t name='scroll_position'/>
             <bool name='scrolling'/>
         </compound>
 
-        <compound name='stocks'>
+        <compound name='stocks'> bay12: stocks_interfacest
             <bool name='open'/>
 
             <stl-vector type-name='int16_t' name='type_list'/>
             <stl-vector type-name='int16_t' name='filtered_type_list'/>
-            <enum type-name='item_type' base-type='int16_t' name='current_type'/>
+            <enum type-name='item_type' name='current_type'/>
 
             <int32_t name='scroll_position_type'/>
             <int32_t name='scroll_position_item'/>
@@ -1467,19 +1510,8 @@
 
             <stl-vector type-name='int32_t' name='storeamount'/>
             <stl-vector type-name='int32_t' name='badamount'/>
-
-<!--
-    itemlistst master_i_list;
-    abstractitemlistst master_a_list;
--->
-
-            <stl-vector/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int32_t'/>
-            <stl-bit-vector/>
+            <compound name='master_i_list' type-name='itemlistst'/>
+            <compound name='master_a_list' type-name='abstractitemlistst'/>
 
             <int32_t name='i_height'/>
             <stl-vector pointer-type='item' name='current_type_i_list'/>
@@ -1495,7 +1527,7 @@
 
         <compound type-name='announcements_interfacest' name='announcements'/>
 
-        <compound name='assign_display_item'>
+        <compound name='assign_display_item'> bay12: assign_display_item_interfacest
             <bool name='open'/>
 
             <pointer type-name='building_display_furniturest' name='display_bld'/>
@@ -1503,7 +1535,7 @@
 
             <stl-vector type-name='int16_t' name='type_list'/>
             <stl-vector type-name='int16_t' name='filtered_type_list'/>
-            <enum type-name='item_type' base-type='int16_t' name='current_type'/>
+            <enum type-name='item_type' name='current_type'/>
 
             <int32_t name='scroll_position_type'/>
             <int32_t name='scroll_position_item'/>
@@ -1514,19 +1546,8 @@
 
             <stl-vector type-name='int32_t' name='storeamount'/>
             <stl-vector type-name='int32_t' name='badamount'/>
-
-<!--
-    itemlistst master_i_list;
-    abstractitemlistst master_a_list;
--->
-
-            <stl-vector/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int16_t'/>
-            <stl-vector type-name='int32_t'/>
-            <stl-bit-vector/>
+            <compound name='master_i_list' type-name='itemlistst'/>
+            <compound name='master_a_list' type-name='abstractitemlistst'/>
 
             <int32_t name='i_height'/>
             <stl-vector pointer-type='item' name='current_type_i_list'/>
@@ -1539,7 +1560,7 @@
             <stl-bit-vector name='current_type_a_on'/>
         </compound>
 
-        <compound name='name_creator'>
+        <compound name='name_creator'> bay12: name_creator_interfacest
             <bool name='open'/>
             <enum name='context' type-name='name_creator_context_type'/>
             <pointer type-name='historical_entity' name='namer'/>
@@ -1549,7 +1570,7 @@
             <int32_t name='cur_word_place'/>
             <compound type-name='language_word_table' name='word_sel'/>
             <stl-vector type-name='int32_t' name='word_index'/>
-            <stl-vector type-name='int32_t' name='word_index_asp'/>
+            <stl-vector type-name='part_of_speech' name='word_index_asp'/>
             <int32_t name='scroll_position_word'/>
             <bool name='scrolling_word'/>
             <bool name='entering_first_name'/>
@@ -1559,7 +1580,7 @@
             <pointer type-name='unit' name='named_unit'/>
         </compound>
 
-        <compound name='image_creator'>
+        <compound name='image_creator'> bay12: image_creator_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='image_creator_context_type'/>
@@ -1609,12 +1630,12 @@
             <int32_t name='new_image_active_property_actor_ind'/>
             <int32_t name='new_image_active_property_target_ind'/>
 
-            <stl-vector pointer-type='stl-string' name='art_box'/>
+            <compound name='art_box' type-name='curses_text_boxst'/>
             <bool name='scrolling_art_box'/>
             <int32_t name='scroll_position_art_box'/>
             <int32_t name='last_art_box_width'/>
 
-            <stl-vector pointer-type='stl-string' name='selected_box'/>
+            <compound name='selected_box' type-name='curses_text_boxst'/>
             <int32_t name='last_selected_box_width'/>
             <int32_t name='last_selected_index'/>
 
@@ -1622,48 +1643,54 @@
             <bool name='image_back_out_warn'/>
             <bool name='must_do_image_back_out_warn'/>
 
-            <compound name='ics'>
+            <compound name='ics'> bay12: image_creation_specifierst
                 <pointer type-name='job' name='jb'/>
                 <pointer type-name='manager_order' name='wq'/>
-                <pointer name='location_detail'/>
+                <pointer type-name='location_detailst' name='location_detail'/>
                 <pointer type-name='historical_entity' name='image_ent'/>
                 <pointer type-name='art_image' name='art_image'/>
-                <pointer name='adv_art_specifier'/>
+                <pointer type-name='adv_art_specifierst' name='adv_art_specifier'/>
                 <pointer type-name='historical_figure' name='hf'/>
-                <pointer type-name='uint32_t' name='exit_flag'/>
-                <uint32_t name='flag'/>
+                <pointer name='exit_flag'>
+                    <bitfield base-type='uint32_t'> bay12: ICS_EXIT_FLAG_*
+                        <flag-bit name='did_not_specify'/>
+                    </bitfield>
+                </pointer>
+                <bitfield name='flag' base-type='uint32_t'> bay12: ICS_FLAG_*
+                    <flag-bit name='do_back_out_warning'/>
+                </bitfield>
             </compound>
         </compound>
 
         <compound type-name='unit_selector_interfacest' name='unit_selector'/>
 
-        <compound name='announcement_alert'>
+        <compound name='announcement_alert'> bay12: announcement_alert_interfacest
             <bool name='open'/>
 
-            <pointer type-name='report' name='viewing_alert'/>
+            <pointer type-name='announcement_alertst' name='viewing_alert'/>
             <bool name='viewing_alert_button'/>
             <stl-bit-vector name='zoom_line_is_start'/>
             <stl-vector pointer-type='report' name='zoom_line_ann'/>
             <stl-vector pointer-type='unit' name='zoom_line_unit'/>
-            <stl-vector type-name='int16_t' name='zoom_line_unit_uac'/>
-            <stl-vector pointer-type='stl-string' name='alert_text'/>
+            <stl-vector type-name='unit_report_type' name='zoom_line_unit_uac'/>
+            <compound name='alert_text' type-name='curses_text_boxst'/>
             <int32_t name='alert_width'/>
             <int32_t name='alert_list_size'/>
             <int32_t name='scroll_position_alert'/>
             <bool name='scrolling_alert'/>
 
             <pointer type-name='unit' name='viewing_unit'/>
-            <int16_t name='viewing_unit_uac'/>
+            <enum name='viewing_unit_uac' type-name='unit_report_type'/>
             <stl-bit-vector name='uac_zoom_line_is_start'/>
             <stl-vector pointer-type='report' name='uac_zoom_line_ann'/>
-            <stl-vector pointer-type='stl-string' name='uac_text'/>
+            <compound name='uac_text' type-name='curses_text_boxst'/>
             <int32_t name='uac_width'/>
             <int32_t name='uac_list_size'/>
             <int32_t name='scroll_position_uac'/>
             <bool name='scrolling_uac'/>
         </compound>
 
-        <compound name='custom_symbol'>
+        <compound name='custom_symbol'> bay12: custom_symbol_interfacest
             <bool name='open'/>
             <enum name='context' type-name='custom_symbol_context_type'/>
             <int32_t name='burrow_id'/>
@@ -1677,7 +1704,7 @@
             <static-array count='36' name='swatch_b'><static-array type-name='uint8_t' count='10'/></static-array>
         </compound>
 
-        <compound name='patrol_routes'>
+        <compound name='patrol_routes'> bay12: patrol_routes_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='patrol_routes_context_type'/>
@@ -1694,7 +1721,7 @@
             <bool name='changed_points_on_edit'/>
         </compound>
 
-        <compound name='squad_equipment'>
+        <compound name='squad_equipment'> bay12: squad_equipment_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='squad_equipment_context_type'/>
@@ -1717,11 +1744,11 @@
             <int32_t name='scroll_position_cssub'/>
             <bool name='scrolling_cssub'/>
 
-            <stl-vector type-name='int16_t' name='cs_cat' comment='EntityUniformItemCategory'/>
+            <stl-vector type-name='uniform_category' name='cs_cat'/>
             <stl-vector type-name='int32_t' name='cs_it_spec_item_id'/>
             <stl-vector type-name='int16_t' name='cs_it_type'/>
             <stl-vector type-name='int16_t' name='cs_it_subtype'/>
-            <stl-vector type-name='int16_t' name='cs_civ_mat' comment='EntityMaterial'/>
+            <stl-vector type-name='entity_material_category' name='cs_civ_mat'/>
             <stl-vector type-name='int16_t' name='cs_spec_mat'/>
             <stl-vector type-name='int32_t' name='cs_spec_matg'/>
             <stl-vector type-name='int32_t' name='cs_color_pattern_index' comment='ColoredPattern'/>
@@ -1730,14 +1757,14 @@
             <stl-vector type-name='int32_t' name='cs_assigned_item_id'/>
             <uint32_t name='cs_uniform_flag'/>
 
-            <int16_t name='cs_adding_new_entry_category' comment='EntityUniformItemCategory'/>
+            <enum name='cs_adding_new_entry_category' type-name='uniform_category'/>
             <stl-vector type-name='int16_t' name='cs_add_list_type'/>
             <stl-vector type-name='int16_t' name='cs_add_list_subtype'/>
             <stl-vector type-name='uint32_t' name='cs_add_list_flag'/>
             <stl-bit-vector name='cs_add_list_is_foreign'/>
             <bool name='cs_setting_material'/>
             <int32_t name='cs_setting_list_ind'/>
-            <stl-vector type-name='int16_t' name='cs_setting_material_ent' comment='EntityMaterial'/>
+            <stl-vector type-name='entity_material_category' name='cs_setting_material_ent'/>
             <stl-vector type-name='int16_t' name='cs_setting_material_mat'/>
             <stl-vector type-name='int32_t' name='cs_setting_material_matg'/>
             <bool name='cs_setting_color_pattern'/>
@@ -1747,7 +1774,7 @@
             <stl-vector type-name='int32_t' name='cs_add_spec_id'/>
         </compound>
 
-        <compound name='squad_schedule'>
+        <compound name='squad_schedule'> bay12: squad_schedule_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='squad_schedule_context_type'/>
@@ -1778,31 +1805,31 @@
             <int32_t name='copying_squad_month'/>
         </compound>
 
-        <compound name='squad_selector'>
+        <compound name='squad_selector'> bay12: squad_selector_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='squad_selector_context_type'/>
 
-            <stl-vector type-name='int32_t' name='squad_id'/>
-            <int32_t name='bld_id'/>
+            <stl-vector type-name='int32_t' name='squad_id' ref-target='squad'/>
+            <int32_t name='bld_id' ref-target='building'/>
 
             <int32_t name='scroll_position'/>
             <int8_t name='scrolling'/>
         </compound>
 
-        <compound name='burrow_selector'>
+        <compound name='burrow_selector'> bay12: burrow_selector_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='burrow_selector_context_type'/>
 
-            <stl-vector type-name='int32_t' name='burrow_id'/>
+            <stl-vector type-name='int32_t' name='burrow_id' ref-target='burrow'/>
             <stl-bit-vector name='selected'/>
 
             <int32_t name='scroll_position'/>
             <int8_t name='scrolling'/>
         </compound>
 
-        <compound name='location_selector'>
+        <compound name='location_selector'> bay12: location_selector_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='location_selector_context_type'/>
@@ -1814,7 +1841,7 @@
             <int32_t name='current_hover_index'/>
 
             <bool name='choosing_temple_religious_practice'/>
-            <stl-vector type-name='int32_t' name='valid_religious_practice'/>
+            <stl-vector type-name='religious_practice_type' name='valid_religious_practice'/>
             <int32_t name='scroll_position_deity'/>
             <bool name='scrolling_deity'/>
 
@@ -1825,7 +1852,7 @@
             <bool name='scrolling_guild'/>
         </compound>
 
-        <compound name='location_details'>
+        <compound name='location_details'> bay12: location_details_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='location_details_context_type'/>
@@ -1846,7 +1873,7 @@
             <pointer type-name='int32_t' name='entering_desired_number'/>
         </compound>
 
-        <compound name='hauling_stop_conditions'>
+        <compound name='hauling_stop_conditions'> bay12: hauling_stop_conditions_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='hauling_stop_conditions_context_type'/>
@@ -1858,7 +1885,7 @@
             <bool name='scrolling'/>
         </compound>
 
-        <compound name='assign_vehicle'>
+        <compound name='assign_vehicle'> bay12: assign_vehicle_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='assign_vehicle_context_type'/>
@@ -1871,7 +1898,7 @@
             <bool name='scrolling'/>
         </compound>
 
-        <compound name='stockpile'>
+        <compound name='stockpile'> bay12: stockpile_interfacest
             <bool name='doing_rectangle'/>
             <bool name='box_on_left'/>
             <bool name='erasing'/>
@@ -1879,12 +1906,12 @@
             <pointer type-name='building_stockpilest' name='cur_bld'/>
         </compound>
 
-        <compound name='stockpile_link'>
+        <compound name='stockpile_link'> bay12: stockpile_link_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='stockpile_link_context_type'/>
 
-            <int32_t name='bld_id'/>
+            <int32_t name='bld_id' ref-target='building'/>
             <int32_t name='hr_id'/>
             <int32_t name='hs_id'/>
 
@@ -1895,19 +1922,19 @@
             <int32_t name='adding_new_link_type'/>
         </compound>
 
-        <compound name='stockpile_tools'>
+        <compound name='stockpile_tools'> bay12: stockpile_tools_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='stockpile_tools_context_type'/>
 
-            <int32_t name='bld_id'/>
+            <int32_t name='bld_id' ref-target='building'/>
             <bool name='entering_barrels'/>
             <bool name='entering_bins'/>
             <bool name='entering_wheelbarrows'/>
             <stl-string name='number_str'/>
         </compound>
 
-        <compound name='custom_stockpile'>
+        <compound name='custom_stockpile'> bay12: custom_stockpile_interfacest
             <bool name='open'/>
 
             <int32_t name='scroll_position_main'/>
@@ -1934,7 +1961,7 @@
             <stl-vector pointer-type='int8_t' name='sub_mode_ptr'/>
 
             <stl-vector name='spec_item'>
-                <pointer>
+                <pointer> bay12: custom_stockpile_itemst
                     <stl-string name='name'/>
                     <stl-string name='simple_name'/>
                     <pointer type-name='int8_t' name='set_pointer'/>
@@ -1951,7 +1978,7 @@
             <int32_t name='counted_cur_spec_item_sz'/>
         </compound>
 
-        <compound name='view_sheets'>
+        <compound name='view_sheets'> bay12: view_sheets_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='view_sheets_context_type'/>
@@ -2002,7 +2029,7 @@
             <int32_t name='unmet_need_num'/>
 
             <stl-vector pointer-type='stl-string' name='raw_thought_str'/>
-            <stl-vector type-name='pointer' name='thought_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='thought_box'/>
             <int32_t name='thought_box_width'/>
 
             <int32_t name='scroll_position_inventory'/>
@@ -2015,8 +2042,8 @@
             <stl-vector type-name='int16_t' name='relation_f'/>
             <stl-vector type-name='int32_t' name='rel_unid'/>
             <stl-vector pointer-type='historical_figure' name='rel_hf'/>
-            <stl-vector name='rel_rphv' comment='relationship_profile_hf_visualst'/>
-            <stl-vector name='rel_rphh' comment='relationship_profile_hf_historicalst'/>
+            <stl-vector name='rel_rphv' pointer-type='relationship_profile_hf_visualst'/>
+            <stl-vector name='rel_rphh' pointer-type='relationship_profile_hf_historicalst'/>
             <stl-vector type-name='int32_t' name='rel_value'/>
 
             <bool name='unit_overview_customizing'/>
@@ -2032,7 +2059,7 @@
             <int32_t name='scroll_position_unit_overview_expel'/>
             <bool name='scrolling_unit_overview_expel'/>
 
-            <stl-vector pointer-type='stl-string' name='guest_text'/>
+            <compound name='guest_text' type-name='curses_text_boxst'/>
 
             <int32_t name='scroll_position_groups'/>
             <bool name='scrolling_groups'/>
@@ -2048,14 +2075,14 @@
             <bool name='scrolling_thoughts'/>
             <int32_t name='thoughts_active_tab'/>
             <stl-vector pointer-type='stl-string' name='thoughts_raw_memory_str'/>
-            <stl-vector type-name='pointer' name='thoughts_memory_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='thoughts_memory_box'/>
             <int32_t name='thoughts_memory_box_width'/>
 
             <int32_t name='scroll_position_personality'/>
             <bool name='scrolling_personality'/>
             <int32_t name='personality_active_tab'/>
             <stl-vector pointer-type='stl-string' name='personality_raw_str'/>
-            <stl-vector type-name='pointer' name='personality_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='personality_box'/>
             <int32_t name='personality_width'/>
 
             <int32_t name='unit_labor_active_tab'/>
@@ -2077,11 +2104,11 @@
             <stl-vector type-name='int32_t' name='unit_knowledge_id'/>
             <stl-vector type-name='uint32_t' name='unit_knowledge_bits'/>
             <stl-vector pointer-type='stl-string' name='skill_description_raw_str'/>
-            <stl-vector type-name='pointer' name='skill_description_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='skill_description_box'/>
             <int32_t name='skill_description_width'/>
 
             <int32_t name='scroll_position_unit_room'/>
-            <int8_t name='scrolling_unit_room'/>
+            <bool name='scrolling_unit_room'/>
             <stl-vector type-name='int32_t' name='unit_room_civzone_id'/>
             <stl-vector type-name='int32_t' name='unit_room_curval'/>
 
@@ -2092,18 +2119,18 @@
             <int32_t name='scroll_position_unit_military_kills'/>
             <bool name='scrolling_unit_military_kills'/>
             <stl-vector pointer-type='stl-string' name='kill_description_raw_str'/>
-            <stl-vector type-name='pointer' name='kill_description_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='kill_description_box'/>
             <int32_t name='kill_description_width'/>
 
             <int32_t name='unit_health_active_tab'/>
             <int32_t name='scroll_position_unit_health'/>
             <bool name='scrolling_unit_health'/>
             <stl-vector pointer-type='stl-string' name='unit_health_raw_str'/>
-            <stl-vector type-name='pointer' name='unit_health_box' comment='color_text_boxst'/>
+            <stl-vector pointer-type='color_text_boxst' name='unit_health_box'/>
             <int32_t name='unit_health_width'/>
 
             <stl-string name='raw_current_thought'/>
-            <stl-vector pointer-type='stl-string' name='current_thought'/>
+            <compound name='current_thought' type-name='curses_text_boxst'/>
             <int32_t name='current_thought_width'/>
 
             <int32_t name='scroll_position_item'/>
@@ -2139,7 +2166,7 @@
 
             <stl-string name='engraving_title'/>
             <stl-string name='raw_description'/>
-            <stl-vector pointer-type='stl-string' name='description'/>
+            <compound name='description' type-name='curses_text_boxst'/>
             <int32_t name='description_width'/>
             <int32_t name='scroll_position_description'/>
             <bool name='scrolling_description'/>
@@ -2151,7 +2178,7 @@
 
         <compound type-name='info_interfacest' name='info'/>
 
-        <compound name='squads'>
+        <compound name='squads'> bay12: squads_interfacest
             <bool name='open'/>
 
             <int32_t name='scroll_position'/>
@@ -2187,7 +2214,7 @@
             <bool name='entering_cell_nickname'/>
         </compound>
 
-        <compound name='create_squad'>
+        <compound name='create_squad'> bay12: create_squad_interfacest
             <bool name='open'/>
 
             <int32_t name='scroll_position'/>
@@ -2205,13 +2232,13 @@
             <pointer type-name='entity_position' name='new_squad_new_epp_from_ep'/>
         </compound>
 
-        <compound name='squad_supplies'>
+        <compound name='squad_supplies'> bay12: squad_supplies_interfacest
             <bool name='open'/>
 
             <int32_t name='squad_id'/>
         </compound>
 
-        <compound name='assign_uniform'>
+        <compound name='assign_uniform'> bay12: assign_uniform_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='assign_uniform_context_type'/>
@@ -2222,7 +2249,7 @@
             <stl-vector pointer-type='entity_uniform' name='cand_uniform'/>
         </compound>
 
-        <compound name='create_work_order'>
+        <compound name='create_work_order'> bay12: create_work_order_interfacest
             <bool name='open'/>
 
             <int32_t name='forced_bld_id'/>
@@ -2239,7 +2266,7 @@
             <bool name='entering_job_filter'/>
         </compound>
 
-        <compound name='hotkey'>
+        <compound name='hotkey'> bay12: hotkeys_interfacest
             <bool name='open'/>
 
             <int32_t name='scroll_position'/>
@@ -2249,13 +2276,13 @@
             <bool name='entering_name'/>
         </compound>
 
-        <compound name='options'>
+        <compound name='options'> bay12: options_interfacest
             <bool name='open'/>
 
             <enum name='context' type-name='options_context_type'/>
 
             <stl-string name='header'/>
-            <stl-vector pointer-type='stl-string' name='text'/>
+            <compound name='text' type-name='curses_text_boxst'/>
 
             <bool name='fort_retirement_confirm'/>
             <bool name='fort_abandon_confirm'/>
@@ -2284,22 +2311,18 @@
             <bool name='scrolling_popup'/>
 
             <compound type-name='file_compressorst' name='filecomp'/>
-            <compound name='saver' comment='saverst'>
-                <pointer/>
-                <stl-vector type-name='int32_t'/>
-                <stl-vector type-name='int16_t'/>
-                <stl-vector/>
-                <pointer/>
-                <int32_t/>
-                <int32_t/>
-            </compound>
+            <compound name='saver' type-name='saverst'/>
         </compound>
 
-        <compound name='help'>
+        <compound name='help'> bay12: help_interfacest
             <bool name='open'/>
 
-            <uint32_t name='flag'/>
-            <uint32_t name='context_flag'/>
+            <bitfield name='flag' base-type='uint32_t'> bay12: HELP_INTERFACE_FLAG_*
+                <flag-bit name='start_quick_tutorial'/>
+                <flag-bit name='opened_guide'/>
+                <flag-bit name='minimized'/>
+            </bitfield>
+            <uint32_t name='context_flag'/> bay12: HELP_INTERFACE_CONTEXT_FLAG_*, multiple overlapping
 
             <enum name='context' type-name='help_context_type'/>
 
@@ -2310,7 +2333,7 @@
 
         <compound name='settings' type-name='main_interface_settings'/>
 
-        <compound name='arena_unit'>
+        <compound name='arena_unit'> bay12: create_creature_interfacest
             <bool name='open'/>
             <enum name='context' type-name='arena_context_type'/>
             <int16_t name='race'/>
@@ -2324,48 +2347,52 @@
             <stl-vector name='castes_filtered' type-name='int16_t'/>
             <stl-vector name='races_all' type-name='int16_t'/>
             <stl-vector name='castes_all' type-name='int16_t'/>
-            <int32_t/>
-            <int8_t/>
-            <int32_t/>
-            <int8_t/>
-            <stl-vector name='skills'>
-                <enum base-type='int16_t' type-name='job_skill'/>
-            </stl-vector>
+            <int32_t name='scroll_position_creature'/>
+            <bool name='scrolling_creature'/>
+
+            <int32_t name='scroll_position_skill'/>
+            <bool name='scrolling_skill'/>
+            <stl-vector name='skills' type-name='job_skill'/>
             <stl-vector name='skill_levels' type-name='int32_t'
                         index-refers-to='$$._parent.skills[$]'/>
-            <int32_t/>
-            <int8_t/>
-            <int32_t/>
-            <int8_t/>
-            <int32_t/>
-            <int8_t/>
-            <pointer/>
-            <stl-vector type-name='int32_t'/>
-            <pointer/>
-            <stl-vector name='equipment_item_type' type-name='int16_t'/>
+
+            <int32_t name='scroll_position_equipment'/>
+            <bool name='scrolling_equipment'/>
+            <int32_t name='scroll_position_equipment_available_cat'/>
+            <bool name='scrolling_equipment_available_cat'/>
+            <int32_t name='scroll_position_equipment_available'/>
+            <bool name='scrolling_equipment_available'/>
+            <pointer name='etl' type-name='embark_item_choice'/>
+            <stl-vector name='equipment_category' type-name='int32_t'/>
+            <int32_t name='current_category'/>
+            <stl-vector name='equipment_item_type' type-name='item_type'/>
             <stl-vector name='equipment_item_subtype' type-name='int16_t'/>
             <stl-vector name='equipment_mat_type' type-name='int16_t'/>
             <stl-vector name='equipment_mat_index' type-name='int32_t'/>
             <stl-vector name='equipment_quantity' type-name='int32_t'/>
+
             <stl-vector name='interactions' pointer-type='interaction_effect'/>
-            <int32_t/>
-            <int8_t/>
+            <int32_t name='scroll_position_condition'/>
+            <bool name='scrolling_condition'/>
         </compound>
 
-        <compound name='arena_tree'>
+        <compound name='arena_tree'> bay12: create_tree_interfacest
             <bool name='open'/>
             <int32_t name='age' comment='in years'/>
             <bool name='editing_age'/>
-            <int32_t/>
             <stl-string name='age_str' comment='string representation of age field'/>
+
             <bool name='editing_filter'/>
             <stl-string name='filter'/>
-            <stl-vector name='tree_types_filtered'/>
-            <stl-vector name='tree_types_all'/>
-            <int32_t/>
-            <int8_t/>
-            <pointer/>
-            <int8_t/>
+            <stl-vector name='tree_types_filtered' pointer-type='plant_raw'/>
+            <stl-vector name='tree_types_all' pointer-type='plant_raw'/>
+            <int32_t name='scroll_position_tree'/>
+            <bool name='scrolling_tree'/>
+            <pointer name='selected_tree' type-name='plant_raw'/>
+        </compound>
+
+        <compound name='arena_weather'> bay12: arena_weather_interfacest
+            <bool name='open'/>
         </compound>
 
         <stl-vector type-name='int32_t' name='viewunit_list'/>
@@ -2411,24 +2438,24 @@
         <int32_t name='current_hover_id2' comment='union with current_hover_building_subtype'/>
         <int32_t name='current_hover_id3' comment='union with current_hover_building_custom_id'/>
         <enum type-name='interface_key' name='current_hover_key'/>
-        <pointer type-name='popup_message' name='current_hover_alert'/>
+        <pointer type-name='announcement_alertst' name='current_hover_alert'/>
         <bool name='current_hover_replace_minimap'/>
         <int32_t name='current_hover_left_x'/>
         <int32_t name='current_hover_bot_y'/>
 
-        <static-array count='499' name='hover_instruction'><stl-vector pointer-type='stl-string'/></static-array>
+        <static-array count='499' name='hover_instruction' type-name='curses_text_boxst'/>
         <int32_t name='last_displayed_hover_inst'/>
         <int32_t name='last_displayed_hover_id1'/>
         <int32_t name='last_displayed_hover_id2'/>
         <int32_t name='last_displayed_hover_id3'/>
 
-        <pointer type-name='popup_message' name='hover_announcement_alert'/>
-        <stl-vector pointer-type='stl-string' name='hover_announcement_alert_text'/>
+        <pointer type-name='announcement_alertst' name='hover_announcement_alert'/>
+        <compound name='hover_announcement_alert_text' type-name='curses_text_boxst'/>
         <stl-vector type-name='int8_t' name='hover_announcement_alert_color'/>
         <stl-vector type-name='int8_t' name='hover_announcement_alert_bright'/>
         <int32_t name='hover_announcement_alert_width'/>
 
-        <stl-vector pointer-type='stl-string' name='hover_announcement_alert_button_text'/>
+        <compound name='hover_announcement_alert_button_text' type-name='curses_text_boxst'/>
         <stl-vector type-name='int8_t' name='hover_announcement_alert_button_color'/>
         <stl-vector type-name='int8_t' name='hover_announcement_alert_button_bright'/>
         <int32_t name='hover_announcement_alert_button_width'/>
@@ -2451,24 +2478,44 @@
         <compound type-name='coord' name='keyboard_last_track_g'/>
     </struct-type>
 
+    <enum-type type-name='minimap_tile'>
+        <enum-item name='BUILTUP3'/>
+        <enum-item name='BUILTUP2'/>
+        <enum-item name='BUILTUP1'/>
+        <enum-item name='WALL4'/>
+        <enum-item name='WALL3'/>
+        <enum-item name='WALL2'/>
+        <enum-item name='WALL1'/>
+        <enum-item name='WATER'/>
+        <enum-item name='LAVA'/>
+        <enum-item name='TREES'/>
+        <enum-item name='SHRUB'/>
+        <enum-item name='PLAIN'/>
+        <enum-item name='ICE'/>
+        <enum-item name='SKY'/>
+        <enum-item name='SUB_CLEAR'/>
+    </enum-type>
+
     <struct-type type-name='gamest'>
-        <compound name='command_line'>
+        <compound name='command_line'> bay12: command_linest
             <stl-string name='original'/>
             <stl-vector name='arg_vect' pointer-type='stl-string'/>
 
             <long name='gen_id'/>
-            <long name='world_seed'/>
-            <bool name='use_seed'/>
+            <ulong name='world_seed'/>
+            <int8_t name='use_seed'/>
 
             <stl-string name='world_param'/>
             <int8_t name='use_param'/>
         </compound>
 
         <compound name='main_interface' type-name='main_interface'/>
-        <compound name='minimap'>
+        <compound name='minimap'> bay12: minimapst
             -- Abstract representation of contents; updated by need_scan
             <static-array name='minimap' count='24'>
-                <static-array count='15' type-name='int32_t'/>
+                <static-array count='15'> bay12: minimap_squarest
+                    <enum name='type' type-name='minimap_tile'/>
+                </static-array>
             </static-array>
 
             <int8_t name='update'/>
@@ -2491,7 +2538,7 @@
             <int32_t name='texpos'/>
         </compound>
 
-        <compound name='mod_manager'>
+        <compound name='mod_manager'> bay12: mod_managerst
             <stl-vector pointer-type='mod_headerst' name='mod_header'/>
             -- Begin Steam-only stuff
             -- These fields exist in other versions but aren't actually used
@@ -2502,7 +2549,7 @@
             <int32_t name='uploading_mod_index'/>
 
             <pointer name='CreateItemResult'>
-                <compound>
+                <compound> CCallResult{mod_managerst, CreateItemResult_t}
                     <pointer name='vftable'/>
                     <uint8_t name='m_nCallbackFlags'/>
                     <int32_t name='m_iCallback'/>
@@ -2512,7 +2559,7 @@
                 </compound>
             </pointer>
             <pointer name='SubmitItemUpdateResult'>
-                <compound>
+                <compound> CCallResult{mod_managerst, SubmitItemUpdateResult_t}
                     <pointer name='vftable'/>
                     <uint8_t name='m_nCallbackFlags'/>
                     <int32_t name='m_iCallback'/>
@@ -2532,10 +2579,12 @@
         <static-array count='11' name='flash_11_by_3'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array>
         <static-array count='7' name='flash_7_by_3'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array>
         <static-array count='4' name='flash_4_by_3'><static-array count='3'><static-array count='2' type-name='int32_t'/></static-array></static-array>
-        <int32_t name='external_flag'/>
+        <bitfield name='external_flag' base-type='uint32_t'> bay12: EXTERNAL_FLAG_*
+            <flag-bit name='automatic_professions_disabled'/>
+        </bitfield>
     </struct-type>
 
-    <struct-type type-name='main_interface_settings'>
+    <struct-type type-name='main_interface_settings' original-name='settings_interfacest'>
         needs to be a separate type so that widget_tabs can forward-declare this type as a friend
 
         <bool name='open'/>
@@ -2580,9 +2629,8 @@
     </struct-type>
 
     <struct-type type-name='hash_rngst'>
-        <int64_t name='splitmix64_state'/>
-        <int64_t/>
-        <int64_t/>
+        <uint64_t name='splitmix64_state'/>
+        <static-array name='s' count='2' type-name='uint64_t'/>
     </struct-type>
 
     <enum-type type-name='setting_difficulty_enemies_type' base-type='int32_t'> bay12: SettingDifficultyEnemiesType
@@ -2649,7 +2697,6 @@
     </struct-type>
 
     <struct-type type-name='markup_text_wordst'>
-        read and write serialization is in order as below
         <stl-string name='str'/>
         <uint8_t name='red' init-value='255'/>
         <uint8_t name='green' init-value='255'/>
@@ -2657,15 +2704,14 @@
         <int32_t name='link_index' init-value='-1' comment="refers to this text box's link vector, makes clickable link in legends mode"/>
         <int32_t name='px' init-value='-1' comment='offset from left of text box in characters'/>
         <int32_t name='py' init-value='-1' comment='offset from top of text box (positive is downwards)'/>
-        <bitfield name='flags'>
+        <bitfield name='flags'> bay12: MARKUP_TEXT_WORD_FLAG_*
             <flag-bit name='NEW_LINE'/>
             <flag-bit name='BLANK_LINE'/>
             <flag-bit name='INDENT'/>
         </bitfield>
     </struct-type>
 
-    <enum-type type-name='markup_text_link_type' comment='bay12: MarkupTextLink'
-        base-type='int32_t'>
+    <enum-type type-name='markup_text_link_type' base-type='int32_t'> bay12: MarkupTextLinkType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='HIST_FIG'/>
         <enum-item name='SITE'/>
@@ -2682,20 +2728,22 @@
     </enum-type>
 
     <struct-type type-name='markup_text_linkst'>
-        read and write serialization is in order as below
         <enum type-name='markup_text_link_type' name='type'/>
         <int32_t name='id' init-value='-1'/>
         <int32_t name='subid' init-value='-1' comment='only used for type ABSTRACT_BUILDING and ART_IMAGE'/>
     </struct-type>
 
     <struct-type type-name='script_environmentst'>
-        note: these are all void* in bay12 code
         <pointer type-name='meeting_diplomat_info' name='dipev'/>
         <pointer type-name='dipscript_popup' name='mm'/>
         <pointer name='activeplot'/>
         <pointer name='conv'/>
     </struct-type>
 
+    <struct-type type-name='curses_text_boxst'>
+        <stl-vector pointer-type='stl-string' name='text'/>
+    </struct-type>
+
     <struct-type type-name='markup_text_boxst'>
         <stl-vector pointer-type='markup_text_wordst' name='word'/>
         <stl-vector pointer-type='markup_text_linkst' name='link'/>
@@ -2704,15 +2752,25 @@
         <pointer type-name='script_environmentst' name='environment' comment='not saved'/>
     </struct-type>
 
+    <struct-type type-name='color_text_linest'>
+        <static-string name='text' size='769'/>
+        <static-string name='color' size='769'/>
+    </struct-type>
+
+    <struct-type type-name='color_text_boxst'>
+        <stl-vector pointer-type='color_text_linest' name='line'/>
+        <int32_t name='width' init-value='76'/>
+    </struct-type>
+
     <struct-type type-name='wqc_item_traitst'>
         <uint32_t name='flg'/>
         <int32_t name='flgn'/>
         <stl-string name='reaction_class'/>
         <stl-string name='reaction_product_class'/>
-        <int16_t name='metal_ore'/>
+        <int32_t name='metal_ore'/>
         <int32_t name='contains_reaction_index'/>
         <int32_t name='contains_reagent_index'/>
-        <int16_t name='tool_use'/>
+        <enum name='tool_use' type-name='tool_uses'/>
 
         <stl-string name='display_string'/>
 
@@ -2734,7 +2792,9 @@
         <int32_t name='profession_list_order1'/>
         <int32_t name='profession_list_order2'/>
         <int32_t name='stress'/>
-        <uint32_t name='flag'/>
+        <bitfield name='flag' base-type='uint32_t'> bay12: CRI_UNIT_FLAG_*
+            <flag-bit name='being_traded'/>
+        </bitfield>
         <stl-string name='sort_name'/>
         <stl-string name='job_sort_name'/>
 
@@ -2743,14 +2803,14 @@
 
     <struct-type type-name='actor_entryst'>
         <pointer type-name='historical_figure' name='hf'/>
-        <pointer comment='identityst' name='iden'/>
+        <pointer type-name='identity' name='iden'/>
         <pointer type-name='language_name' name='name_ptr'/>
 
         <stl-string name='list_name'/>
         <stl-string name='simple_list_name'/>
 
         <stl-string name='p_list_name'/>
-        <stl-vector pointer-type='stl-string' name='main_text_box'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
 
         <int32_t name='visual_hfid'/>
         <int32_t name='historical_hfid'/>
@@ -2758,11 +2818,14 @@
 
         <stl-vector type-name='int32_t' name='alias_identity_id'/>
 
-        <pointer comment='organization_entryst' name='principle_org'/>
-        <stl-vector comment='organization_entryst' name='associated_org'/>
+        <pointer type-name='organization_entryst' name='principle_org'/>
+        <stl-vector type-name='organization_entryst' name='associated_org'/>
         <stl-vector pointer-type='plot_entryst' name='associated_plot'/>
 
-        <uint32_t name='flag'/>
+        <bitfield name='flag' base-type='uint32_t'> bay12: ACTOR_ENTRY_FLAG_*
+            <flag-bit name='used_in_current_org'/>
+            <flag-bit name='expander_node'/>
+        </bitfield>
     </struct-type>
 
     <struct-type type-name='organization_entry_nodest'>
@@ -2787,11 +2850,13 @@
         <stl-string name='simple_list_name'/>
 
         <stl-string name='p_list_name'/>
-        <stl-vector pointer-type='stl-string' name='main_text_box'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
 
         <pointer type-name='actor_entryst' name='principle_actor_entry'/>
 
-        <uint32_t name='flag'/>
+        <bitfield name='flag' base-type='uint32_t'> bay12: ORGANIZATION_ENTRY_FLAG_*
+            <flag-bit name='did_chart_coords'/>
+        </bitfield>
     </struct-type>
 
     <struct-type type-name='plot_entryst'>
@@ -2799,7 +2864,7 @@
         <stl-string name='simple_list_name'/>
         <stl-string name='p_list_name'/>
 
-        <pointer comment='agreementst' name='agreement'/>
+        <pointer type-name='agreement' name='agreement'/>
         <int32_t name='master_hfid'/>
         <stl-string name='organization_name'/>
     </struct-type>
@@ -2816,15 +2881,20 @@
         <stl-string name='name'/>
         <stl-string name='description'/>
         <stl-vector pointer-type='stl-string' name='dependencies'/>
-        <stl-vector type-name='int32_t' name='dependency_type' comment='0 exact, 1 before, 2 after'/>
+        <stl-vector name='dependency_type'>
+            <bitfield base-type='uint32_t'> bay12: MOD_HEADER_REQUIRED_ID_FLAG_*
+                <flag-bit name='id_must_be_before'/>
+                <flag-bit name='id_must_be_after'/>
+            </bitfield>
+        </stl-vector>
         <stl-vector pointer-type='stl-string' name='conflicts'/>
-        <bitfield name='flags'>
+        <bitfield name='flags' base-type='uint32_t'> bay12: MOD_HEADER_FLAG_*
             <flag-bit name='currently_installed'/>
             <flag-bit name='have_other_version'/>
             <flag-bit name='vanilla'/>
         </bitfield>
         <stl-string name='src_dir'/>
-        <int32_t name='steam_file_id'/>
+        <uint64_t name='steam_file_id'/>
         <stl-string name='steam_title'/>
         <stl-string name='steam_description'/>
         <stl-vector pointer-type='stl-string' name='steam_tag'/>
@@ -2834,91 +2904,104 @@
         <stl-string name='steam_changelog'/>
 
         -- Steam-specific
-        <stl-string name='steamapi_1'/>
-        <bool name='steamapi_2'/>
-        <uint64_t name='steamapi_3'/>
+        <stl-string name='steam_upload_message'/>
+        <bool name='steam_upload_success'/>
+        <uint64_t name='mod_upload_handle'/>
     </struct-type>
 
-    <struct-type type-name='ui_look_list'>
-        <stl-vector name='items'>
-            <pointer>
-                <enum base-type='int16_t' name='type'>
-                    <enum-item name='Item'/>
-                    <enum-item name='Floor'/>
-                    <enum-item name='Unit'/>
-                    <enum-item name='Building'/>
-                    <enum-item name='Vermin'/>
-                    <enum-item name='Flow'/>
-                    <enum-item name='Campfire'/>
-                    <enum-item name='Spatter'/>
-                    <enum-item name='BuildingItem'/>
-                    <enum-item name='Fire'/>
-                    <enum-item name='Water'/>
-                    <enum-item name='Magma'/>
-                    <enum-item name='Spoor'/>
-                </enum>
-                <compound is-union='true' name='data'>
-                    <compound name='item'>
-                        <int32_t name='item_id' ref-target='item'/>
-                    </compound>
-                    <compound name='unit'>
-                        <int32_t name='unit_id' ref-target='unit'/>
-                    </compound>
-                    <compound name='building'>
-                        <int32_t name='bld_id' ref-target='building'/>
-                    </compound>
-                    <compound name='vermin'>
-                        <int16_t name='race'/>
-                        <int32_t name='caste'/>
-                        <int32_t name='item_id' ref-target='item'/>
-                        <uint32_t name='flag'/>
-                        <int32_t name='number'/>
-                    </compound>
-                    <compound name='flow'>
-                        <int16_t name='type'/>
-                        <int16_t name='subtype'/>
-                        <int32_t name='sstype'/>
-                        <int32_t name='guide_id'/>
-                        <uint32_t name='flag'/>
-                    </compound>
-                    <compound name='spatter'>
-                        <enum base-type='int32_t' name='i_type' type-name='item_type'/>
-                        <int32_t name='i_subtype' refers-to='(item-subtype-target $$.i_type $)'/>
-                        <int32_t name='mat' ref-target='material' aux-value='$$.matg'/>
-                        <int32_t name='matg'/>
-                        <enum type-name='matter_state' base-type='int32_t' name='matstate'/>
-                        <int16_t name='extend'/>
-                    </compound>
-                    <compound name='building_item_adv'>
-                        <int32_t name='item_id' ref-target='item'/>
-                    </compound>
-                    <compound name='liquid_water'>
-                        <uint32_t name='flag'/>
-                        <int16_t name='amount'/>
-                    </compound>
-                    <compound name='liquid_magma'>
-                        <uint32_t name='flag'/>
-                        <int16_t name='amount'/>
-                    </compound>
-                    <compound name='spoor'>
-                        <int32_t name='flag'/>
-                        <int32_t name='type'/>
-                        <int32_t name='id1'/>
-                        <int32_t name='id2'/>
-                        <int32_t name='id3'/>
-                    </compound>
-                </compound>
-                <compound type-name='coord' name='pos'/>
-                <stl-string name='display_str'/>
-                <int16_t name='cf'/>
-                <int16_t name='cb'/>
-                <int16_t name='cbr'/>
-            </pointer>
-        </stl-vector>
+    <struct-type type-name='lookinfost'>
+        <enum base-type='int32_t' name='type'> bay12: LookInfoType
+            <enum-item name='Item'/>
+            <enum-item name='Floor'/>
+            <enum-item name='Unit'/>
+            <enum-item name='Building'/>
+            <enum-item name='Vermin'/>
+            <enum-item name='Flow'/>
+            <enum-item name='Campfire'/>
+            <enum-item name='Spatter'/>
+            <enum-item name='BuildingItem'/>
+            <enum-item name='Fire'/>
+            <enum-item name='Water'/>
+            <enum-item name='Magma'/>
+            <enum-item name='Spoor'/>
+        </enum>
+        <compound is-union='true' name='data'>
+            <compound name='item'> bay12: lookinfo_itemst
+                <int32_t name='item_id' ref-target='item'/>
+            </compound>
+            <compound name='floor'> bay12: lookinfo_mapsquarest
+                <int32_t name='empty'/>
+            </compound>
+            <compound name='unit'> bay12: lookinfo_unitst
+                <int32_t name='unit_id' ref-target='unit'/>
+            </compound>
+            <compound name='building'> bay12: lookinfo_buildingst
+                <int32_t name='bld_id' ref-target='building'/>
+            </compound>
+            <compound name='vermin'> bay12: lookinfo_verminst
+                <int16_t name='race' ref-target='creature_raw'/>
+                <int32_t name='caste'/>
+                <int32_t name='item_id' ref-target='item'/>
+                <uint32_t name='flag'/>
+                <int32_t name='number'/>
+            </compound>
+            <compound name='flow'> bay12: lookinfo_flowst
+                <int16_t name='type'/>
+                <int16_t name='subtype'/>
+                <int32_t name='sstype'/>
+                <int32_t name='guide_id'/>
+                <bitfield name='flag' base-type='uint32_t'> bay12: LOOKINFO_FLOW_FLAG_*
+                    <flag-bit name='subterranean'/>
+                </bitfield>
+            </compound>
+            <compound name='campfire'> bay12: lookinfo_campfirest
+                <int32_t name='empty'/>
+            </compound>
+            <compound name='spatter'> bay12: lookinfo_spatterst
+                <enum base-type='int32_t' name='i_type' type-name='item_type'/>
+                <int32_t name='i_subtype' refers-to='(item-subtype-target $$.i_type $)'/>
+                <int32_t name='mat' ref-target='material' aux-value='$$.matg'/>
+                <int32_t name='matg'/>
+                <enum type-name='matter_state' base-type='int32_t' name='matstate'/>
+                <int16_t name='extend'/>
+            </compound>
+            <compound name='building_item_adv'> bay12: lookinfo_building_item_advst
+                <int32_t name='item_id' ref-target='item'/>
+            </compound>
+            <compound name='fire'> bay12: lookinfo_firest
+                <int32_t name='empty'/>
+            </compound>
+            <compound name='liquid_water'> bay12: lookinfo_liquid_waterst
+                <bitfield name='flag' base-type='uint32_t'> bay12: LOOKINFO_LIQUID_WATER_FLAG_*
+                    <flag-bit name='stagnant'/>
+                    <flag-bit name='salt'/>
+                </bitfield>
+                <int16_t name='amount'/>
+            </compound>
+            <compound name='liquid_magma'> bay12: lookinfo_liquid_magmast
+                <bitfield name='flag' base-type='uint32_t'> bay12: LOOKINFO_LIQUID_MAGMA_FLAG_*
+                    <flag-bit name='subterranean'/>
+                </bitfield>
+                <int16_t name='amount'/>
+            </compound>
+            <compound name='spoor'> bay12: lookinfo_spoorst
+                <bitfield name='flag' type-name='spoor_flag'/>
+                <enum name='type' type-name='spoor_type'/>
+                <int32_t name='id1'/>
+                <int32_t name='id2'/>
+                <int32_t name='id3'/>
+            </compound>
+        </compound>
+        <compound type-name='coord' name='pos'/>
+        <stl-string name='display_str'/>
+        <int16_t name='cf'/>
+        <int16_t name='cb'/>
+        <int16_t name='cbr'/>
     </struct-type>
 
     <struct-type type-name='ui_unit_view_mode'>
-        <enum name='value'>
+        <enum name='value'> bay12: UnitViewModes
+            <enum-item name='None' value='-1'/>
             <enum-item name='General'/>
             <enum-item name='Inventory'/>
             <enum-item name='Preferences'/>
@@ -2926,10 +3009,11 @@
             <enum-item name='PrefLabor'/>
             <enum-item name='PrefDogs'/>
             <enum-item name='PrefOccupation'/>
+            <enum-item name='PrefExpel'/>
         </enum>
     </struct-type>
 
-    <enum-type type-name='main_hover_instruction'>
+    <enum-type type-name='main_hover_instruction' base-type='int32_t'> bay12: HoverInstructionType
         <comment>generated by devel/dump-tooltip-ids</comment>
         <enum-attr name='caption'/>
 
@@ -4477,7 +4561,7 @@
         <enum-item name='ArenaWeatherTemperatureTime'>
             <item-attr name='caption' value='Change the weather, temperature, and time.'/>
         </enum-item>
-        <enum-item>
+        <enum-item name='Generic'>
             <item-attr name='caption' value=''/>
         </enum-item>
     </enum-type>
diff --git a/df.ui.xml b/df.ui.xml
index 3b048a17c..a8eef3297 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -214,6 +214,12 @@
         <enum-item name='Finishing'/>
     </enum-type>
 
+    <struct-type type-name='saverst'>
+        <enum name='substage' type-name='save_substage'/>
+        <int32_t name='stage'/>
+        <compound type-name='nemesis_offload' name='info'/> name as in DF source (per putnam)
+    </struct-type>
+
     <bitfield-type type-name='equipment_update' base-type='uint32_t'> bay12: EQUIP_INFO_FLAG_*
         <flag-bit name='weapon'/>
         <flag-bit name='armor'/>
@@ -248,6 +254,20 @@
         <enum-item name='ABANDON'/>
     </enum-type>
 
+    <struct-type type-name='location_detailst'>
+        <enum name='art_specifier' type-name='job_art_specifier_type'/>
+        <int32_t name='art_spec_id1'/>
+        <int32_t name='art_spec_id2'/>
+        <compound name='pos' type-name='coord'/>
+    </struct-type>
+
+    <struct-type type-name='adv_art_specifierst'>
+        <stl-string name='name'/>
+        <enum name='art_specifier' type-name='job_art_specifier_type'/>
+        <int32_t name='art_spec_id1'/>
+        <int32_t name='art_spec_id2'/>
+    </struct-type>
+
     <struct-type type-name='plotinfost'>
         <enum name='game_state' type-name='end_cause_type' base-type='int16_t'/>
         <int32_t name='lost_to_siege_civ' ref-target='historical_entity'/>
@@ -519,14 +539,7 @@
             <int32_t name='sel_route_idx'/>
             <int32_t name='sel_route_waypt_idx'/>
             <bool name='in_edit_waypts_mode'/>
-            <stl-vector name='location_detail' since='v0.42.06'>
-                <pointer> bay12: location_detailst
-                    <enum name='art_specifier' type-name='job_art_specifier_type'/>
-                    <int32_t name='art_spec_id1'/>
-                    <int32_t name='art_spec_id2'/>
-                    <compound name='pos' type-name='coord'/>
-                </pointer>
-            </stl-vector>
+            <stl-vector name='location_detail' pointer-type='location_detailst' since='v0.42.06'/>
         </compound>
 
         <compound name='burrows'> bay12: burrow_infost
@@ -716,11 +729,7 @@
             <bool name='autosave_request'/>
             <int32_t name='autosave_timer'/>
             <compound type-name='file_compressorst' name='file'/>
-            <compound name='save_progress'> bay12: saverst
-                <enum name='substage' type-name='save_substage'/>
-                <int32_t name='stage'/>
-                <compound type-name='nemesis_offload' name='info'/> name as in DF source (per putnam)
-            </compound>
+            <compound name='save_progress' type-name='saverst'/>
             <int8_t name='do_unit_offload'/>
             <compound name='offload_unit_info' type-name='nemesis_offload'/>
             <bool name='unit_offload_have_set_count' since='v0.44.12'/>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 127b9d1a2..9e88a3039 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -15,14 +15,14 @@
         <int32_t name='out_buffer_amount_written'/>
     </struct-type>
 
-    <enum-type type-name='interface_breakdown_types' base-type='int8_t'>
+    <enum-type type-name='interface_breakdown_types'> bay12: InterfaceBreakdownTypes, no base type
         <enum-item name='NONE'/>
         <enum-item name='QUIT'/>
         <enum-item name='STOPSCREEN'/>
         <enum-item name='TOFIRST'/>
     </enum-type>
 
-    <enum-type type-name='interface_push_types'>
+    <enum-type type-name='interface_push_types'> bay12: InterfacePushType, no base type
         <enum-item name='AS_PARENT'/>
         <enum-item name='AS_CHILD'/>
         <enum-item name='AT_BACK'/>
@@ -33,11 +33,7 @@
         <virtual-methods>
             <vmethod name='get_rect' ret-type='extentst'/>
             <vmethod name='feed'>
-                <pointer name='events'>
-                    <stl-set>
-                        <enum type-name='interface_key' base-type='long'/>
-                    </stl-set>
-                </pointer>
+                <pointer name='events'><stl-set type-name='interface_key'/></pointer>
             </vmethod>
             <vmethod name='logic'/>
             <vmethod name='render'> <uint32_t name='curtick'/> </vmethod>
@@ -77,7 +73,7 @@
         <pointer type-name='widget_textbox' name='cur_textbox'/>
     </struct-type>
 
-<!--
+    technically still here, though nothing uses it
     <class-type type-name='layer_object' original-name='layer_objectst'>
         <bool name='enabled'/>
         <bool name='active'/>
@@ -91,13 +87,11 @@
             <vmethod ret-type='int32_t' name='getX2'/>
 
             <vmethod ret-type='int32_t' name='getY2'/>
-            <vmethod ret-type='int32_t' comment='list 1; button,base -1'/>
+            <vmethod ret-type='int32_t' name='getPageSize'/>
             <vmethod ret-type='int32_t' name='getListCursor'/>
             <vmethod name='setListCursor'> <int32_t/> </vmethod>
             <vmethod name='feed'>
-                <pointer name='events'> <stl-set>
-                    <enum type-name='interface_key' base-type='int32_t'/>
-                </stl-set> </pointer>
+                <pointer name='events'><stl-set type-name='interface_key'/></pointer>
             </vmethod>
 
             <vmethod ret-type='bool' name='isSetMouseLRCur'/>
@@ -129,9 +123,9 @@
         <int32_t name='mouse_l_cur'/>
         <int32_t name='mouse_r_cur'/>
         <bool name='rclick_scrolls'/>
-        <int32_t name='flag' comment='for standardscrolling'/>
-        <enum name='key_lclick' base-type='int32_t' type-name='interface_key'/>
-        <enum name='key_rclick' base-type='int32_t' type-name='interface_key'/>
+        <uint32_t name='flag' comment='for standardscrolling'/>
+        <enum name='key_lclick' type-name='interface_key'/>
+        <enum name='key_rclick' type-name='interface_key'/>
     </class-type>
 
     <class-type type-name='layer_object_buttonst' inherits-from='layer_object'>
@@ -149,10 +143,9 @@
         <int32_t name='mouse_y'/>
         <int32_t name='mouse_x_old'/>
         <int32_t name='mouse_y_old'/>
-        <int8_t name='handle_mouselbtndown'/>
-        <int8_t name='handle_mouserbtndown'/>
+        <bool name='handle_mouselbtndown'/>
+        <bool name='handle_mouserbtndown'/>
     </class-type>
--->
 
     <struct-type type-name='scrollbarst'>
         <int32_t name='sel'/>
@@ -173,17 +166,17 @@
         <int32_t name='y2'/>
     </struct-type>
 
-    <class-type type-name='widget' original-name='widgets::widget'>
-        <pointer name='parent'/>
+    <class-type type-name='widget' original-name='widgets::widget' inherits-from='abstract_interfacest'>
+        <pointer name='parent' type-name='abstract_interfacest'/>
         <compound type-name='extentst' name='rect'/>
         <stl-vector name='custom_feed'> <stl-function/> </stl-vector>
         <stl-vector name='custom_logic'> <stl-function/> </stl-vector>
         <stl-vector name='custom_render'> <stl-function/> </stl-vector>
         <stl-vector name='custom_activated'> <stl-function/> </stl-vector>
         <stl-string name='name'/>
-        <bitfield name='visibility_flags' base-type='int8_t'>
+        <bitfield name='visibility_flags' base-type='int8_t'> bay12: VisibilityFlagType
             <flag-bit name='WIDGET_VISIBILITY_ACTIVE'/>
-            <flag-bit name='WIDGET_VISIBILITY_VISIBLE'/>
+            <flag-bit name='WIDGET_VISIBILITY_VISIBLE'/> plus ACTUALLY_VISIBLE for both of the above
             <flag-bit name='WIDGET_VISIBILITY_CAN_KEY_ACTIVATE'/>
         </bitfield>
         <int32_t name='offset_bottom'/>
@@ -197,7 +190,7 @@
         <int32_t name='min_w'/>
         <int32_t name='min_h'/>
         <stl-variant name='tooltip' raw-type='std::string, std::function&lt;void()&gt;'/>
-        <enum name='tooltip_type' base-type='int8_t'>
+        <enum name='tooltip_type' base-type='int8_t'> bay12: TooltipType
             <enum-item name='NONE' value='-1'/>
             <enum-item name='REPLACE_MINIMAP'/>
             <enum-item name='ABOVE'/>
@@ -205,24 +198,9 @@
         </enum>
         <bool name='displaying_tooltip'/>
         <stl-string name='search_string'/>
-        <stl-set name='activation_hotkeys'>
-            <enum type-name='interface_key' base-type='long'/>
-        </stl-set>
+        <stl-set name='activation_hotkeys' type-name='interface_key'/>
 
         <virtual-methods>
-            -- from abstract_interface
-            <vmethod name='get_rect' ret-type='extentst'/>
-            <vmethod name='feed'>
-                <pointer name='events'> <stl-set>
-                    <enum type-name='interface_key' base-type='int32_t'/>
-                </stl-set> </pointer>
-            </vmethod>
-            <vmethod name='logic'/>
-            <vmethod name='render'/>
-            <vmethod name='arrange'/>
-            <vmethod name='remove_child'> <pointer name='w'/> </vmethod>
-            <vmethod name='clear'/>
-            -- from widget itself
             <vmethod is-destructor='true'/>
         </virtual-methods>
     </class-type>
@@ -245,16 +223,17 @@
         <uint32_t name='flag'/>
     </class-type>
 
-    <class-type type-name='text_truncated' original-name='widgets::text_truncated' inherits-from='widget_text'>
+    <class-type type-name='widget_text_truncated' original-name='widgets::text_truncated' inherits-from='widget_text'>
         <stl-string name='original_str'/>
-        <int32_t name='truncate_mode_flags'/>
+        <bitfield name='truncate_mode_flags' base-type='int32_t'> bay12: TRUNCATE_MODE_*
+            <flag-bit name='abbreviate'/>
+            <flag-bit name='ellipses'/>
+        </bitfield>
     </class-type>
 
-    <class-type type-name='widget_text_multiline' original-name='widgets::text_multiline' inherits-from='widget_text'>
-        <stl-vector type-name='stl-string' name='strs'/>
-    </class-type>
+    <class-type type-name='widget_text_multiline' original-name='widgets::text_multiline' inherits-from='widget_text'/>
 
-    <bitfield-type type-name='override_tile_type' base-type='uint8_t'>
+    <bitfield-type type-name='override_tile_type' base-type='uint8_t'> bay12: OVERRIDE_*
         <flag-bit name='OVERRIDE_CHAR'/>
         <flag-bit name='OVERRIDE_TILE'/>
         <flag-bit name='OVERRIDE_TOP_TILE'/>
@@ -269,8 +248,7 @@
         <bitfield type-name='override_tile_type' name='flag' init-value='override_tile_type::mask_OVERRIDE_CHAR'/>
     </class-type>
 
-    <class-type type-name='widget_nineslice_horizontal' original-name='widgets::nineslize_horizontal' inherits-from='widget_nineslice'>
-    </class-type>
+    <class-type type-name='widget_nineslice_horizontal' original-name='widgets::nineslize_horizontal' inherits-from='widget_nineslice'/>
 
     <class-type type-name='widget_anchored_tile' original-name='widgets::anchored_tile' inherits-from='widget_nineslice'>
         <long name='texp'/>
@@ -288,15 +266,15 @@
         <stl-shared-ptr type-name='widget' name='ascii_widget'/>
     </class-type>
 
-    <class-type type-name='widget_menu' original-name='widgets::menu' inherits-from='widget'>
+    <struct-type type-name='widget_menu' original-name='widgets::menu'>
         <stl-map name='lines'/>
         <int32_t name='selection'/>
         <int32_t name='last_displayheight'/>
         <bool name='bleached'/>
         <stl-map name='colors'/>
-    </class-type>
+    </struct-type>
 
-    <enum-type type-name='textbox_type' base-type='int32_t' comment='bay12: TextboxType'>
+    <enum-type type-name='textbox_type'> bay12: TextboxType, no base type
         <enum-item name='FILTER'/>
         <enum-item name='NAME'/>
         <enum-item name='NONE'/>
@@ -304,7 +282,7 @@
 
     <class-type type-name='widget_textbox' original-name='widgets::textbox' inherits-from='widget'>
         <stl-string name='str'/>
-        <int32_t name='flags'/>
+        <uint32_t name='flags'/>
         <stl-function name='callback' comment='arguments are textbox*'/>
         <int16_t name='fg'/>
         <int16_t name='bg'/>
@@ -324,6 +302,9 @@
         <compound type-name='widget' name='open'/>
         <bool name='last_visible'/>
         <stl-unordered-map name='controlled_set' comment='std::unordered_set&lt;std::shared_ptr&lt;widget&gt;&gt;'/>
+        <bool name='controlled_visible'/>
+        <compound type-name='widget_text' name='label'/>
+        <stl-weak-ptr type-name='widget_container'/>
     </class-type>
 
     <struct-type type-name='filter_entry'>
@@ -391,9 +372,9 @@
 
     <class-type type-name='widget_tabs' original-name='widgets::tabs' inherits-from='widget_container'>
         <size_t name='cur_idx'/>
-        <stl-vector name='tab_labels' pointer-type='stl-string'/>
+        <stl-vector name='tab_labels' type-name='stl-string'/>
         <stl-vector name='rows' comment='actually std::pair of size_t, size_t'/>
-        <enum name='tab_type'>
+        <enum name='tab_type'> bay12: TabType
             <enum-item name='DEFAULT'/>
             <enum-item name='SHORT'/>
             <enum-item name='SHORT_SUB'/>
@@ -406,6 +387,7 @@
         <int32_t name='num_visible'/>
         <bool name='scrolling'/>
         <compound type-name='scrollbarst' name='scrollbar'/>
+        <int8_t name='scrollbar_display_flags'/>
     </class-type>
 
     <class-type type-name='widget_radio_rows' original-name='widgets::radio_rows' inherits-from='widget'>
@@ -465,7 +447,7 @@
         <int32_t name='context'/>
     </class-type>
 
-    <enum-type type-name='unit_list_options' base-type='int32_t'>
+    <enum-type type-name='unit_list_options'> bay12: unit_list_options
         <enum-item name='NONE'/>
         <enum-item name='PORTRAIT'/>
         <enum-item name='NAME_PROF'/>
@@ -481,9 +463,10 @@
         <enum-item name='SHOW_GENDER'/>
         <enum-item name='CUSTOM_BUILD'/>
         <enum-item name='FORCE_JOB_WIDTH'/>
+        <enum-item name='ACTIVATE_ON_CURSOR'/>
     </enum-type>
 
-    <bitfield-type type-name='unit_list_flag'>
+    <bitfield-type type-name='unit_list_flag' base-type='uint8_t'> bay12: UNIT_LIST_FLAG_*
         <flag-bit name='show_gender'/>
         <flag-bit name='custom_build'/>
         <flag-bit name='force_job_width'/>
@@ -568,7 +551,7 @@
         <stl-function type-name='bool' name='sort_fun'/> std::function&lt;bool(const Entry &amp;, const Entry &amp;)&gt;
     </class-type>
 
-    <class-type type-name='widget_unit_sort_widget' inherits-from='widget_sort_widget' comment='original-name for this class is not yet known'/>
+    <class-type type-name='widget_unit_sort_widget' inherits-from='widget_sort_widget' comment='template specialization using unit_list + unit_list::item_or_unit'/>
 
     <class-type type-name='MacroScreenLoad' inherits-from='viewscreen'>
         <compound name='menu' type-name='widget_menu'/>
@@ -581,12 +564,12 @@
     </class-type>
 
     <struct-type type-name='shared_world_headerst'>
-        <int32_t name='id1' comment='based on tick at start of game'/>
-        <int32_t name='id2' comment='based on tick at creation time'/>
+        <uint32_t name='id1' comment='based on tick at start of game'/>
+        <uint32_t name='id2' comment='based on tick at creation time'/>
         <stl-string name='world_name'/>
         <stl-string name='timeline_name'/>
         <stl-string name='manual_name'/>
-        <enum base-type='int32_t' name='save_type'>
+        <enum base-type='int32_t' name='save_type'> bay12: SaveTypeType
             <enum-item name='NONE' value='-1'/>
             <enum-item name='ACTIVE'/>
             <enum-item name='INACTIVE'/>
@@ -599,11 +582,29 @@
         <int32_t name='advs_played'/>
     </struct-type>
 
+    <enum-type type-name='region_permission_type'> bay12: RegionPermission
+        <enum-item name='ADVENTURE_MAIN'/>
+        <enum-item name='UNUSED11'/> used as index-enum, so name all entries
+        <enum-item name='UNUSED12'/>
+        <enum-item name='DWARF_MAIN'/>
+        <enum-item name='UNUSED0'/>
+        <enum-item name='UNUSED1'/>
+        <enum-item name='UNUSED2'/>
+        <enum-item name='UNUSED3'/>
+        <enum-item name='UNUSED4'/>
+        <enum-item name='UNUSED5'/>
+        <enum-item name='UNUSED6'/>
+        <enum-item name='UNUSED7'/>
+        <enum-item name='UNUSED8'/>
+        <enum-item name='UNUSED9'/>
+        <enum-item name='UNUSED10'/>
+    </enum-type>
+
     <struct-type type-name='region_headerst'>
         <compound type-name='language_name' name='name'/>
         <stl-string name='display_name'/>
-        <static-array name='permission' count='15' type-name='int8_t' comment='same as the one at the top of world_data'/>
-        <compound name='last_id' comment='when loading, DF sets *_next_id to these fields plus 1'>
+        <static-array name='permission' count='15' type-name='int8_t' index-enum='region_permission_type'/>
+        <compound name='last_id' comment='when loading, DF sets *_next_id to these fields plus 1'> not a compound
             <int32_t name='unit'/>
             <int32_t name='soul'/>
             <int32_t name='item'/>
@@ -648,7 +649,7 @@
 
     <class-type type-name='viewscreen_adopt_regionst' inherits-from='viewscreen'>
         <compound type-name='file_compressorst' name='compressor'/>
-        <enum base-type='int32_t' name='cur_step'>
+        <enum base-type='int32_t' name='cur_step'> bay12: AdoptRegionStageType
             <enum-item name='OpeningFile'/>
             <enum-item name='ProcessingRawData'/>
             <enum-item name='AllocatingSpace'/>
@@ -692,7 +693,7 @@
         <int32_t name='progress' comment='0..35'/>
     </class-type>
 
-    <enum-type type-name='embark_finder_option'>
+    <enum-type type-name='embark_finder_option' base-type='int16_t'> bay12: FindSiteParamType
         <enum-item name='DimensionX'/>
         <enum-item name='DimensionY'/>
         <enum-item name='Savagery'/>
@@ -717,31 +718,33 @@
         <enum-item name='Sand'/>
     </enum-type>
 
-    <struct-type type-name='embark_location' comment='starter_infost?'>
+    <struct-type type-name='embark_location' original-name='starter_infost'>
         <compound name='region_pos' type-name='coord2d'/>
 
         <int16_t name="reclaim_site" ref-target='world_site'/>
         <int16_t name="reclaim_idx"/>
-<!--
-        <compound name='biome_rgn' type-name='coord2d_path'/>
--->
         <compound name='embark_pos_min' type-name='coord2d'/>
         <compound name='embark_pos_max' type-name='coord2d'/>
-<!--
-        <compound name='embark_biome_rgn' type-name='coord2d'
-                  comment='Valid only after e pressed.'/>
--->
     </struct-type>
 
+    <enum-type type-name='embark_neighbor_state_type' base-type='int32_t'> bay12: EmbarkNeighborStateType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='WAR'/>
+        <enum-item name='HOSTILE'/>
+        <enum-item name='NO_COMM'/>
+        <enum-item name='NO_TRADE'/>
+        <enum-item name='NORMAL'/>
+    </enum-type>
+
     <class-type type-name='viewscreen_choose_start_sitest' inherits-from='viewscreen'>
-        <enum base-type='int32_t' name='page'>
+        <enum name='page'> bay12: ChooseStartSiteViewMode, no base type!
             <enum-item name='Biome'/>
             <enum-item name='Neighbors'/>
             <enum-item name='Civilization'/>
             <enum-item name='Elevation'/>
             <enum-item name='Cliffs'/>
             <enum-item name='Reclaim'/>
-            <enum-item name='Reclaim2'/>
+            <enum-item name='ReclaimDetails'/>
             <enum-item name='Find'/>
             <enum-item name='Notes'/>
         </enum>
@@ -768,7 +771,7 @@
         <stl-vector pointer-type='historical_entity' name='def_candidate'/>
         <stl-vector pointer-type='world_site' name='def_candidate_nearst'/>
         <stl-vector type-name='int32_t' name='def_candidate_mindist'/>
-        <stl-vector type-name='int32_t' name='def_candidate_state'/>
+        <stl-vector type-name='embark_neighbor_state_type' name='def_candidate_state'/>
 
         <bool name='zoomed_in'/>
         <int32_t name='zoom_cent_x'/>
@@ -799,7 +802,7 @@
         <int32_t name="biome_idx"/>
         <bool name="biome_highlighted"/>
 
-        <bitfield name='warn_flags' base-type='uint16_t'>
+        <bitfield name='warn_flags' base-type='int16_t'> bay12: WARN_FLAG_*
             <flag-bit name='GENERIC'/>
             <flag-bit name='WATER_TABLE'/>
             <flag-bit name='HEAVY_WATER_TABLE'/>
@@ -818,8 +821,7 @@
         <stl-vector type-name='int32_t' name='start_civ_nem_num'/>
         <stl-vector type-name='int32_t' name='start_civ_entpop_num'/>
         <stl-vector type-name='int32_t' name='start_civ_site_num'/>
-
-        <stl-vector name='reclaim_detail_box' pointer-type='stl-string' since='v0.40.01'/>
+        <compound name='reclaim_detail_box' type-name='curses_text_boxst'/>
         <pointer name="reclaim_detail_he" type-name="history_event" has-bad-pointers='true' since='v0.40.01'/>
         <pointer name="reclaim_detail_she" type-name="history_event" has-bad-pointers='true' since='v0.40.01'/>
         <int32_t name="reclaim_detail_box_last_processing_dimx" since='v0.40.01'/>
@@ -840,7 +842,7 @@
         <stl-vector type-name='int16_t' name='find_metal_ore'/>
         <stl-vector type-name='int16_t' name='skip_metal_ore'/>
 
-        <enum name='find_results' base-type='int16_t'>
+        <enum name='find_results' base-type='int16_t'> not a real enum
             <enum-item name='None' value='-1'/>
             <enum-item name='NoResult'/>
             <enum-item name='Partial'/>
@@ -855,7 +857,7 @@
         <int16_t name='find_mm_ey'/>
 
         <stl-vector name="note_index" type-name='int32_t' refers-to='$global.world.world_data.embark_notes[$]'/>
-        <stl-vector name="text_box" pointer-type='stl-string'/>
+        <compound name="text_box" type-name='curses_text_boxst'/>
         <bool name='notes_entering_text'/>
         <int32_t name='notes_list_select'/>
         <int16_t name="notes_cur_sym"/>
@@ -865,122 +867,6 @@
         <int32_t name="notes_selected_note"/>
     </class-type>
 
-    <struct-type type-name='mission'>
-        <int32_t name='army_controller' ref-target='army_controller'/>
-        <int32_t name='entity' ref-target='historical_entity'/>
-        <int32_t name='target_site' ref-target='world_site'/>
-        <int32_t name='unk_2'/> -1
-        <int32_t name='target_x'/>
-        <int32_t name='target_y'/>
-        <int32_t name='unk_3'/>
-        <int32_t name='unk_4'/>
-        <int32_t name='unk_5'/>
-        <int32_t name='unk_6'/>
-        <int32_t name='unk_7'/>
-        <int32_t name='unk_8'/>
-        <int32_t name='unk_9'/>
-        <int32_t name='unk_10'/>
-        <int32_t name='year'/>
-        <int32_t name='year_tick'/>
-        <int32_t name='unk_12'/> -1
-        <int32_t name='army_controller2' ref-target='army_controller'/>
-        <int32_t name='histfig' ref-target='historical_figure'/>
-        <int32_t name='unk_14'/> -1
-        <int32_t name='unk_16'/>
-        <int32_t name='unk_17'/>
-        <int32_t name='unk_18'/>
-        <int32_t name='unk_19'/>
-        <int32_t name='unk_20'/>
-        <int32_t name='unk_21'/>
-        <int32_t name='unk_15'/>
-        <int32_t name='unk_22'/>
-        <stl-vector name='squads' type-name='int32_t' ref-target='squad'/>
-        <stl-vector name='messengers' type-name='int32_t' ref-target='occupation'/>
-
-        <int32_t name='unk_23'/>
-        <int32_t name='unk_24'/>
-
-        <compound name='details' is-union='true'>
-            <pointer name='raid'>
-                <enum name='raid_type' base-type='int32_t'>
-                    <enum-item name='Raze' value='0'/>
-                    <enum-item name='TakeOver' value='1'/>
-                    <enum-item name='Occupy' value='2'/>
-                    <enum-item name='DemandTribute' value='3'/>
-                    <enum-item name='Raid' value='4'/>
-                    <enum-item name='Explore' value='5'/>
-                    <enum-item name='Pillage' value='6'/>
-                </enum>
-                <int32_t name='unk_2'/>
-
-                <int32_t name='unk_5'/>
-                <int32_t name='unk_6'/>
-                <int32_t name='unk_7'/>
-                <int32_t name='unk_8'/>
-                <int32_t name='unk_9'/>
-                <int32_t name='unk_10'/>
-                <int32_t name='unk_11'/>
-                <int32_t name='unk_12'/>
-                <int32_t name='unk_13'/>
-                <int32_t name='unk_14'/>
-                <int32_t name='unk_15'/>
-                <int32_t name='unk_16'/>
-                <int32_t name='unk_17'/>
-                <int32_t name='unk_18'/>
-                <int32_t name='unk_19'/>
-                <int32_t name='unk_20'/>
-                <int32_t name='unk_21'/>
-                <int32_t name='unk_22'/>
-                <int32_t name='unk_23'/>
-                <int32_t name='unk_24'/>
-                <bitfield base-type='uint32_t' name='raid_flags'>
-                    <flag-bit name='Unknown1'/>
-                    <flag-bit name='OneTimeTribute'/>
-                    <flag-bit name='OngoingTribute'/>
-                    <flag-bit name='FreeCaptives'/>
-                    <flag-bit name='ReleaseOtherPrisoners'/>
-                    <flag-bit name='TakeImportantTreasures'/>
-                    <flag-bit name='LootOtherItems'/>
-                    <flag-bit name='StealLivestock'/>
-                    <flag-bit name='Unknown256'/>
-                    <flag-bit name='DemandSurrender'/>
-                </bitfield>
-                <int32_t name='unk_3'/>
-                <int32_t name='unk_4'/>
-                <int32_t name='unk_25'/>
-                <int32_t name='unk_26'/>
-                <int32_t name='unk_27'/>
-                <int32_t name='unk_28'/>
-                <int32_t name='unk_29'/>
-                <int32_t name='unk_30'/>
-                <int32_t name='unk_31'/>
-            </pointer>
-            <pointer name='recovery'>
-                <int32_t name='artifact' ref-target='artifact_record'/>
-                <int32_t name='unk_2'/>
-            </pointer>
-            <pointer name='rescue'>
-                <int32_t name='histfig' ref-target='historical_figure'/>
-                <int32_t name='unk_2'/>
-            </pointer>
-            <pointer name='request'>
-                <stl-vector name='workers' type-name='int32_t' ref-target='historical_figure'/>
-                <int32_t name='unk_1'/>
-                <int32_t name='unk_2'/>
-                <int32_t name='unk_3'/>
-                <int32_t name='unk_4'/>
-            </pointer>
-        </compound>
-
-        <enum name='type' base-type='int32_t'>
-            <enum-item name='Raid' value='2'/>
-            <enum-item name='RecoverArtifact' value='17'/>
-            <enum-item name='RescuePerson' value='18'/>
-            <enum-item name='RequestWorkers' value='19'/>
-        </enum>
-        <int32_t name='unk_25'/>
-    </struct-type>
-
     <class-type type-name='viewscreen_dwarfmodest' inherits-from='viewscreen'>
         <int8_t name='shown_site_name'/> display site name next frame
 
@@ -1007,7 +893,7 @@
 
     <class-type type-name='viewscreen_export_regionst' inherits-from='viewscreen'>
         <bool name='play_now'/>
-        <enum base-type='int32_t' name='state'>
+        <enum base-type='int32_t' name='state'> bay12: ExportRegionStageType
             <enum-item name='Initializing'/>
             <enum-item name='PreliminaryCleaning'/>
             <enum-item name='OffloadingUnits'/>
@@ -1049,21 +935,14 @@
             <enum-item name='SynchronizingFolders'/>
         </enum>
         <int32_t name='progress' comment='0..40'/>
-        <compound name='units_progress'>
-            <stl-vector type-name='int32_t' name='save_file_id'/>
-            <stl-vector type-name='int16_t' name='save_file_member_idx'/>
-            <stl-vector pointer-type='unit' name='units'/>
-            <pointer type-name='unit_chunk' name='current_chunk'/>
-            <int32_t name='current_save_file_id'/>
-            <int32_t name='offloaded_units'/>
-        </compound>
+        <compound name='units_progress' type-name='nemesis_offload'/>
         <compound type-name='file_compressorst' name='compressor'/>
         <stl-string name='folder_name'/>
         <stl-string name='timeline_name'/>
     </class-type>
 
     <class-type type-name='viewscreen_game_cleanerst' inherits-from='viewscreen'>
-        <enum base-type='int32_t' name='state'>
+        <enum name='state'> bay12: GameClean, no base type
             <enum-item name='CleaningGameObjects'/>
             <enum-item name='CleaningStrandedObjects'/>
             <enum-item name='CleaningPlayObjects'/>
@@ -1073,7 +952,7 @@
     <class-type type-name='viewscreen_initial_prepst' inherits-from='viewscreen'>
         <int32_t name='render_count'/>
         <int32_t name='logic_step'/>
-        <stl-future name='unk_90'/>
+        <stl-future name='process'/>
     </class-type>
 
     <class-type type-name='world_gen_param_basest'>
@@ -1139,7 +1018,7 @@
 
     <struct-type type-name='legend_pagest'>
         <stl-string name='header'/>
-        <enum name='mode' base-type='int32_t'>
+        <enum name='mode' base-type='int32_t'> bay12: LegendsModeType
             <enum-item name='NONE' value='-1'/>
             <enum-item name='MAIN'/>
             <enum-item name='HFS'/>
@@ -1180,9 +1059,9 @@
         <stl-vector type-name='int32_t' name='histfigs' ref-target='historical_figure'/>
         <stl-vector type-name='int32_t' name='sites' ref-target='world_site'/>
         <stl-vector type-name='int32_t' name='artifacts' ref-target='artifact_record'/>
-        <stl-vector type-name='int32_t' name='codices'/>
-        <stl-vector type-name='int32_t' name='regions'/>
-        <stl-vector type-name='int32_t' name='layers'/>
+        <stl-vector type-name='int32_t' name='codices' ref-target='written_content'/>
+        <stl-vector type-name='int32_t' name='regions' ref-target='world_region'/>
+        <stl-vector type-name='int32_t' name='layers' ref-target='world_underground_region'/>
         <stl-vector type-name='int32_t' name='entities' ref-target='historical_entity'/>
         <stl-vector type-name='int32_t' name='structure_sites' ref-target='world_site'/>
         <stl-vector type-name='int32_t' name='structures_indices'/> index into world_site.buildings
@@ -1192,27 +1071,11 @@
         <stl-vector type-name='int32_t' name='era_choice_index'/>
         <stl-vector type-name='int32_t' name='era_choice_num'/>
         <stl-vector type-name='int32_t' name='era_choice_denom'/>
-        <stl-vector type-name='int32_t' name='hec_id'/>
+        <stl-vector type-name='int32_t' name='hec_id' ref-target='history_event_collection'/>
 
-        <int8_t name='showing_all_era_collections'/>
+        <bool name='showing_all_era_collections'/>
 
-        <stl-vector name='region_snapshot'>
-            <pointer>
-                <int32_t name='unk_1'/>
-                <int32_t name='unk_2'/>
-                <pointer name='unk_3'>
-                    <pointer name='unk_1'/>
-                    <pointer name='unk_2'/>
-                    <pointer name='unk_3'/>
-                    <pointer name='unk_4'/>
-                    <pointer name='unk_5'/>
-                </pointer>
-                <int16_t name='unk_4'/>
-                <int16_t name='unk_5'/>
-                <int32_t name='unk_6'/>
-                <stl-vector name='unk_7' type-name='int32_t'/>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='region_snapshot' pointer-type='region_snapshotst'/>
         <int16_t name='region_view_x'/>
         <int16_t name='region_view_y'/>
         <int16_t name='region_view_mode'/>
@@ -1235,8 +1098,8 @@
         <stl-vector pointer-type='legend_pagest' name='page'/>
         <int32_t name='active_page_index'/>
         <int32_t name='page_scroll'/>
-        <stl-future name='unk_338'/>
-        <int8_t name='unk_348'/>
+        <stl-future name='xml_dump_future'/>
+        <bool name='dumping_xml'/>
     </class-type>
 
     <struct-type type-name='savegame_headerst'>
@@ -1283,7 +1146,7 @@
         <int32_t name='max_image_set_id'/>
         <int32_t name='max_divination_set_id'/>
 
-        <enum type-name='game_type' name='gametype' comment='only 0 (fort) 1 (adv) 3(reclaim) are valid'/>
+        <enum type-name='game_type' name='gametype' base-type='int16_t'/>
         <stl-string name='fort_name'/>
         <stl-string name='world_name'/>
         <int32_t name='year'/>
@@ -1386,7 +1249,7 @@
     </struct-type>
 
     <class-type type-name='viewscreen_loadgamest' inherits-from='viewscreen'>
-        <enum name='cur_step' comment='After the on-screen text shown while loading.'>
+        <enum name='cur_step' base-type='int32_t'> bay12: LoadGameStageType
             <enum-item name='OpeningFile'/>
             <enum-item name='ProcessingRawData'/>
             <enum-item name='AllocatingSpace'/>
@@ -1438,6 +1301,7 @@
             <enum-item name='PreparingGameScreen'/>
             <enum-item name='HandlingCompatibilityIssues'/>
             <enum-item name='Finishing'/>
+            <enum-item name='Failed'/>
         </enum>
         <int32_t name='progress' since='v0.40.01'/>
         <compound type-name='file_compressorst' name='compressor'/>
@@ -1446,7 +1310,7 @@
         <compound name='cur_save' type-name='savegame_headerst'/>
     </class-type>
 
-    <struct-type type-name='worldgen_parms'>
+    <struct-type type-name='worldgen_parms' original-name='world_gen_paramst'>
         <stl-string name='title'/>
         <stl-string name='seed' since='v0.34.01'/>
         <stl-string name='history_seed' since='v0.34.01'/>
@@ -1559,10 +1423,10 @@
         <int32_t name='all_caves_visible'/>
         <int32_t name='show_embark_tunnel'/>
         <int32_t name='pole'/>
-        <bool name='unk_1'/>
+        <bool name='immune_to_resize'/>
     </struct-type>
 
-    <struct-type type-name='worldgen_parms_ps'>
+    <struct-type type-name='worldgen_parms_ps' original-name='world_gen_param_presetst'>
         <int32_t name='width'/>
         <int32_t name='height'/>
         <static-array count='24' name='data' index-enum='worldgen_range_type'>
@@ -1612,8 +1476,8 @@
 
         <int8_t name='abort_world_gen_dialogue'/>
         <int8_t name='reject_dialogue'/>
-        <int16_t name='reject_dialogue_type'/>
-        <stl-vector pointer-type='stl-string' name='text_box'/>
+        <int16_t name='reject_dialogue_type'/> bay12: MapRejectType
+        <compound name='text_box' type-name='curses_text_boxst'/>
         <bool name='mouse_scrolling_map'/>
         <int32_t name='mouse_anchor_mx'/>
         <int32_t name='mouse_anchor_my'/>
@@ -1622,7 +1486,7 @@
 
         <bool name='raw_load'/>
         <int32_t name='stage_count'/>
-        <int32_t name='raw_load_stage'/>
+        <int32_t name='raw_load_stage'/> bay12: NewRegionRawLoadStageType
 
         <bool name='doing_mods'/>
         <int32_t name='scroll_position_available_mods'/>
@@ -1654,7 +1518,7 @@
         <stl-vector pointer-type='stl-string' name='available_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='available_mod_header'/>
 
-        <stl-vector pointer-type='stl-string' name='hover_mod_description'/>
+        <compound name='hover_mod_description' type-name='curses_text_boxst'/>
         <stl-string name='last_hover_mod_id'/>
         <int32_t name='last_hover_mod_version'/>
         <int32_t name='last_hover_width'/>
@@ -1671,68 +1535,13 @@
     </struct-type>
 
     <class-type type-name='viewscreen_savegamest' inherits-from='viewscreen'>
-        <stl-string name='unk_1'/>
-        <enum name='cur_step' base-type='int32_t'>
-            <enum-item name='Initializing'/>
-            <enum-item name='CheckingDirectoryStructure'/>
-            <enum-item name='PreliminaryCleaning'/>
-            <enum-item name='OffloadingUnits'/>
-            <enum-item name='OffloadingArt'/>
-            <enum-item name='OpeningFile'/>
-            <enum-item name='CharacterizingRawData'/>
-            <enum-item name='AllocatingSpace'/>
-            <enum-item name='SavingItems'/>
-            <enum-item name='SavingUnits'/>
-            <enum-item name='SavingJobs'/>
-            <enum-item name='SavingSchedules'/>
-            <enum-item name='SavingProjectiles'/>
-            <enum-item name='SavingBuildings'/>
-            <enum-item name='SavingMachines'/>
-            <enum-item name='SavingFlowGuides'/>
-            <enum-item name='SavingEffects'/>
-            <enum-item name='SavingEntities'/>
-            <enum-item name='SavingLocalAnimalPopulations'/>
-            <enum-item name='SavingEvents'/>
-            <enum-item name='SavingMandates'/>
-            <enum-item name='SavingWorkQuotas'/>
-            <enum-item name='SavingWorldEvents'/>
-            <enum-item name='SavingCoinInformation'/>
-            <enum-item name='SavingSquads'/>
-            <enum-item name='SavingFormations'/>
-            <enum-item name='SavingActivities'/>
-            <enum-item name='SavingInteractions'/>
-            <enum-item name='SavingWrittenContent'/>
-            <enum-item name='SavingIdentities'/>
-            <enum-item name='SavingIncidents'/>
-            <enum-item name='SavingCrimes'/>
-            <enum-item name='SavingVehicles'/>
-            <enum-item name='SavingArmies'/>
-            <enum-item name='SavingArmyControllers'/>
-            <enum-item name='SavingTrackingInformation'/>
-            <enum-item name='SavingCulturalIdentities'/>
-            <enum-item name='SavingAgreement'/>
-            <enum-item name='SavingArtForms'/>
-            <enum-item name='SavingOccupations'/>
-            <enum-item name='SavingBeliefSystems'/>
-            <enum-item name='SavingImageSets'/>
-            <enum-item name='SavingDivinationSets'/>
-            <enum-item name='SavingAnnouncements'/>
-            <enum-item name='SavingFortressInformation'/>
-            <enum-item name='SavingWorldInformation'/>
-            <enum-item name='SavingArtifacts'/>
-            <enum-item name='SavingActiveHistoricalFigures'/>
-            <enum-item name='SavingAdventureData'/>
-            <enum-item name='SavingGeneralInformation'/>
-            <enum-item name='ClosingFile'/>
-            <enum-item name='Finishing'/>
-        </enum>
-        <int32_t name='progress' since='v0.40.01'/>
-        <compound type-name='nemesis_offload' name='offload'/>
+        <stl-string name='confirm_string'/>
+        <compound name='saver' type-name='saverst'/>
         <compound type-name='file_compressorst' name='compressor'/>
-        <stl-string/>
-        <stl-string/>
-        <stl-string/>
-        <int32_t/>
+        <stl-string name='folder_name'/>
+        <stl-string name='timeline_name'/>
+        <stl-string name='manual_name'/>
+        <int32_t name='save_type'/> bay12: SaveTypeType, also referenced above
     </class-type>
 
     <enum-type type-name='adventurer_attribute_level' base-type='int32_t'>
@@ -1768,18 +1577,18 @@
         </static-array>
         <int32_t name='quick_entity_id' ref-target='historical_entity'/>
         <int32_t name='entity_population_id'/>
-        <int32_t name='breed_id'/>
+        <int32_t name='breed_id' ref-target='breed'/>
         <int32_t name='cultural_identity_id' ref-target='cultural_identity'/>
         <int32_t name='nemesis_index' ref-target='nemesis_record'/>
-        <int32_t name='start_mil_type'/>
-        <int32_t name='start_civ_type'/>
+        <enum name='start_mil_type' type-name='profession' base-type='int32_t'/> Toady directly used the enum here
+        <enum name='start_civ_type' type-name='profession' base-type='int32_t'/> rather than the matching typedef
         <int16_t name='skill_picks_left'/>
 
         <static-array count='6' name='phys_att_range_val' index-enum='physical_attribute_type'>
-            <enum type-name='adventurer_attribute_level'/>
+            <enum type-name='adventurer_attribute_level' base-type='int32_t'/>
         </static-array>
         <static-array count='13' name='ment_att_range_val' index-enum='mental_attribute_type'>
-            <enum type-name='adventurer_attribute_level'/>
+            <enum type-name='adventurer_attribute_level' base-type='int32_t'/>
         </static-array>
 
         <enum base-type='int16_t' name='difficulty'>
@@ -1790,7 +1599,7 @@
 
         <int32_t name='start_site_id' ref-target='world_site' since='v0.47.01'/>
         <int32_t name='background_start_squad_epp_id' since='v0.47.01'/>
-        <enum type-name='profession' base-type='int16_t' name='background_unit' since='v0.47.01'/>
+        <enum type-name='profession' name='background_unit' since='v0.47.01'/>
         <static-array name='background_skill_bonus' type-name='int32_t' count='149' index-enum='job_skill' since='v0.47.01'/>
 
         <int32_t name='worship_hfid' ref-target='historical_figure'/>
@@ -1805,8 +1614,10 @@
         <compound type-name='unit_personality' name='pers'/>
         <bool name='is_from_wilderpop_or_feature'/>
 
-        <uint32_t name='flag'/>
-        <enum base-type='int32_t' name='sub_mode'>
+        <bitfield name='flag' base-type='uint32_t'> bay12: STARTUP_CHARACTERSHEET_FLAG_*
+            <flag-bit name='receiving_item'/>
+        </bitfield>
+        <enum base-type='int32_t' name='sub_mode'> bay12: SetupAdventureType
             <enum-item name='NONE' value='-1'/>
             <enum-item name='RACE'/>
             <enum-item name='SUBRACE'/>
@@ -1821,7 +1632,7 @@
             <enum-item name='SUB_MOUNTS_AND_PETS'/>
             <enum-item name='FINAL_CONFIRMATION'/>
         </enum>
-        <static-array name='visited_mode' type-name='bool' count='12'/>
+        <static-array name='visited_mode' type-name='bool' count='12' comment='indexed by the above enum'/>
 
         <bool name='selecting_atts'/>
         <int32_t name='selected_att'/>
@@ -1834,30 +1645,30 @@
 
         <bool name='entering_name'/>
         <stl-string name='old_name'/>
-        <stl-vector name='background_text' pointer-type='stl-string'/>
+        <compound name='background_text' type-name='curses_text_boxst'/>
         <stl-vector name='goodsite' pointer-type='world_site'/>
         <int32_t name='active_column'/>
         <stl-vector type-name='adv_background_option_type' name='background_option'/>
         <stl-vector name='background_option_squad_epp_id'>
             <int32_t init-value='-1'/>
         </stl-vector>
-        <stl-vector type-name='int32_t' name='background_option_unit' comment='type should be profession?'/>
-        <stl-vector type-name='int32_t' name='religious_practice_option'/>
-        <stl-vector type-name='int32_t' name='religious_practice_id'/>
+        <stl-vector type-name='profession' name='background_option_unit'/>
+        <stl-vector type-name='religious_practice_type' name='religious_practice_option'/>
+        <stl-vector type-name='religious_practice_data' name='religious_practice_id'/>
         <stl-vector type-name='int32_t' name='pos_caste'/>
         <int32_t name='st_selector'/>
         <int32_t name='bo_selector'/>
         <int32_t name='rp_selector'/>
-        <stl-vector name='background_desc' pointer-type='stl-string'/>
+        <compound name='background_desc' type-name='curses_text_boxst'/>
 
-        <stl-vector name='appearance_text' pointer-type='stl-string'/>
+        <compound name='appearance_text' type-name='curses_text_boxst'/>
         <bool name='appearance_offscreen_randomized'/>
         <bool name='appearance_was_fully_randomized'/>
 
         <int32_t name='pers_scroll_y'/>
-        <stl-vector name='personal_values_text' pointer-type='stl-string'/>
-        <stl-vector name='personality_text' pointer-type='stl-string'/>
-        <stl-vector name='civ_values_text' pointer-type='stl-string'/>
+        <compound name='personal_values_text' type-name='curses_text_boxst'/>
+        <compound name='personality_text' type-name='curses_text_boxst'/>
+        <compound name='civ_values_text' type-name='curses_text_boxst'/>
 
         <bool name='doing_specific_personality'/>
         <int32_t name='selected_specific_pers_item'/>
@@ -1870,11 +1681,11 @@
 
         <int32_t name='selected_i'/>
         <compound type-name='embark_item_choice' name='etl'/>
-        <int16_t name='itype'/>
+        <enum name='itype' type-name='item_type'/>
         <int16_t name='istype'/>
         <int16_t name='imat'/>
         <int32_t name='imatg'/>
-        <stl-vector name='item_desc' pointer-type='stl-string'/>
+        <compound name='item_desc' type-name='curses_text_boxst'/>
 
         <int32_t name='selected_pet_l'/>
         <int32_t name='selected_pet_r'/>
@@ -1903,15 +1714,15 @@
         </stl-vector>
     </struct-type>
 
-    <struct-type type-name='embark_profile'>
+    <struct-type type-name='embark_profile' original-name='embark_profilest'>
         <stl-string name='name'/>
-        <stl-vector name='skill_type' type-name='int16_t'/>
+        <stl-vector name='skill_type' type-name='job_skill'/>
         <stl-vector name='skill_dwarf_idx' type-name='int16_t'/>
         <stl-vector name='skill_level' type-name='int16_t'/>
 
         <stl-vector name='reclaim_dwarf_idx' type-name='int16_t'/>
-        <stl-vector name='reclaim_prof1' type-name='profession'/>
-        <stl-vector name='reclaim_prof2' type-name='profession'/>
+        <stl-vector name='reclaim_prof_soldier' type-name='profession'/>
+        <stl-vector name='reclaim_prof_civilian' type-name='profession'/>
 
         <stl-vector name='item_type' type-name='int16_t'/>
         <stl-vector name='item_subtype' type-name='int16_t'/>
@@ -1925,28 +1736,21 @@
         <stl-vector name='pet_count' type-name='int32_t'/>
     </struct-type>
 
-    <struct-type type-name='embark_symbol'>
-        <stl-vector name='unk_v43_1'/>
-        <stl-vector name='unk_v43_2'/>
-        <int32_t name='unk_v43_3'/>
-        <compound name='unk_v43_4' type-name='language_name'/>
-        <compound name='unk_v43_sub9'>
-            <int32_t name='unk_s1'/>
-            <int16_t name='unk_s2'/>
-            <int32_t name='unk_s3'/>
-            <int16_t name='unk_s4'/>
-            <int32_t name='unk_s5'/>
-            <int32_t name='unk_s6'/>
-            <pointer name='unk_s7'/>
-        </compound>
-        <static-array type-name='int32_t' count='4' comment='uninitialized?' name='unk_v43_10'/>
-    </struct-type>
+    <enum-type type-name='embark_skill_tab_type' base-type='int32_t'> bay12: EmbarkSkillTabType
+        <enum-item name='NONE' value='-1'/>
+        <enum-item name='CRUCIAL'/>
+        <enum-item name='LABOR'/>
+        <enum-item name='COMBAT'/>
+        <enum-item name='OTHER'/>
+    </enum-type>
 
     <class-type type-name='viewscreen_setupdwarfgamest' inherits-from='viewscreen'>
         <static-string size='768' name='title'/>
         <stl-vector name='dwarf_info' pointer-type='setup_character_info'/>
-        <static-array count='4' name='embark_skills'><stl-vector type-name='job_skill'/></static-array>
-        <stl-vector name='reclaim_professions' type-name='profession'/>
+        <static-array count='4' name='embark_skills' index-enum='embark_skill_tab_type'>
+            <stl-vector><enum type-name='job_skill' base-type='int16_t'/></stl-vector>
+        </static-array>
+        <stl-vector name='reclaim_professions'><enum type-name='profession' base-type='int16_t'/></stl-vector>
 
         <int32_t name='preparing_map_timer'/>
         <bool name='preparing_map_timer_quick_start'/>
@@ -1965,7 +1769,7 @@
         <int32_t name='scroll'/>
         <int32_t name='selected_i'/>
 
-        <int32_t name='current_skill_tab'/>
+        <enum name='current_skill_tab' type-name='embark_skill_tab_type'/>
         <bool name='scrolling_skill_list'/>
 
         <int32_t name='selected_sk'/>
@@ -1997,7 +1801,7 @@
         <static-array name='s_item' index-enum='entity_sell_category' count='107'><stl-vector pointer-type='item_actual'/></static-array>
         <static-array name='item_expander_on' index-enum='entity_sell_category' count='107' type-name='bool'/>
         <int32_t name='scroll_position_item'/>
-        <enum name='current_category' type-name='entity_sell_category' base-type='int16_t'/>
+        <enum name='current_category' type-name='entity_sell_category'/>
         <int32_t name='scroll_position_category'/>
         <int32_t name='scroll_position_category_item'/>
         <bool name='scrolling_item'/>
@@ -2019,25 +1823,25 @@
         <int32_t name='points_remaining'/>
 
         Set remotely via pointers:
-        <enum base-type='int16_t' name='add_item_type' type-name='item_type'/>
+        <enum name='add_item_type' type-name='item_type'/>
         <int16_t name='add_item_subtype' refers-to='(item-subtype-target $$._parent.add_item_type $)'/>
         <int16_t name='add_mattype' ref-target='material' aux-value='$$.add_matindex'/>
         <int32_t name='add_matindex'/>
-        <int32_t name='adding_item'/>
+        <uint32_t name='adding_item_flag'/>
     </class-type>
 
     <class-type type-name='viewscreen_choose_game_typest' inherits-from='viewscreen'>
-        <stl-vector type-name="int32_t" name="gametypes"/>
+        <stl-vector type-name="game_type" name="gametypes"/>
     </class-type>
 
-    <enum-type type-name='save_game_sort_type' base-type='int8_t' comment='bay12: SaveGameSort'>
+    <enum-type type-name='save_game_sort_type' base-type='uint8_t'> bay12: SaveGameSort
         <enum-item name='Name'/>
         <enum-item name='Folder'/>
     </enum-type>
 
     <class-type type-name='viewscreen_titlest' inherits-from='viewscreen'>
         <static-string name='str_histories' size='768'/>
-        <static-string size='768'/>
+        <static-string name='str' size='768'/>
 
         <bool name='clean_first'/>
         <int16_t name='mode'/>
@@ -2045,7 +1849,7 @@
         <int32_t name='selected_r'/>
         <int8_t name='game_start_proceed'/>
         <stl-vector name="menu_line_id">
-            <enum base-type="int32_t" name="menu_line_id">
+            <enum name="menu_line_id"> bay12: MainChoice
                 <enum-item name="Continue"/>
                 <enum-item name="Start"/>
                 <enum-item name="NewWorld"/>
@@ -2090,16 +1894,15 @@
         <stl-vector pointer-type='mod_headerst' name='mod'/>
         <int32_t name='scroll_position_mods'/>
         <bool name='scrolling_mods'/>
-        <stl-vector pointer-type='stl-string' name='hover_mod_description'/>
+        <compound name='hover_mod_description' type-name='curses_text_boxst'/>
         <stl-string name='last_hover_mod_id'/>
         <int32_t name='last_hover_mod_version'/>
         <int32_t name='last_hover_width'/>
 
-        -- begin Steam Specific
         <bool name='uploading_mods'/>
         <int32_t name='scroll_position_upload_mods'/>
         <bool name='scrolling_upload_mods'/>
-        <stl-vector pointer-type='stl-string' name='hover_upload_mod_description'/>
+        <compound name='hover_upload_mod_description' type-name='curses_text_boxst'/>
         <stl-string name='last_hover_upload_mod_id'/>
         <int32_t name='last_hover_upload_mod_version'/>
         <int32_t name='last_hover_upload_width'/>
@@ -2121,7 +1924,7 @@
         <int32_t name='year_tick'/>
     </class-type>
 
-    <enum-type type-name='world_view_mode_type' base-type='int32_t'>
+    <enum-type type-name='world_view_mode_type' base-type='int32_t'> bay12: WorldViewModeType
         <enum-item name='NONE' value='-1'/>
         <enum-item name='NORMAL'/>
         <enum-item name='CIVILIZATIONS'/>
@@ -2133,6 +1936,62 @@
         <enum-item name='ARTIFACTS'/>
     </enum-type>
 
+    <struct-type type-name='region_snapshotst'>
+        <int32_t name='year'/>
+        <compound name='territory' type-name='entity_territoryst'/>
+        <stl-vector name='site_id' type-name='int32_t' ref-target='world_site'/>
+        <stl-vector name='site_population' type-name='int32_t'/>
+    </struct-type>
+
+    <struct-type type-name='region_print_datast'>
+        <pointer name='rss' type-name='region_snapshotst'/>
+        <bitfield name='flags' base-type='uint32_t'> bay12: REGION_PRINT_DATA_FLAG_*
+            <flag-bit name='use_territory'/>
+            <flag-bit name='use_territory_civs'/>
+            <flag-bit name='use_site_info'/>
+            <flag-bit name='use_notes'/>
+            <flag-bit name='use_find_results'/>
+            <flag-bit name='show_embark_restrictions'/>
+            <flag-bit name='show_cliffs'/>
+            <flag-bit name='show_elevation'/>
+        </bitfield>
+        <int32_t name='relevant_id'/>
+        <pointer name='highlight_civ_id'><stl-vector type-name='int32_t' ref-target='historical_entity'/></pointer>
+        <pointer name='mission_report' type-name='mission_report'/>
+        <int32_t name='mission_path_data_index'/>
+        <int32_t name='mission_path_data_path_index'/>
+        <pointer name='indicator_data' type-name='rpd_indicator_datast'/>
+        <static-array name='legend_entity_id' type-name='int32_t' count='50' ref-target='historical_entity'/>
+        <int32_t name='legend_entity_id_num'/>
+        <int32_t name='mm_cent_x'/>
+        <int32_t name='mm_cent_y'/>
+        <int32_t name='embark_rectangle_sx'/>
+        <int32_t name='embark_rectangle_ex'/>
+        <int32_t name='embark_rectangle_sy'/>
+        <int32_t name='embark_rectangle_ey'/>
+        <static-array type-name='int32_t' count='22' index-enum='FindSiteParamType'/>
+        <pointer name='find_metal_ore'><stl-vector type-name='int16_t' ref-target='inorganic_raw'/></pointer>
+        <pointer name='skip_metal_ore'><stl-vector type-name='int16_t' ref-target='inorganic_raw'/></pointer>
+        <int32_t name='highlight_site_id' ref-target='world_site'/>
+    </struct-type>
+
+    <struct-type type-name='rpd_indicator_datast'>
+        <static-array name='line_s_xy' count='1000'><int32_t name='x'/><int32_t name='y'/></static-array>
+        <static-array name='line_e_xy' count='1000'><int32_t name='x'/><int32_t name='y'/></static-array>
+        <static-array name='line_char' type-name='uint8_t' count='1000'/>
+        <static-array name='line_f' type-name='uint8_t' count='1000'/>
+        <static-array name='line_b' type-name='uint8_t' count='1000'/>
+        <static-array name='line_br' type-name='uint8_t' count='1000'/>
+        <int32_t name='line_num'/>
+
+        <static-array name='marker_xy' count='1000'><int32_t name='x'/><int32_t name='y'/></static-array>
+        <static-array name='marker_char' type-name='int8_t' count='1000'/>
+        <static-array name='marker_f' type-name='int8_t' count='1000'/>
+        <static-array name='marker_b' type-name='int8_t' count='1000'/>
+        <static-array name='marker_br' type-name='int8_t' count='1000'/>
+        <int32_t name='marker_num'/>
+    </struct-type>
+
     <class-type type-name='viewscreen_worldst' inherits-from='viewscreen'>
         <int32_t name='region_cent_x'/>
         <int32_t name='region_cent_y'/>
@@ -2142,7 +2001,7 @@
         <int32_t name='mouse_anchor_pmx'/>
         <int32_t name='mouse_anchor_pmy'/>
 
-        <enum base-type='int32_t' name='view_mode' type-name='world_view_mode_type'/>
+        <enum name='view_mode' type-name='world_view_mode_type'/>
 
         <pointer type-name='historical_figure' name='military_goals_hf'/>
         <pointer type-name='historical_figure' name='meet_workers_hf'/>
@@ -2159,7 +2018,7 @@
         <pointer type-name='historical_entity' name='last_hover_ent'/>
         <stl-vector pointer-type='nemesis_record' name='relnem'/>
         <stl-vector type-name='int32_t' name='relnem_precedence'/>
-        <stl-vector name='relag' comment='civ_agreementst'/>
+        <stl-vector name='relag' pointer-type='meeting_event'/>
         <stl-vector type-name='int8_t' name='relag_pending'/>
         <int32_t name='scroll_position_civlist'/>
         <bool name='scrolling_civlist'/>
@@ -2183,47 +2042,13 @@
         <stl-vector pointer-type='nemesis_record' name='request_nem'/>
         <int32_t name='scroll_position_request_nem'/>
         <bool name='scrolling_request_nem'/>
-        <stl-vector name='rumor_master'/>
-        <compound name='rumor_rpd' comment='region_print_datast'>
-            <pointer/>
-            <int32_t/>
-            <int32_t/>
-            <pointer/>
-            <pointer/>
-            <int32_t/>
-            <int32_t/>
-            <pointer/>
-            <static-array type-name='int8_t' count='200'/>
-            <int32_t/>
-            <static-array type-name='int8_t' count='8'/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <int32_t/>
-            <static-array type-name='int8_t' count='92'/>
-            <pointer/>
-            <pointer/>
-            <int32_t/>
-        </compound>
-        <compound name='rumor_rpd_indicator_data' comment='rpd_indicator_datast'>
-            <static-array count='1000'><int32_t name='a'/><int32_t name='b'/></static-array>
-            <static-array count='1000'><int32_t name='a'/><int32_t name='b'/></static-array>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <int32_t/>
-            <static-array count='1000'><int32_t name='a'/><int32_t name='b'/></static-array>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <static-array type-name='int8_t' count='1000'/>
-            <int32_t/>
-        </compound>
+        <stl-vector name='rumor_master' pointer-type='entity_event'/>
+        <compound name='rumor_rpd' type-name='region_print_datast'/>
+        <compound name='rumor_rpd_indicator_data' type-name='rpd_indicator_datast'/>
         <int32_t name='last_hover_rumor_x'/>
         <int32_t name='last_hover_rumor_y'/>
         <bool name='focused_on_last_hover_rumor'/>
-        <stl-vector pointer-type='stl-string' name='rumor_text'/>
+        <compound name='rumor_text' type-name='curses_text_boxst'/>
         <int32_t name='scroll_position_rumor'/>
         <bool name='scrolling_rumor'/>
 
@@ -2232,14 +2057,14 @@
         <int32_t name='croll_position_report'/>
         <bool name='scrolling_report'/>
 
-        <pointer name='active_mission_report' comment='mission_reportst'/>
+        <pointer name='active_mission_report' type-name='mission_report'/>
         <int32_t name='mission_cursor_x'/>
         <int32_t name='mission_cursor_y'/>
         <int32_t name='mission_path_data_index'/>
         <int32_t name='mission_path_data_path_index'/>
         <int32_t name='mission_heid_data_index'/>
         <int32_t name='mission_heid_data_heid_index'/>
-        <stl-vector pointer-type='stl-string' name='mission_text_box'/>
+        <compound name='mission_text_box' type-name='curses_text_boxst'/>
         <stl-vector type-name='int32_t' name='mission_text_box_color'/>
         <int32_t name='mission_timer_year'/>
         <int32_t name='mission_timer_season_count'/>
@@ -2250,7 +2075,7 @@
         <int32_t name='scroll_position_mission'/>
         <bool name='scrolling_mission'/>
 
-        <pointer name='active_tribute_report' comment='tribute_reportst'/>
+        <pointer name='active_tribute_report' type-name='spoils_report'/>
         <int32_t name='scroll_position_tribute'/>
         <bool name='scrolling_tribute'/>
 
@@ -2264,48 +2089,52 @@
         <int32_t name='scroll_position_artifacts'/>
         <bool name='scrolling_artifacts'/>
         <pointer type-name='artifact_record' name='last_hover_artifact'/>
-        <stl-vector pointer-type='stl-string' name='artifact_description'/>
-        <pointer comment='entity_artifact_claimst' name='artifact_eac'/>
+        <compound name='artifact_description' type-name='curses_text_boxst'/>
+        <pointer type-name='artifact_claim' name='artifact_eac'/>
         <pointer type-name='historical_figure' name='artifact_rpa_holder'/>
         <pointer type-name='historical_figure' name='artifact_fac_holder'/>
     </class-type>
 
     <class-type type-name='viewscreen_new_arenast' inherits-from='viewscreen'>
-        <int8_t name='unk_88'/>
+        <bool name='raw_load'/>
         <int32_t name='progress'/>
-        <int32_t name='cur_step'/>
-        <int32_t name='unk_94'/>
-        <int32_t name='unk_98'/>
-        <int32_t name='unk_9c'/>
-        <int32_t name='unk_a0'/>
-        <int32_t name='unk_a4'/>
-        <int32_t name='unk_a8'/>
-        <int32_t name='unk_ac'/>
-        <stl-vector pointer-type='stl-string' name='unk_b0'/>
-        <stl-vector type-name='int32_t' name='unk_c8'/>
-        <stl-vector type-name='int32_t' name='unk_e0'/>
-        <stl-vector pointer-type='stl-string' name='unk_f8'/>
-        <stl-vector pointer-type='stl-string' name='unk_110'/>
-        <stl-vector pointer-type='stl-string' name='unk_128'/>
-        <stl-vector pointer-type='mod_headerst' name='unk_mods'/>
-        <stl-vector pointer-type='stl-string' name='unk_158'/>
-        <stl-vector type-name='int32_t' name='unk_170'/>
-        <stl-vector type-name='int32_t' name='unk_188'/>
-        <stl-vector pointer-type='stl-string' name='unk_1a0'/>
-        <stl-vector pointer-type='stl-string' name='unk_1b8'/>
-        <stl-vector pointer-type='stl-string' name='unk_1d0'/>
-        <stl-vector pointer-type='mod_headerst' name='unk_mods2'/>
-        <stl-vector pointer-type='stl-string' name='unk_200'/>
-        <stl-vector type-name='int32_t' name='unk_218'/>
-        <stl-vector type-name='int32_t' name='unk_230'/>
-        <stl-vector pointer-type='stl-string' name='unk_248'/>
-        <stl-vector pointer-type='stl-string' name='unk_260'/>
-        <stl-vector name='unk_278'/>
-        <stl-vector name='unk_290'/>
-        <stl-vector pointer-type='stl-string' name='unk_2a8'/>
-        <stl-string name='unk_2c0'/>
-        <int32_t name='unk_2e0'/>
-        <int32_t name='unk_2e4'/>
+        <int32_t name='cur_step'/> bay12: NewRegionRawLoadStage
+        <int32_t name='scroll_position_arena_profile'/>
+        <bool name='scrolling_arena_profile'/>
+        <bool name='doing_mods'/>
+        <int32_t name='scroll_position_available_mods'/>
+        <bool name='scrolling_available_mods'/>
+        <int32_t name='scroll_position_selected_mods'/>
+        <bool name='scrolling_selected_mods'/>
+
+        <stl-vector pointer-type='stl-string' name='base_available_id'/>
+        <stl-vector type-name='int32_t' name='base_available_numeric_version'/>
+        <stl-vector type-name='int32_t' name='base_available_earliest_compat_numeric_version'/>
+        <stl-vector pointer-type='stl-string' name='base_available_src_dir'/>
+        <stl-vector pointer-type='stl-string' name='base_available_name'/>
+        <stl-vector pointer-type='stl-string' name='base_available_displayed_version'/>
+        <stl-vector pointer-type='mod_headerst' name='base_available_mod_header'/>
+
+        <stl-vector pointer-type='stl-string' name='object_load_order_id'/>
+        <stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
+        <stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
+        <stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
+        <stl-vector pointer-type='stl-string' name='object_load_order_name'/>
+        <stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
+        <stl-vector pointer-type='mod_headerst' name='object_load_order_mod_header'/>
+
+        <stl-vector pointer-type='stl-string' name='available_id'/>
+        <stl-vector type-name='int32_t' name='available_numeric_version'/>
+        <stl-vector type-name='int32_t' name='available_earliest_compat_numeric_version'/>
+        <stl-vector pointer-type='stl-string' name='available_src_dir'/>
+        <stl-vector pointer-type='stl-string' name='available_name'/>
+        <stl-vector pointer-type='stl-string' name='available_displayed_version'/>
+        <stl-vector pointer-type='mod_headerst' name='available_mod_header'/>
+
+        <compound name='hover_mod_description' type-name='curses_text_boxst'/>
+        <stl-string name='last_hover_mod_id'/>
+        <int32_t name='last_hover_mod_version'/>
+        <int32_t name='last_hover_width'/>
     </class-type>
 
 </data-definition>
diff --git a/df.world-data.xml b/df.world-data.xml
index 44bc48d93..4b60edfff 100644
--- a/df.world-data.xml
+++ b/df.world-data.xml
@@ -798,7 +798,7 @@
     <struct-type type-name='world_data' original-name='regionst'>
         <compound name='name' type-name='language_name' comment='name of the world'/>
 
-        <static-array name='permission' count='15' type-name='int8_t'/>
+        <static-array name='permission' count='15' type-name='int8_t' index-enum='region_permission_type'/>
 
         <int32_t name='next_site_id'/>
         <int32_t name='next_resource_pile_id'/>
diff --git a/df.world.xml b/df.world.xml
index c3df47358..321c811d7 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -1351,7 +1351,7 @@
             <int32_t name='lph_num'/>
             <int32_t name='wk'/>
             <compound name='text_box' type-name='markup_text_boxst'/>
-            <long name='last_chronicle_add_time'/>
+            <ulong name='last_chronicle_add_time'/>
             <int32_t name='last_event_id_added'/>
         </compound>
 

From 186ec78df36a0328e92516bcaa09ee010afcb29f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 8 Jun 2024 12:34:32 -0700
Subject: [PATCH 2/5] cannot compile type again

should we factor those out into separate compounds?
---
 df.ui-menus.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index c964f765c..abc7141c9 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -2513,9 +2513,7 @@
         <compound name='minimap'> bay12: minimapst
             -- Abstract representation of contents; updated by need_scan
             <static-array name='minimap' count='24'>
-                <static-array count='15'> bay12: minimap_squarest
-                    <enum name='type' type-name='minimap_tile'/>
-                </static-array>
+                <static-array count='15' type-name='minimap_tile'/> bay12: minimap_squarest
             </static-array>
 
             <int8_t name='update'/>

From e5a9730a4ae39b276de4cbf727f884c2af5a05ab Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 8 Jun 2024 12:35:10 -0700
Subject: [PATCH 3/5] fix type name

---
 df.viewscreen.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 9e88a3039..abf47546f 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -1969,7 +1969,7 @@
         <int32_t name='embark_rectangle_ex'/>
         <int32_t name='embark_rectangle_sy'/>
         <int32_t name='embark_rectangle_ey'/>
-        <static-array type-name='int32_t' count='22' index-enum='FindSiteParamType'/>
+        <static-array type-name='int32_t' count='22' index-enum='embark_finder_option'/>
         <pointer name='find_metal_ore'><stl-vector type-name='int16_t' ref-target='inorganic_raw'/></pointer>
         <pointer name='skip_metal_ore'><stl-vector type-name='int16_t' ref-target='inorganic_raw'/></pointer>
         <int32_t name='highlight_site_id' ref-target='world_site'/>

From cb1968c577b1606d2f1625918db1cdb369e962ce Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 8 Jun 2024 22:27:31 -0700
Subject: [PATCH 4/5] add in stringentry flags

---
 df.viewscreen.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index abf47546f..db0dd0b2b 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -282,7 +282,15 @@
 
     <class-type type-name='widget_textbox' original-name='widgets::textbox' inherits-from='widget'>
         <stl-string name='str'/>
-        <uint32_t name='flags'/>
+        <bitfield name='flags' base-type='uint32_t'> bay12: STRINGENTRY_*
+            <flag-bit name='LETTERS'/>
+            <flag-bit name='SPACE'/>
+            <flag-bit name='NUMBERS'/>
+            <flag-bit name='CAPS'/>
+            <flag-bit name='SYMBOLS'/>
+            <flag-bit name='FILENAME'/>
+            <flag-bit name='REMOVEKEYS'/>
+        </bitfield-type>
         <stl-function name='callback' comment='arguments are textbox*'/>
         <int16_t name='fg'/>
         <int16_t name='bg'/>

From 481720e036285b17ef2d6e025fb97b6f53b43665 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 8 Jun 2024 22:39:06 -0700
Subject: [PATCH 5/5] fix typo

---
 df.viewscreen.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index db0dd0b2b..fe08fafef 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -290,7 +290,7 @@
             <flag-bit name='SYMBOLS'/>
             <flag-bit name='FILENAME'/>
             <flag-bit name='REMOVEKEYS'/>
-        </bitfield-type>
+        </bitfield>
         <stl-function name='callback' comment='arguments are textbox*'/>
         <int16_t name='fg'/>
         <int16_t name='bg'/>