diff --git a/binaries/data/mods/internal/simulation/templates/structures/cart_house.xml b/binaries/data/mods/internal/simulation/templates/structures/cart_house.xml
index c70c7e67c8..d7958cea28 100644
--- a/binaries/data/mods/internal/simulation/templates/structures/cart_house.xml
+++ b/binaries/data/mods/internal/simulation/templates/structures/cart_house.xml
@@ -9,7 +9,7 @@
     <Actor>structures/carthaginians/house.xml</Actor>
   </VisualActor>
   <Footprint>
-    <Square width="13.0" depth="13.0"/>
+    <Square width="14.5" depth="14.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Obstruction>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/kennel_beef.xml b/binaries/data/mods/public/art/actors/props/structures/celts/kennel_beef.xml
new file mode 100644
index 0000000000..1dd234625b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/kennel_beef.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/celt_kennel_props_beef.dae</mesh>
+      <texture>props/beefslab.png</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/tavern_mud.xml b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_mud.xml
new file mode 100644
index 0000000000..8147c4fe9b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_mud.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/celt_tavern_mud.dae</mesh>
+      <texture>props/decal_struct_mud_long.dds</texture>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_1.xml b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_1.xml
new file mode 100644
index 0000000000..9a608d6ae3
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/celt_tavern_props_1.dae</mesh>
+      <texture>props/celt_prop_1.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_new.xml b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_new.xml
new file mode 100644
index 0000000000..3273cb8cda
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/structures/celts/tavern_props_new.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>structural/celt_tavern_props_new.dae</mesh>
+      <texture>props/celt_props_new.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/kennel.xml b/binaries/data/mods/public/art/actors/structures/celts/kennel.xml
index 0c9d3969b7..32e7db7e5a 100644
--- a/binaries/data/mods/public/art/actors/structures/celts/kennel.xml
+++ b/binaries/data/mods/public/art/actors/structures/celts/kennel.xml
@@ -7,7 +7,8 @@
       <props>
         <prop actor="props/structures/celts/kennel_props_new.xml" attachpoint="root"/>
         <prop actor="props/structures/celts/kennel_props_1.xml" attachpoint="root"/>
-        <prop actor="props/structures/celts/kennel_mud.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/kennel_beef.xml" attachpoint="root"/>
       </props>
       <texture>structural/celt_struct_1.dds</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/structures/celts/tavern.xml b/binaries/data/mods/public/art/actors/structures/celts/tavern.xml
new file mode 100644
index 0000000000..b9ffe88966
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/structures/celts/tavern.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="Celtic Tavern">
+      <mesh>structural/celt_tavern_struct.dae</mesh>
+      <props>
+        <prop actor="props/structures/celts/tavern_props_new.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/tavern_props_1.xml" attachpoint="root"/>
+        <prop actor="props/structures/celts/tavern_mud.xml" attachpoint="root"/>
+      </props>
+      <texture>structural/celt_struct_1.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
index 0849778720..e313340836 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_a.xml
@@ -4,7 +4,9 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="99"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="97"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation event="0.4" file="biped/not used/ijv_def_02.psa" load="0" name="Melee" speed="100"/>
         <animation event="0.4" file="biped/not used/ijv_def_03.psa" load="0" name="Melee" speed="100"/>
@@ -86,7 +88,7 @@
     <variant name="gather_tree">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
       </props>
     </variant>
@@ -100,7 +102,7 @@
     <variant name="gather_fruit">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
@@ -108,22 +110,22 @@
     <variant name="gather_meat">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
     <variant name="gather_rock">
       <props>
-		<prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="gather_ore">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
index e6ded00217..162694aac9 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_b.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="95"/>
         <animation event="0.4" file="biped/not used/ijv_def_02.psa" load="0" name="Melee" speed="100"/>
         <animation file="biped/not used/ijv_def_03.psa" name="Melee" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
@@ -31,11 +30,11 @@
       <props>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
       </props>
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
@@ -49,7 +48,7 @@
     <variant name="gather_tree">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
       </props>
     </variant>
@@ -63,7 +62,7 @@
     <variant name="gather_fruit">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
@@ -71,22 +70,22 @@
     <variant name="gather_meat">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
       </props>
     </variant>
     <variant name="gather_rock">
       <props>
-		<prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="gather_ore">
       <props>
         <prop attachpoint="shield"/>
-		<prop attachpoint="r_hand"/>
+        <prop attachpoint="r_hand"/>
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
       </props>
     </variant>
@@ -98,7 +97,5 @@
       </props>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
