diff --git a/df.advmode.xml b/df.advmode.xml
index 79f6ce10..7ac5102a 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -791,6 +791,7 @@
             <enum-item name='SUBSEQUENT_PROCESSING'/>
             <enum-item name='MOVE_UNIT_PROCESSING'/>
             <enum-item name='FINAL_PROCESSING'/>
+            <enum-item name='TAKING_TOO_LONG_INPUT'/>
         </enum>
         <int8_t name='item_projectiles_state' comment='Observed to be set to 1 when an item is thrown or fired, or a limb is sent flying after being severed off. Over a number of frames (dependent on the distance travelled by the projectile) this eventually changes to 2 and then finally back to 0 (a number of frames after the projectile has reached its final destination). Sometimes (seemingly when the distance travelled is long) it changes from 1 to 2 and back to 1 immediately midway into this process. The player_control_state is set to 2 until this is complete. Forcing a constant item_projectiles_state of 0 causes item projectiles to hang in the air.'/>
         <uint32_t name='projsubloop_last_visible_animation_tick'/>
@@ -865,6 +866,9 @@
         <int16_t name='careful_direction_x' comment='x-axis direction for the last attempted careful player unit movement: -1 = west, 0 = none, 1 = east'/>
         <int16_t name='careful_direction_y' comment='y-axis direction for the last attempted careful player unit movement: -1 = north, 0 = none, 1 = south'/>
         <stl-string name='interrupt_performance_warning' comment='the message displayed when the player attempts to move while their unit is performing'/>
+        <int32_t name='last_took_input_year'/>
+        <int32_t name='last_took_input_season_count'/>
+        <int32_t name='last_took_input_precise_phase'/>
     </struct-type>
 
     <enum-type type-name='combat_animation_swish_type' base-type='int32_t'> bay12: CombatAnimationSwishType
diff --git a/df.building-vectors.xml b/df.building-vectors.xml
index 860d5c3c..7375e1fd 100644
--- a/df.building-vectors.xml
+++ b/df.building-vectors.xml
@@ -39,7 +39,10 @@
             <item-attr name='building' value='Civzone'/>
             <item-attr name='civzone' value='NobleQuarters'/>
         </enum-item>
-        <enum-item name='ZONE_INVALID4'/>
+        <enum-item name='ZONE_SHOP'>
+            <item-attr name='building' value='Civzone'/>
+            <item-attr name='civzone' value='Shop'/>
+        </enum-item>
         <enum-item name='ZONE_INVALID5'/>
         <enum-item name='ZONE_INVALID6'/>
         <enum-item name='ZONE_MEAD_HALL'>
@@ -777,7 +780,7 @@
         <stl-vector name='ZONE_DEPOT' pointer-type='building_civzonest'/>
         <stl-vector name='ZONE_STOCKPILE' pointer-type='building_civzonest'/>
         <stl-vector name='ZONE_NOBLE_QUARTERS' pointer-type='building_civzonest'/>
-        <stl-vector name='ZONE_INVALID4' pointer-type='building_civzonest'/>
+        <stl-vector name='ZONE_SHOP' pointer-type='building_civzonest'/>
         <stl-vector name='ZONE_INVALID5' pointer-type='building_civzonest'/>
         <stl-vector name='ZONE_INVALID6' pointer-type='building_civzonest'/>
         <stl-vector name='ZONE_MEAD_HALL' pointer-type='building_civzonest'/>
diff --git a/df.buildings.xml b/df.buildings.xml
index 11d36d5e..65ddd6e5 100644
--- a/df.buildings.xml
+++ b/df.buildings.xml
@@ -589,7 +589,7 @@
         <enum-item name="Depot"/>
         <enum-item name="Stockpile"/>
         <enum-item name="NobleQuarters"/>
-        <enum-item/> Invalid Type
+        <enum-item name="Shop"/>
         <enum-item/> Invalid Type
         <enum-item/> Invalid Type
         <enum-item name="MeadHall"/>
diff --git a/df.ui.xml b/df.ui.xml
index e6573f20..971cbb86 100644
--- a/df.ui.xml
+++ b/df.ui.xml
@@ -379,6 +379,7 @@
             <flag-bit name='major_victory'/>
             <flag-bit name='did_first_caravan_announcement'/>
             <flag-bit name='did_first_cavern_announcement' comment='required for CAVERNS_OPENED music context'/>
