diff --git a/LoadFolders.xml b/LoadFolders.xml
index 9c0df97218..616445197a 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -615,6 +615,7 @@
ModPatches/pphhyy Expanded Scythers
ModPatches/pphhyy Sanguinary Animals
ModPatches/pphhyy's Lightless Empyrean
+ ModPatches/EdoThemedExpansion
ModPatches/Multiplayer
ModPatches/SRTS
diff --git a/ModPatches/EdoThemedExpansion/Defs/Recipes_EdoThemed.xml b/ModPatches/EdoThemedExpansion/Defs/Recipes_EdoThemed.xml
new file mode 100644
index 0000000000..84193ef7c2
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Defs/Recipes_EdoThemed.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ MakeHS_Kunai
+ make kunai x10
+ Craft 10 kunai.
+ Making kunai.
+
+
+
+
+ Steel
+
+
+ 10
+
+
+
+
+ Steel
+
+
+ 500
+
+ 10
+
+
+ FueledSmithy
+ ElectricSmithy
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Apparel.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Apparel.xml
new file mode 100644
index 0000000000..c7064c4772
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Apparel.xml
@@ -0,0 +1,121 @@
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_ChildStrawcloak" or defName="HSApparel_Strawcloak"]/statBases/ArmorRating_Sharp
+
+ 0.025
+ 2
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_ChildStrawcloak" or defName="HSApparel_Strawcloak"]/statBases/ArmorRating_Blunt
+
+ 0.04
+
+
+
+
+ Defs/ThingDef[
+ defName="HSApparel_Hachimaki" or
+ defName="HSApparel_Roningasa" or
+ defName="HSApparel_Amigasa" or
+ defName="HSApparel_Soheiheadwrap" or
+ defName="HSApparel_ShinobiHalfmask" or
+ defName="HSApparel_HannyaMask" or
+ defName="HSApparel_WorkersHeadband" or
+ defName="HSApparel_ChildKimono" or
+ defName="HSApparel_Kimono" or
+ defName="HSApparel_Hakama" or
+ defName="HSApparel_Kataginu" or
+ defName="HSApparel_Hanten" or
+ defName="HSApparel_Haori"
+ ]/statBases/StuffEffectMultiplierArmor
+
+ 1
+
+
+
+
+ Defs/ThingDef[
+ defName="HSApparel_Hachimaki" or
+ defName="HSApparel_Roningasa" or
+ defName="HSApparel_Amigasa" or
+ defName="HSApparel_Soheiheadwrap" or
+ defName="HSApparel_ShinobiHalfmask" or
+ defName="HSApparel_HannyaMask" or
+ defName="HSApparel_WorkersHeadband"
+ ]/statBases
+
+ 1
+ 0
+
+
+
+
+ Defs/ThingDef[
+ defName="HSApparel_ChildKimono" or
+ defName="HSApparel_Kimono" or
+ defName="HSApparel_Hakama" or
+ defName="HSApparel_Kataginu" or
+ defName="HSApparel_Hanten" or
+ defName="HSApparel_Haori"
+ ]/statBases
+
+ 3
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Kimono" or defName="HSApparel_ChildKimono"]/apparel/bodyPartGroups
+
+ Shoulders
+ Legs
+
+
+
+
+ Defs/ThingDef[
+ defName="HSApparel_Amigasa" or
+ defName="HSApparel_Roningasa" or
+ defName="HSApparel_Tengai" or
+ defName="HSApparel_Strawcloak" or
+ defName="HSApparel_ChildStrawcloak" or
+ defName="HSApparel_Soheiheadwrap"
+ ]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HS_Tenbinbo" or defName="HS_Straw_Backpack"]/equippedStatOffsets
+
+
+ 25
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Tenbinbo" or defName="HS_Straw_Backpack"]/apparel
+
+ false
+
+
+
+
+ Defs/ThingDef[defName="HS_Straw_Backpack"]/apparel/layers/li[.="Belt"]
+
+ Backpack
+
+
+
+
+ Defs/ThingDef[defName="HS_Straw_Backpack"]/apparel/bodyPartGroups/li[.="Torso"]
+
+ Shoulders
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Armour.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Armour.xml
new file mode 100644
index 0000000000..1098081a09
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Armour.xml
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Hitaiate"]/statBases
+
+ 2
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Hitaiate"]/statBases/StuffEffectMultiplierArmor
+
+ 1.25
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Hitaiate"]/equippedStatOffsets
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Menpo" or defName="HSApparel_SamuraiFaceGuard"]/statBases
+
+ 2
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Menpo" or defName="HSApparel_SamuraiFaceGuard"]/statBases/StuffEffectMultiplierArmor
+
+ 1.25
+
+
+
+
+
+
+ Defs/ThingDef[
+ defName="HSKabuto" or
+ defName="HSBoldKabuto" or
+ defName="HSKenseiKabuto" or
+ defName="HSDaimyoKabuto" or
+ defName="HSVetereanKabuto" or
+ defName="HSPrestigeKabuto"
+ ]/statBases
+
+ 5
+ 1
+
+
+
+
+ Defs/ThingDef[
+ defName="HSKabuto" or
+ defName="HSBoldKabuto" or
+ defName="HSKenseiKabuto" or
+ defName="HSDaimyoKabuto" or
+ defName="HSVetereanKabuto" or
+ defName="HSPrestigeKabuto"
+ ]/statBases/Mass
+
+ 2.6
+
+
+
+
+ Defs/ThingDef[
+ defName="HSKabuto" or
+ defName="HSBoldKabuto" or
+ defName="HSKenseiKabuto" or
+ defName="HSDaimyoKabuto" or
+ defName="HSVetereanKabuto" or
+ defName="HSPrestigeKabuto"
+ ]/statBases/StuffEffectMultiplierArmor
+
+ 3.5
+
+
+
+
+ Defs/ThingDef[
+ defName="HSBoldKabuto" or
+ defName="HSKenseiKabuto" or
+ defName="HSVetereanKabuto" or
+ defName="HSPrestigeKabuto"
+ ]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HSDaimyoKabuto"]/equippedStatOffsets/PainShockThreshold
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Tatami"]/statBases
+
+ 60
+ 6
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Tatami"]/statBases/StuffEffectMultiplierArmor
+
+ 2.15
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Tatami"]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HSApparel_Tatami"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Tatami"]
+
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.60
+
+ Hand
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]/statBases
+
+ 75
+ 8
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]/statBases/StuffEffectMultiplierArmor
+
+ 2.65
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]
+
+
+ -0.1
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_Do"]
+
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.60
+
+ Hand
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]/statBases
+
+ 100
+ 10
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]/statBases/StuffEffectMultiplierArmor
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]
+
+
+ -0.15
+
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]/apparel/bodyPartGroups
+
+ Hands
+ Feet
+
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]/apparel/layers/li[.="VFEC_OuterShell"]
+
+
+
+ Defs/ThingDef[defName="HSApparel_HeavyDo"]
+
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.70
+
+ Neck
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.90
+
+ Leg
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.80
+
+ Arm
+
+
+
+ 0.60
+
+ Hand
+
+
+
+ 0.60
+
+ Hand
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Misc.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Misc.xml
new file mode 100644
index 0000000000..6bbb1d5e5b
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Misc.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ Defs/ThingDef[defName="HS_BlackPowderBarrel"]/comps/li[@Class="CompProperties_Explosive"]
+
+
+ Bomb
+ 180
+ 3
+ Filth_RubbleBuilding
+ 0.4
+
+ Bullet
+ Arrow
+ ArrowHighVelocity
+
+
+ 0
+ 20
+
+
+
+
+ 32
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Pawnkinds.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Pawnkinds.xml
new file mode 100644
index 0000000000..d23a7633f5
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Pawnkinds.xml
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+ Defs/PawnKindDef[
+ defName="HS_RangedSamurai" or
+ defName="HS_RangedSamuraiGunner" or
+ defName="HS_RangedNoviceSamurai" or
+ defName="HS_NoviceShinobi" or
+ defName="HS_ShinobiMaster" or
+ defName="HS_RangedNoviceSamurai_Shogun" or
+ defName="HS_RangedSamurai_Shogun" or
+ defName="HS_RangedSamuraiGunner_Shogun"
+ ]/apparelRequired
+
+ HS_Straw_Backpack
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedNoviceSamurai"]
+
+
+
+ 15
+ 30
+
+
+
+ 200
+ 400
+
+
+ NeolithicMeleeBasic
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedSamurai"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedSamuraiGunner"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ NeolithicMeleeBasic
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_NoviceShinobi"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_ShinobiMaster"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_Ashigaru"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ NeolithicMeleeBasic
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedNoviceSamurai_Shogun"]
+
+
+
+ 15
+ 30
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedSamurai_Shogun"]
+
+
+
+ 30
+ 40
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
+ Defs/PawnKindDef[defName="HS_RangedSamuraiGunner_Shogun"]
+
+
+
+ 20
+ 40
+
+
+
+ 200
+ 400
+
+
+ HSBasicSamuraiMelee
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Scenarios.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Scenarios.xml
new file mode 100644
index 0000000000..e259edc773
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Scenarios.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ Defs/ScenarioDef[defName="hs_aNewClan"]/scenario/parts
+
+
+ StartingThing_Defined
+ Projectile_GreatArrow_Stone
+ 100
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Melee.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Melee.xml
new file mode 100644
index 0000000000..fa93cb6cdf
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Melee.xml
@@ -0,0 +1,813 @@
+
+
+
+ Defs/ThingDef[
+ defName="HS_BasicKama" or
+ defName="HS_BasicMasakari" or
+ defName="HS_BasicKanabo" or
+ defName="HS_BasicNagamaki" or
+ defName="HS_BasicKatana" or
+ defName="HS_BasicNaginata" or
+ defName="HS_BasicOdachi" or
+ defName="HS_BasicYari" or
+ defName="HS_BasicTanto" or
+ defName="HS_BasicWakizashi"
+ ]/stuffCategories/li[.="Metallic"]
+
+ Metallic_Weapon
+
+
+
+
+ Defs/ThingDef[
+ defName="HS_BasicKama" or
+ defName="HS_BasicMasakari" or
+ defName="HS_BasicNagamaki" or
+ defName="HS_BasicOdachi" or
+ defName="HS_Bokken" or
+ defName="HS_BasicYari" or
+ defName="HS_BasicNaginata" or
+ defName="HS_BasicTanto" or
+ defName="HS_BasicWakizashi" or
+ defName="HS_BasicKatana" or
+ defName="HS_BasicKanabo"
+ ]/equippedStatOffsets
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicTanto"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 1
+ 0.33
+ 1.26
+ 0.250
+ Handle
+
+
+ blade
+
+ Cut
+
+ 10
+ 1.18
+ 0.36
+ 0.32
+ Blade
+
+
+ point
+
+ Stab
+
+ 11
+ 1.2
+ 0.25
+ 0.42
+ Point
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicTanto"]/statBases
+
+ 1
+ 0.15
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicTanto"]
+
+
+ 0.5
+ 0.15
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicTanto"]/weaponTags
+
+ Defs/ThingDef[defName="HS_BasicTanto"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicTanto"]/weaponTags
+
+ CE_Sidearm_Melee
+ CE_OneHandedWeapon
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicMasakari"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.66
+ 0.10
+ 0.75
+ Handle
+
+
+ edge
+
+ Cut
+
+ 25
+ 2.47
+ 4.69
+ 1.57
+ Edge
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicMasakari"]/statBases
+
+ 4
+ 0.2
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicMasakari"]
+
+
+ 0.13
+ 0.2
+ 0.2
+ 0.5
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicMasakari"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKama"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.66
+ 0.10
+ 0.75
+ Handle
+
+
+ point
+
+ Stab
+
+ 18
+ 1.69
+ 0.90
+ 2.25
+ 2.25
+ Point
+
+
+ edge
+
+ Cut
+
+ 25
+ 2.47
+ 0.30
+ 4.69
+ 1.57
+ Edge
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKama"]/statBases
+
+ 4
+ 0.2
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKama"]
+
+
+ 0.13
+ 0.2
+ 0.2
+ 0.5
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKama"]/weaponTags
+
+ CE_OneHandedWeapon
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKatana"]/statBases
+
+ 6
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKatana"]/statBases/Mass
+
+ 1.3
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKatana"]/weaponTags
+
+ SamuraiMeleeSidearm
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKatana"]
+
+
+ 0.63
+ 0.75
+ 0.4
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKatana"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.69
+ 0.10
+ 0.8
+ Handle
+
+
+ point
+
+ Stab
+
+ 18
+ 1.69
+ 0.30
+ 0.936
+ 1.88
+ Point
+
+
+ edge
+
+ Cut
+
+ 30
+ 1.56
+ 0.60
+ 2.592
+ 0.65
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicWakizashi"]/statBases
+
+ 6
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicWakizashi"]/statBases/Mass
+
+ 1.3
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicWakizashi"]/weaponTags
+
+ SamuraiMeleeSidearm
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicWakizashi"]
+
+
+ 0.63
+ 0.75
+ 0.4
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicWakizashi"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 2
+ 1.44
+ 0.10
+ 0.43
+ Handle
+
+
+ point
+
+ Stab
+
+ 20
+ 1.44
+ 0.30
+ 0.43
+ 0.48
+ Point
+
+
+ edge
+
+ Cut
+
+ 27
+ 1.34
+ 0.90
+ 0.96
+ 0.43
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNagamaki"]/statBases
+
+ 8
+ 1.25
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNagamaki"]/statBases/Mass
+
+ 1.8
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNagamaki"]/weaponTags
+
+ SamuraiMeleeSidearm
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNagamaki"]
+
+
+ 0.63
+ 0.95
+ 0.7
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNagamaki"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.99
+ 0.10
+ 0.8
+ Handle
+
+
+ point
+
+ Stab
+
+ 18
+ 1.99
+ 0.30
+ 0.8
+ 1.35
+ Point
+
+
+ edge
+
+ Cut
+
+ 30
+ 1.86
+ 0.60
+ 2.592
+ 0.65
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Bokken"]/statBases
+
+ 6
+ 1
+
+
+
+
+ Defs/ThingDef[defName="HS_Bokken"]/statBases/Mass
+
+ 1.3
+
+
+
+
+ Defs/ThingDef[defName="HS_Bokken"]/weaponTags
+
+ SamuraiMeleeSidearm
+
+
+
+
+ Defs/ThingDef[defName="HS_Bokken"]
+
+
+ 0.63
+ 0.75
+ 0.4
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Bokken"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.69
+ 0.10
+ 0.8
+ Handle
+
+
+ point
+
+ Poke
+
+ 6
+ 1.69
+ 0.60
+ 0.8
+ Point
+
+
+ edge
+
+ Blunt
+
+ 14
+ 1.56
+ 0.30
+ 2.592
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKanabo"]/statBases
+
+ 16
+ 0.5
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKanabo"]/stuffCategories
+
+ Woody
+ Stony
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKanabo"]/statBases/Mass
+
+ 3.2
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKanabo"]
+
+
+ 1.6
+ 0.38
+ 0.4
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicKanabo"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 0.33
+ 2.01
+ 1.6
+ Handle
+
+
+ head
+
+ Blunt
+
+ 38
+ 2.59
+ 16.384
+ Head
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicOdachi"]/statBases
+
+ 12
+ 0.67
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicOdachi"]/statBases/Mass
+
+ 3.2
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicOdachi"]
+
+
+ 0.16
+ 0.5
+ 0.53
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicOdachi"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 5
+ 0.33
+ 2.01
+ 1.6
+ Handle
+
+
+ point
+
+ Stab
+
+ 34
+ 0.5
+ 2.01
+ 1.6
+ 3.2
+ Point
+
+
+ edge
+
+ Cut
+
+ 53
+ 1.5
+ 2.23
+ 5.184
+ 1.16
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNaginata"]/statBases
+
+ 12
+ 1.27
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNaginata"]
+
+
+ 0.08
+ 0.95
+ 1.27
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicNaginata"]/tools
+
+
+
+ shaft
+
+ Poke
+
+ 8
+ 1.3
+ 0.05
+ 5
+ Shaft
+
+
+ edge
+
+ Stab
+
+ 18
+ 1.8
+ 0.20
+ 3.6
+ 1.6
+ Point
+
+
+ edge
+
+ Cut
+
+ 28
+ 2.3
+ 0.75
+ 4.6
+ 0.75
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicYari"]/statBases
+
+ 12
+ 1.68
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicYari"]
+
+
+ 0.17
+ 1.45
+ 0.9
+
+
+
+
+
+ Defs/ThingDef[defName="HS_BasicYari"]/tools
+
+
+
+ shaft
+
+ Blunt
+
+ 7
+ 2.20
+ 0.15
+ 2.25
+ Shaft
+
+
+ shaft
+
+ Poke
+
+ 4
+ 1.79
+ 0.05
+ 1
+ Point
+
+
+ head
+
+ Stab
+
+ 25
+ 1.8
+ 0.90
+ 5
+ 2.5
+ Head
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeClanforged.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeClanforged.xml
new file mode 100644
index 0000000000..aba7ef764e
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeClanforged.xml
@@ -0,0 +1,384 @@
+
+
+
+
+
+ Defs/ThingDef[
+ defName="HS_ClanforgedKatana" or
+ defName="HS_ClanforgedNaginata" or
+ defName="HS_ClanforgedYari" or
+ defName="HS_ClanforgedOdachi" or
+ defName="HS_ClanForgedNagamaki"
+ ]/stuffCategories/li[.="Metallic"]
+
+ Metallic_Weapon
+
+
+
+
+ Defs/ThingDef[
+ defName="HS_ClanforgedKatana" or
+ defName="HS_ClanforgedNaginata" or
+ defName="HS_ClanforgedYari" or
+ defName="HS_ClanforgedOdachi" or
+ defName="HS_ClanForgedNagamaki"
+ ]/equippedStatOffsets
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedKatana"]/statBases
+
+ 5
+ 1.25
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedKatana"]/statBases/Mass
+
+ 1.15
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedKatana"]/weaponTags
+
+ SamuraiMeleeSidearm
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedKatana"]
+
+
+ 0.75
+ 0.85
+ 0.5
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedKatana"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 1.45
+ 0.10
+ 0.9
+ Handle
+
+
+ point
+
+ Stab
+
+ 21
+ 1.45
+ 0.40
+ 0.9
+ 1.45
+ Point
+
+
+ edge
+
+ Cut
+
+ 35
+ 1.45
+ 0.50
+ 2.75
+ 0.75
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]/statBases
+
+ 7
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]/statBases/Mass
+
+ 1.35
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]/recipeMaker/researchPrerequisite
+
+ HS_Clanforged_Weapons
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]/weaponTags
+
+ SamuraiMeleeSidearm
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]
+
+
+ 0.75
+ 1.15
+ 0.85
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanForgedNagamaki"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 4
+ 1.75
+ 0.10
+ 0.9
+ Handle
+
+
+ point
+
+ Stab
+
+ 21
+ 1.75
+ 0.40
+ 0.9
+ 1.45
+ Point
+
+
+ edge
+
+ Cut
+
+ 35
+ 1.75
+ 0.50
+ 2.75
+ 0.75
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedOdachi"]/statBases
+
+ 10
+ 0.75
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedOdachi"]/statBases/Mass
+
+ 3
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedOdachi"]
+
+
+ 0.25
+ 0.65
+ 0.6
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedOdachi"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 6
+ 0.33
+ 1.8
+ 1.7
+ Handle
+
+
+ point
+
+ Stab
+
+ 38
+ 0.5
+ 1.8
+ 2
+ 3.6
+ Point
+
+
+ edge
+
+ Cut
+
+ 58
+ 1.5
+ 2.12
+ 6.84
+ 1.32
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedNaginata"]/statBases
+
+ 10
+ 1.39
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedNaginata"]
+
+
+ 0.12
+ 1.1
+ 1.35
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedNaginata"]/tools
+
+
+
+ shaft
+
+ Poke
+
+ 9
+ 1.3
+ 0.05
+ 6
+ Shaft
+
+
+ edge
+
+ Stab
+
+ 20
+ 1.7
+ 0.20
+ 3.75
+ 1.75
+ Point
+
+
+ edge
+
+ Cut
+
+ 32
+ 2.2
+ 0.75
+ 4.8
+ 0.85
+ Edge
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedYari"]/statBases
+
+ 10
+ 1.75
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedYari"]
+
+
+ 0.2
+ 1.6
+ 1.2
+
+
+
+
+
+ Defs/ThingDef[defName="HS_ClanforgedYari"]/tools
+
+
+
+ shaft
+
+ Blunt
+
+ 8
+ 2.1
+ 0.15
+ 2.35
+ Shaft
+
+
+ shaft
+
+ Poke
+
+ 5
+ 1.79
+ 0.05
+ 1
+ Point
+
+
+ head
+
+ Stab
+
+ 29
+ 1.7
+ 0.90
+ 5.15
+ 2.75
+ Head
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeLegendary.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeLegendary.xml
new file mode 100644
index 0000000000..74aea0182c
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_MeleeLegendary.xml
@@ -0,0 +1,70 @@
+
+
+
+
+ Defs/ThingDef[defName="HS_RoninKatana" or defName="HS_LegendaryKatana"]/equippedStatOffsets
+
+
+
+ Defs/ThingDef[defName="HS_RoninKatana" or defName="HS_LegendaryKatana"]/statBases
+
+ 5
+ 1.5
+
+
+
+
+ Defs/ThingDef[defName="HS_RoninKatana" or defName="HS_LegendaryKatana"]
+
+
+ 1
+ 1
+ 0.75
+
+
+
+
+
+ Defs/ThingDef[defName="HS_RoninKatana" or defName="HS_LegendaryKatana"]/tools
+
+
+
+ handle
+
+ Poke
+
+ 3
+ 1.69
+ 0.10
+ 1.2
+ Handle
+
+
+ point
+
+ Stab
+
+ 31
+ 1.69
+ 0.30
+ 2
+ 3.75
+ Point
+
+
+ edge
+
+ Cut
+
+ 43
+ 1.56
+ 0.90
+ 6.48
+ 2.625
+ Edge
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Ranged.xml b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Ranged.xml
new file mode 100644
index 0000000000..8e1a5ffbdb
--- /dev/null
+++ b/ModPatches/EdoThemedExpansion/Patches/EdoThemedExpansion/EdoTheme_Weapons_Ranged.xml
@@ -0,0 +1,447 @@
+
+
+
+
+ Defs/ThingDef[defName="HSTanegashimaRifle" or defName="HSTanegashimaPistol"]/tools
+
+
+
+ stock
+
+ Blunt
+
+ 8
+ 1.55
+ 1.5
+ 2.755
+ Stock
+
+
+ barrel
+
+ Blunt
+
+ 5
+ 2.02
+ 1.630
+ Barrel
+
+
+ muzzle
+
+ Poke
+
+ 8
+ 1.55
+ 2.755
+ Muzzle
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HSTanegashimaRifle" or defName="HSTanegashimaPistol"]/verbs
+
+
+
+
+ HSTanegashimaPistol
+
+ 12000
+ 4.75
+ 2.5
+ 1.22
+ 0.30
+ 0.8
+ 0.85
+
+
+ 35
+ 8
+ 1
+
+
+ 1
+ 5.5
+ AmmoSet_SlowMusketBall
+
+
+ CombatExtended.Verb_ShootCE
+ 3.0
+ True
+ Bullet_SlowMusketBall
+ 1.1
+ 15
+ HSTanegashima_Rifle_Sound
+ GunTail_Heavy
+ 9
+
+ true
+
+
+
+ AimedShot
+
+
+ NeolithicRangedHeavy
+ NeolithicRangedChief
+
+
+
+
+
+ HSTanegashimaRifle
+
+ 20000
+ 4.8
+ 14.9
+ 1.92
+ 0.25
+ 1
+ 1.35
+
+
+ 65
+ 15
+ 1
+
+
+ 1
+ 7.5
+ AmmoSet_FastMusketBall
+
+
+ CombatExtended.Verb_ShootCE
+ 3.0
+ true
+ Bullet_FastMusketBall
+ 1.3
+ 32
+ HSTanegashima_Rifle_Sound
+ GunTail_Heavy
+ 9
+
+ true
+
+
+
+ AimedShot
+
+
+ NeolithicRangedHeavy
+ NeolithicRangedChief
+
+
+
+
+
+ HS_DaikyuBasic
+
+ 0.8
+ 1
+ 2
+ 6.00
+ 1
+
+
+ 40
+
+
+ CombatExtended.Verb_ShootCE
+ true
+ Projectile_GreatArrow_Steel
+ 1.3
+ 30
+ Bow_Large
+
+
+ AmmoSet_GreatArrow
+
+
+
+ CE_Bow
+
+ false
+
+
+
+ Defs/ThingDef[defName="HS_DaikyuBasic"]/tools
+
+
+
+
+ Blunt
+
+ 7
+ 1.6
+ 0.65
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Thrown_Kunai"]/projectile
+
+
+ Stab
+ 5
+ false
+ 30
+ 1.5
+ 2.44
+ 0.15
+ HS_Kunai
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]
+ ParentName
+ BaseWeapon
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]
+
+
+ WeaponsRanged
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]/recipeMaker
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]/costList
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]
+
+ CombatExtended.AmmoThing
+ 75
+ First
+
+ 1
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]
+ Class
+ CombatExtended.AmmoDef
+
+
+
+ HS_Kunai
+
+ 1.0
+ 0.20
+ 0.30
+ 0.6
+
+
+ Throw kunai
+ CombatExtended.Verb_ShootCEOneUse
+ True
+ HS_Thrown_Kunai
+ 0.6
+ 8
+ true
+ false
+ Interact_BeatFire
+ false
+
+ true
+
+
+
+ CE_OneHandedWeapon
+
+
+
+
+ Defs/ThingDef[defName="HS_Kunai"]/tools
+
+
+
+ point
+
+ Stab
+
+ 5
+ 1.26
+ 1.33
+ 0.25
+ 0.3
+ Point
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]
+ ParentName
+ BaseWeapon
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]
+
+
+
+ Body
+
+ Blunt
+
+ 2
+ 1.75
+ 1.0
+ Base
+
+
+
+ CE_MediumAmmo
+
+ 5
+
+
+
+
+
+
+ Defs/ThingDef[defName="Proj_BlackpowderBomb"]/comps
+
+ Defs/ThingDef[defName="Proj_BlackpowderBomb"]
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="Proj_BlackpowderBomb"]/comps
+
+
+
+ 15
+
+
+
+
+
+
+ Defs/ThingDef[defName="Proj_BlackpowderBomb"]
+
+ CombatExtended.ProjectileCE_Explosive
+
+
+
+
+ Defs/ThingDef[defName="Proj_BlackpowderBomb"]
+
+
+ 2.5
+ Bomb
+ 234
+ 90
+ false
+ true
+ 12
+ 3.0
+ 2.0
+ 0.25
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]/label
+
+ blackpowder bomb
+
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]
+
+ CombatExtended.AmmoThing
+ 25
+ First
+
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]/comps
+
+
+
+ 234
+ Bomb
+ 2.5
+
+
+
+
+
+
+ Defs/ThingDef[defName="HS_Edo_Blackpowder_Bomb"]/comps
+
+
+
+ 15
+
+
+
+
+
+
+ HS_Edo_Blackpowder_Bomb
+
+ 0.4
+ 0.87
+ 11.22
+ 1
+ 1.0
+
+
+ throw blackpowder bomb
+ CombatExtended.Verb_ShootCEOneUse
+ true
+ 7.0
+ 1.6
+ 4
+ true
+ ThrowGrenade
+
+ true
+
+ Proj_BlackpowderBomb
+ true
+ true
+ 7
+
+
+ CE_AI_Grenade
+ CE_AI_AOE
+ CE_OneHandedWeapon
+
+
+
+
\ No newline at end of file
diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 06c75ccdcd..27b5b50e51 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -187,6 +187,7 @@ ED-Shields |
Edge of Descension - Hovercraft |
Edge of Descension - Monoblades |
Edge of Descension - Vanguard |
+Edo Themed Expansion |
Eltex Bodysuit |
Enchanted Sword |
Epona The centaur race |