index 7d3b65c345..8fb6c69af5 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_javelinist_e.xml
@@ -4,7 +4,9 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="105"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="95"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_1.dae b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_1.dae
index 73071185a5..e999e7946d 100644
--- a/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_1.dae
+++ b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_1.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d9c2c78e3df85654a08e9243fa2f0d20fb8b82d4ae73fada2d826c33fe4adde
-size 15888
+oid sha256:aff6d59c26ef6198ae20183112d6b986534af44b14bf81f4ac557149cdf56865
+size 6595
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_beef.dae b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_beef.dae
new file mode 100644
index 0000000000..92e0382c8a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_beef.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e61d08d912a34938a937ba741feeb07a6f76c86886c6a9d8ad16a3b67896072
+size 9189
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_new.dae b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_new.dae
index 937e47d3c6..f7f91de7ef 100644
--- a/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_new.dae
+++ b/binaries/data/mods/public/art/meshes/structural/celt_kennel_props_new.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21cd9c6cac8477b3eff9485c071e3f6a0a28f9727a4586bc0f6c8c91d054eea7
-size 15329
+oid sha256:4bcf125d62b04dd2e72ad9180635ac369b889f65ecc68ac404f7dedc4db84104
+size 10253
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_kennel_struct.dae b/binaries/data/mods/public/art/meshes/structural/celt_kennel_struct.dae
index 58d9a5e60e..3ce61e3873 100644
--- a/binaries/data/mods/public/art/meshes/structural/celt_kennel_struct.dae
+++ b/binaries/data/mods/public/art/meshes/structural/celt_kennel_struct.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b601d910a16d90e7c112ae672330722221c444372dff0169b57793c6dab6441a
-size 78245
+oid sha256:328bd0524bca7c97974b049d56194a667b1faf12530ff9e636406c5524a98844
+size 35463
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_tavern_mud.dae b/binaries/data/mods/public/art/meshes/structural/celt_tavern_mud.dae
new file mode 100644
index 0000000000..0f25217d74
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_tavern_mud.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5387f32bb978d4d09af515e1cf85dd8dab40d01d045df9835b273a3cd1e510e
+size 5962
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_1.dae b/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_1.dae
new file mode 100644
index 0000000000..80cdbc3f5a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_1.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d45803df0f329019ef84ebbf164cff5e2146fee3a532445c52dacd7e74a69307
+size 33334
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_new.dae b/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_new.dae
new file mode 100644
index 0000000000..b7d144186a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_tavern_props_new.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81ec40e5b4435846d3d55db058c8c2db81afb46d935649d4ed2448b166db7bbc
+size 36105
diff --git a/binaries/data/mods/public/art/meshes/structural/celt_tavern_struct.dae b/binaries/data/mods/public/art/meshes/structural/celt_tavern_struct.dae
new file mode 100644
index 0000000000..da61fc11e2
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/celt_tavern_struct.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:489a8b745a15c816b16f662f64134df19e97f64fb71b7ff53b5bae43a131fdba
+size 157412
diff --git a/binaries/data/mods/public/art/textures/skins/props/beefslab.png b/binaries/data/mods/public/art/textures/skins/props/beefslab.png
new file mode 100644
index 0000000000..4e110a05f8
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/beefslab.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a1ad42702b2894156b203675b4fc43838abf5164edaf5a221ddbaa2421c45f6
+size 19021
diff --git a/binaries/data/mods/public/art/textures/skins/props/shield/hele_marine_a.png b/binaries/data/mods/public/art/textures/skins/props/shield/hele_marine_a.png
new file mode 100644
index 0000000000..9502f9d153
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/props/shield/hele_marine_a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28abf9320c06d56013ba1f8068a1f94930b79a5908df48a57fe9355bc953c35e
+size 33048
diff --git a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml
index 5f972c2a2d..7fb7bf16d6 100644
--- a/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Arcadia II.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c4fa61a013ce796a07b011f011aab8220edea913c3a4736245e54e9368895f9
-size 703747
+oid sha256:03a5e946c574697eb27b8045edb380b0f92ca7af3f329b3c9320e379c17763ae
+size 704941
diff --git a/binaries/data/mods/public/maps/scenarios/Mountain_Pass.xml b/binaries/data/mods/public/maps/scenarios/Mountain_Pass.xml
index 5648c9db00..94d0a61c3e 100644
--- a/binaries/data/mods/public/maps/scenarios/Mountain_Pass.xml
+++ b/binaries/data/mods/public/maps/scenarios/Mountain_Pass.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd57615452795ef499d31916fe05fac5b460cf6c55f76c46536f4717e6d7005f
+oid sha256:c220f542a8711e799e0348deb71c37fc263b267375f2ca77aaa6ccbdc2155bca
 size 83675
diff --git a/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml b/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
new file mode 100644
index 0000000000..1d7c93c64c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic_house">
+  <Identity>
+    <Civ>celt</Civ>
+    <GenericName>Tavern</GenericName>
+    <SpecificName>Tavern</SpecificName>
+    <History>Taverns are where Celtic warriors go for a tall glass of mead after a hard-won battle. Some might even find rest in one of the back rooms for rent in this seedy establishment.</History>
+	<Tooltip>Add +10 to Population Cap. Heal units around it.</Tooltip>
+  </Identity>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>200</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>100</wood>
+      <stone>100</stone>
+      <metal>0</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>1500</Max>
+  </Health>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/celt_support_trader
+    </Entities>
+  </TrainingQueue>
+  <Footprint>
+    <Square width="18.0" depth="18.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="17.0" depth="17.0"/>
+  </Obstruction>
+  <GarrisonHolder>
+    <Max>10</Max>
+  </GarrisonHolder>
+  <Auras>
+    <Heal>
+      <Radius>30</Radius>
+      <Speed>1000</Speed>
+    </Heal>
+  </Auras>
+  <VisualActor>
+    <Actor>structures/celts/tavern.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml b/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
index c9619c0c42..5bd6a63ff6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
@@ -8,12 +8,15 @@
   </Identity>
   <Cost>
     <PopulationBonus>0</PopulationBonus>
-    <BuildTime>60</BuildTime>
+    <BuildTime>50</BuildTime>
     <Resources>
-      <wood>75</wood>
-      <stone>75</stone>
+      <wood>50</wood>
+      <stone>50</stone>
     </Resources>
   </Cost>
+  <Health>
+    <Max>500</Max>
+  </Health>
   <VisualActor>
     <Actor>structures/celts/kennel.xml</Actor>
   </VisualActor>
@@ -23,10 +26,10 @@
     </Entities>
   </TrainingQueue>
   <Footprint>
-    <Square width="18.0" depth="16.0"/>
+    <Square width="8.0" depth="7.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Obstruction>
-    <Static width="16.5" depth="13.0"/>
+    <Static width="7.5" depth="6.75"/>
   </Obstruction>
 </Entity>