diff --git a/scripts/export-dt-ini.lua b/scripts/export-dt-ini.lua
index 01ed7b10a..df4e43338 100644
--- a/scripts/export-dt-ini.lua
+++ b/scripts/export-dt-ini.lua
@@ -362,7 +362,7 @@ address('traits',df.unit_personality,'traits')
 address('stress_level',df.unit_personality,'stress_level')
 
 header('emotion_offsets')
-address('emotion_type',df.unit_personality.T_emotions,'emotion_type')
+address('emotion_type',df.unit_personality.T_emotions,'type')
 address('strength',df.unit_personality.T_emotions,'strength')
 address('thought_id',df.unit_personality.T_emotions,'thought')
 address('sub_id',df.unit_personality.T_emotions,'subthought')
diff --git a/share/memory_layouts/osx/v0.40.19_osx.ini b/share/memory_layouts/osx/v0.40.19_osx.ini
new file mode 100644
index 000000000..4c9230925
--- /dev/null
+++ b/share/memory_layouts/osx/v0.40.19_osx.ini
@@ -0,0 +1,392 @@
+[info]
+checksum=0x21bff111
+version_name=v0.40.19 osx
+complete=true
+
+[addresses]
+translation_vector=0x019bae98
+language_vector=0x019bae80
+creature_vector=0x018c130c
+active_creature_vector=0x018c1318
+dwarf_race_index=0x018a4f74
+squad_vector=0x019b63d0
+current_year=0x018a2a40
+cur_year_tick=0x018a2a48
+dwarf_civ_index=0x018a4f68
+races_vector=0x019bacb4
+reactions_vector=0x019bf248
+events_vector=0x019c0738
+historical_figures_vector=0x019c0750
+fake_identities_vector=0x019b783c
+fortress_entity=0x018a9a40
+historical_entities_vector=0x018ada70
+itemdef_weapons_vector=0x019bacf4
+itemdef_trap_vector=0x019bad00
+itemdef_toy_vector=0x019bad0c
+itemdef_tool_vector=0x019bad18
+itemdef_instrument_vector=0x019badfc
+itemdef_armor_vector=0x019bae08
+itemdef_ammo_vector=0x019bae14
+itemdef_siegeammo_vector=0x019bae20
+itemdef_glove_vector=0x019bae2c
+itemdef_shoe_vector=0x019bae38
+itemdef_shield_vector=0x019bae44
+itemdef_helm_vector=0x019bae50
+itemdef_pant_vector=0x019bae5c
+itemdef_food_vector=0x019bae68
+colors_vector=0x019bf224
+shapes_vector=0x019bf230
+base_materials=0x019bf7bc
+inorganics_vector=0x019bac00
+plants_vector=0x019bac18
+material_templates_vector=0x019babf4
+all_syndromes_vector=0x019c022c
+world_data=0x019ba4d0
+active_sites_vector=0x00048200
+world_site_type=0x0044
+weapons_vector=0x018c13b8
+shields_vector=0x018c1400
+quivers_vector=0x018c1424
+crutches_vector=0x018c1448
+backpacks_vector=0x018c1454
+ammo_vector=0x018c1460
+flasks_vector=0x018c15b0
+pants_vector=0x018c191c
+armor_vector=0x018c194c
+shoes_vector=0x018c1958
+helms_vector=0x018c1964
+gloves_vector=0x018c1970
+artifacts_vector=0x018c19c4
+
+[offsets]
+word_table=0x001c
+string_buffer_offset=0x0000
+
+[word_offsets]
+base=0x0000
+noun_singular=0x0004
+noun_plural=0x0008
+adjective=0x000c
+verb=0x0014
+present_simple_verb=0x0018
+past_simple_verb=0x001c
+past_participle_verb=0x0020
+present_participle_verb=0x0024
+words=0x0008
+word_type=0x0024
+language_id=0x0034
+
+[general_ref_offsets]
+ref_type=0x0008
+artifact_id=0x0004
+item_id=0x0004
+
+[race_offsets]
+name_singular=0x0004
+name_plural=0x0008
+adjective=0x000c
+baby_name_singular=0x0010
+baby_name_plural=0x0014
+child_name_singular=0x0018
+child_name_plural=0x001c
+pref_string_vector=0x0048
+castes_vector=0x0060
+pop_ratio_vector=0x006c
+materials_vector=0x1d2c
+flags=0x0078
+tissues_vector=0x1d38
+
+[caste_offsets]
+caste_name=0x0004
+caste_descr=0x0044
+caste_trait_ranges=0x01a8
+caste_phys_att_ranges=0x0b5c
+baby_age=0x00ec
+child_age=0x00f0
+adult_size=0x0104
+flags=0x02d4
+body_info=0x02e0
+skill_rates=0x03fc
+caste_att_rates=0x0d70
+caste_att_caps=0x0ea0
+shearable_tissues_vector=0x0f98
+extracts=0x13bc
+
+[hist_entity_offsets]
+beliefs=0x0688
+squads=0x0884
+positions=0x0800
+assignments=0x0828
+assign_hist_id=0x0004
+assign_position_id=0x000c
+position_id=0x0004
+position_name=0x0040
+position_female_name=0x0048
+position_male_name=0x0050
+
+[hist_figure_offsets]
+hist_race=0x0002
+hist_name=0x0038
+id=0x0094
+hist_fig_info=0x00c0
+reputation=0x002c
+current_ident=0x0018
+fake_name=0x0004
+fake_birth_year=0x0050
+fake_birth_time=0x0054
+kills=0x0018
+killed_race_vector=0x000c
+killed_undead_vector=0x0048
+killed_counts_vector=0x0054
+
+[hist_event_offsets]
+event_year=0x0004
+id=0x0014
+killed_hist_id=0x0018
+
+[item_offsets]
+item_def=0x00a4
+id=0x0018
+general_refs=0x0028
+stack_size=0x005c
+wear=0x0070
+mat_type=0x0080
+mat_index=0x0084
+quality=0x008a
+
+[item_subtype_offsets]
+sub_type=0x0008
+name=0x0024
+name_plural=0x0028
+adjective=0x002c
+
+[item_filter_offsets]
+item_subtype=0x0002
+mat_class=0x0004
+mat_type=0x0006
+mat_index=0x0008
+
+[weapon_subtype_offsets]
+single_size=0x0040
+multi_size=0x0044
+ammo=0x003c
+melee_skill=0x0038
+ranged_skill=0x003a
+
+[armor_subtype_offsets]
+layer=0x0008
+mat_name=0x0030
+other_armor_level=0x0034
+armor_adjective=0x0034
+armor_level=0x003c
+chest_armor_properties=0x0048
+pants_armor_properties=0x0050
+other_armor_properties=0x0044
+
+[material_offsets]
+solid_name=0x0044
+liquid_name=0x0048
+gas_name=0x004c
+powder_name=0x0050
+paste_name=0x0054
+pressed_name=0x0058
+flags=0x00c8
+inorganic_materials_vector=0x00c8
+inorganic_flags=0x0010
+
+[plant_offsets]
+name=0x001c
+name_plural=0x0020
+name_leaf_plural=0x0034
+name_seed_plural=0x002c
+materials_vector=0x0148
+flags=0x0014
+
+[descriptor_offsets]
+color_name=0x001c
+shape_name_plural=0x0020
+
+[health_offsets]
+parent_id=0x0008
+layers_vector=0x0014
+number=0x0034
+names_vector=0x003c
+names_plural_vector=0x0048
+layer_tissue=0x0004
+layer_global_id=0x0034
+tissue_name=0x000c
+tissue_flags=0x0004
+
+[dwarf_offsets]
+first_name=0x0000
+nick_name=0x0004
+last_name=0x0008
+custom_profession=0x003c
+profession=0x0040
+race=0x0044
+flags1=0x008c
+flags2=0x0090
+flags3=0x0094
+caste=0x00a4
+sex=0x00a6
+id=0x00a8
+animal_type=0x00b0
+civ=0x00b8
+specific_refs=0x00f4
+squad_id=0x010c
+squad_position=0x0110
+recheck_equipment=0x015c
+mood=0x01e4
+birth_year=0x0204
+birth_time=0x0208
+pet_owner_id=0x022c
+current_job=0x02ec
+physical_attrs=0x039c
+body_size=0x0474
+size_info=0x0444
+curse=0x054c
+curse_add_flags1=0x0538
+turn_count=0x05b4
+souls=0x066c
+states=0x05fc
+labors=0x0688
+hist_id=0x0750
+artifact_name=0x0630
+active_syndrome_vector=0x0798
+syn_sick_flag=0x0030
+unit_health_info=0x07f8
+temp_mood=0x0524
+counters1=0x050c
+counters2=0x0528
+counters3=0x05d0
+limb_counters=0x0758
+blood=0x045c
+body_component_info=0x02fc
+layer_status_vector=0x0024
+wounds_vector=0x035c
+mood_skill=0x02f0
+used_items_vector=0x07fc
+affection_level=0x000c
+inventory=0x027c
+inventory_item_mode=0x0004
+inventory_item_bodypart=0x0006
+
+[syndrome_offsets]
+cie_effects=0x0004
+cie_end=0x0014
+cie_first_perc=0x005c
+cie_phys=0x0074
+cie_ment=0x0090
+syn_classes_vector=0x0058
+trans_race_id=0x0068
+
+[unit_wound_offsets]
+parts=0x0004
+id=0x0004
+layer=0x0006
+general_flags=0x001c
+flags1=0x003c
+flags2=0x0040
+effects_vector=0x002c
+bleeding=0x0044
+pain=0x0048
+cur_pen=0x0064
+max_pen=0x0066
+
+[soul_details]
+name=0x0004
+orientation=0x0048
+mental_attrs=0x006c
+skills=0x01d8
+preferences=0x01e4
+personality=0x01f0
+beliefs=0x0000
+emotions=0x0018
+goals=0x0024
+goal_realized=0x0018
+traits=0x0040
+stress_level=0x00c4
+
+[emotion_offsets]
+emotion_type=0x0000
+strength=0x0008
+thought_id=0x000c
+sub_id=0x0010
+level=0x0014
+year=0x0020
+year_tick=0x0024
+
+[job_details]
+id=0x0008
+mat_type=0x0024
+mat_index=0x0028
+mat_category=0x003c
+on_break_flag=0x0011
+sub_job_id=0x0040
+reaction=0x0004
+reaction_skill=0x0028
+
+[squad_offsets]
+id=0x0000
+name=0x0004
+alias=0x0040
+members=0x0044
+carry_food=0x00d4
+carry_water=0x00d6
+ammunition=0x0098
+quiver=0x00a8
+backpack=0x00ac
+flask=0x00b0
+armor_vector=0x0040
+helm_vector=0x004c
+pants_vector=0x0058
+gloves_vector=0x0064
+shoes_vector=0x0070
+shield_vector=0x007c
+weapon_vector=0x0088
+uniform_item_filter=0x0004
+uniform_indiv_choice=0x0020
+
+[valid_flags_2]
+size=0
+
+[invalid_flags_1]
+size=10
+1\name=a zombie
+1\value=0x00001000
+2\name=a skeleton
+2\value=0x00002000
+3\name=a merchant
+3\value=0x00000040
+4\name=outpost liason or diplomat
+4\value=0x00000800
+5\name=an invader or hostile
+5\value=0x00020000
+6\name=an invader or hostile
+6\value=0x00080000
+7\name=resident, invader or ambusher
+7\value=0x00600000
+8\name=part of a merchant caravan
+8\value=0x00000080
+9\name="Dead, Jim."
+9\value=0x00000002
+10\name=marauder
+10\value=0x00000010
+
+[invalid_flags_2]
+size=5
+1\name="killed, Jim."
+1\value=0x00000080
+2\name=from the Underworld. SPOOKY!
+2\value=0x00040000
+3\name=resident
+3\value=0x00080000
+4\name=uninvited visitor
+4\value=0x00400000
+5\name=visitor
+5\value=0x00800000
+
+[invalid_flags_3]
+size=1
+1\name=a ghost
+1\value=0x00001000