+            <flag-bit name='did_first_ghost_announcement'/>
         </bitfield>
         <int16_t name='mood_cooldown'/>
 
diff --git a/df.units.xml b/df.units.xml
index 4d43470e..1b0d7de3 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -1832,6 +1832,7 @@
         -- 80 --
         <enum-item name='DidInteractionAnnouncementReduceDizzness'/>
         <enum-item name='HaveCheckedFavorDodge'/>
+        <enum-item name='DidStrainExhaustionKO'/>
     </enum-type>
 
     <struct-type type-name='unit_misc_trait' original-name='counterst'>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 43853623..82aa6c26 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -1821,6 +1821,25 @@
         <int16_t name='type'/>
     </struct-type>
 
+    <struct-type type-name='character_archetypest'>
+        <stl-string name='name'/>
+        <int16_t name='name_by_skill'/>
+        <stl-vector name='primary_skill' type-name='int16_t'/>
+        <stl-vector name='secondary_skill' type-name='int16_t'/>
+        <stl-vector name='tertiary_skill' type-name='int16_t'/>
+        <static-array count='6' name='phys_att_range_val' index-enum='physical_attribute_type'>
+            <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' base-type='int32_t'/>
+        </static-array>
+        <int32_t name='att_points'/>
+        <static-array name='skilllevel' count='149' index-enum='job_skill'>
+            <enum type-name='skill_rating'/>
+        </static-array>
+        <int32_t name='ip'/>
+    </struct-type>
+
     <enum-type type-name='adv_background_option_type' base-type='int32_t'>
         <enum-item name='NONE' value='-1'/>
         <enum-item name='SQUAD_EPPID'/>
@@ -1844,7 +1863,7 @@
         <enum-item name='FINAL_CONFIRMATION'/>
     </enum-type>
 
-    <struct-type type-name='setup_character_info' comment='startup_charactersheetst'>
+    <struct-type type-name='setup_character_info' comment='bay12: startup_charactersheetst'>
         <compound type-name='language_name' name='name'/>
         <int16_t name='race' ref-target='creature_raw'/>
         <int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
@@ -1894,6 +1913,7 @@
         <enum type-name='setup_adventure_type' name='sub_mode'/>
         <static-array name='visited_mode' type-name='bool' count='12' index-enum='setup_adventure_type'/>
 
+        <bool name='customizing_skills'/>
         <int32_t name='selected_att'/>
         <bool name='scrolling_att'/>
         <int32_t name='selected_skill'/>
@@ -1903,6 +1923,10 @@
             <enum base-type='int16_t' type-name='job_skill'/>
         </stl-vector>
         <int32_t name='ip'/>
+        <stl-vector name='archetype' pointer-type='character_archetypest'/>
+        <int32_t name='selected_archetype'/>
+        <int32_t name='scroll_archetype'/>
+        <bool name='scrolling_archetype'/>
 
         <bool name='entering_name'/>
         <stl-string name='old_name'/>
@@ -2055,6 +2079,8 @@
         <bool name='chosen_is_from_wilderpop_or_feature'/>
         <compound name='race_desc' type-name='curses_text_boxst'/>
         <int32_t name='race_desc_index'/>
+        <compound name='civ_desc' type-name='curses_text_boxst'/>
+        <int32_t name='civ_desc_id'/>
         <int32_t name='sheet_page'/>
 
         <stl-vector type-name='int32_t' name='valid_race'/>
@@ -2081,6 +2107,12 @@
         <stl-vector pointer-type='setup_character_info' name='csheet'/>
         <int32_t name='active_sheet_index'/>
         <stl-vector type-name='int32_t' name='item_tab_order'/>
+        <compound name='tooltip_phys_att_box' type-name='curses_text_boxst'/>
+        <int32_t name='tooltip_phys_att_box_index'/>
+        <compound name='tooltip_ment_att_box' type-name='curses_text_boxst'/>
+        <int32_t name='tooltip_ment_att_box_index'/>
+        <compound name='tooltip_skill_box' type-name='curses_text_boxst'/>
+        <int32_t name='tooltip_skill_box_index'/>
 
         <stl-vector type-name='int32_t' name='final_start_site_id_cand'/>
         <int32_t name='selected_final_start_site_index'/>