diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/female_citizen.xml b/binaries/data/mods/public/art/actors/units/ptolemies/female_citizen.xml
index cc757668da..22a57b93cb 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/female_citizen.xml
@@ -20,7 +20,7 @@
         <animation file="female/f_gather_01.dae" name="gather_meat" speed="25"/>
         <animation event="0.4" file="female/f_mine_01.dae" name="gather_rock" speed="150"/>
         <animation event="0.4" file="female/f_mine_01.dae" name="gather_ore" speed="150"/>
-        <animation file="female/f_mine_01.dae" name="gather_ruins" speed="150"/>
+        <animation event="0.4" file="female/f_mine_01.dae" name="gather_ruins" speed="150"/>
         <animation event="0.6" file="female/f_build_01.dae" name="Build" speed="70"/>
         <animation file="female/f_death_01.dae" name="Death" speed="130"/>
       </animations>
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.ogg b/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.ogg
new file mode 100644
index 0000000000..ffa92ff303
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffa5508c45955557cb1ea500196202f9d2e7754fe4dd2850c88ef602a0ff9dee
+size 75304
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml b/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml
new file mode 100644
index 0000000000..82303d52dc
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>complete_blacksmith.ogg</Replacement>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_blacksmith.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.ogg b/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.ogg
new file mode 100644
index 0000000000..c12cfa4650
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5cebe13170b5acbd68a1c8f4de8d99388992f8eeaacb257604d22657a41c5c1
+size 61219
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml b/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml
new file mode 100644
index 0000000000..cb57f52d7d
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_cavalry_stables.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>complete_cavalry_stables.ogg</Replacement>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_cavalry_stables.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.ogg b/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.ogg
new file mode 100644
index 0000000000..36adb4bdb7
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53510a61b4de983dd6b973e6c7241bd95555cc10224f581536d7eed4ec2ee6ae
+size 71843
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml b/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml
new file mode 100644
index 0000000000..bbd0ea0465
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_elephant_stables.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>complete_elephant_stables.ogg</Replacement>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_elephant_stables.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.ogg b/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.ogg
new file mode 100644
index 0000000000..913570a1e6
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa4a17082c4ef8551496ec47983342063b83610a841ad32cc8abf9e27445f777
+size 95518
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.xml b/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.xml
new file mode 100644
index 0000000000..675425696e
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_greek_theater.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>complete_greek_theater.ogg</Replacement>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_greek_theater.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.ogg b/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.ogg
new file mode 100644
index 0000000000..c30bca1e7e
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0609d731e40c2bbb76408f8d30d783fd9b25b303b867a8d756d64a9fe8910b0
+size 35160
diff --git a/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.xml b/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.xml
new file mode 100644
index 0000000000..370a42ff20
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/complete/building/complete_wonder.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>complete_wonder.ogg</Replacement>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_wonder.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.ogg b/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.ogg
new file mode 100644
index 0000000000..3f41a1689e
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ddcdd69f28de386074a3909f97dc5bfa32d50779297f1cc2e2baac053ff7e81
+size 34885
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml b/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml
new file mode 100644
index 0000000000..60ae28a681
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>sel_blacksmith.ogg</Replacement>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_blacksmith.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.ogg b/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.ogg
new file mode 100644
index 0000000000..4921e028e4
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16aa370b659e5c4f1b0badd00c278bee7f2c688e3a7c5490ea8439b7bfd8e8ae
+size 31670
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml b/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml
new file mode 100644
index 0000000000..9c5fc84f31
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_cavalry_stables.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>sel_cavalry_stables.ogg</Replacement>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_cavalry_stables.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.ogg b/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.ogg
new file mode 100644
index 0000000000..2b50d6d534
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec1e7f2098bc0ab14091cde3ac7adf3d9635ddf7d61c0061e5a82951cb5bd133
+size 63141
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml b/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml
new file mode 100644
index 0000000000..4b8d0af15f
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_elephant_stables.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>sel_elephant_stables.ogg</Replacement>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_elephant_stables.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.ogg b/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.ogg
new file mode 100644
index 0000000000..f170da9db3
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:094d4d9b0c56cc2e3c08e39280c01369674eb9dd74cf97083eccd4681ea4a858
+size 93231
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.xml b/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.xml
new file mode 100644
index 0000000000..664e324529
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_greek_theater.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>sel_greek_theater.ogg</Replacement>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_greek_theater.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_wonder.ogg b/binaries/data/mods/public/audio/interface/select/building/sel_wonder.ogg
new file mode 100644
index 0000000000..d186251f05
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_wonder.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5581ea6abe503de52f2994d706620b5f09590cbff4966c480aa5fa2981d58412
+size 41315
diff --git a/binaries/data/mods/public/audio/interface/select/building/sel_wonder.xml b/binaries/data/mods/public/audio/interface/select/building/sel_wonder.xml
new file mode 100644
index 0000000000..300e7e0dd6
--- /dev/null
+++ b/binaries/data/mods/public/audio/interface/select/building/sel_wonder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Pitch>1</Pitch>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<ConeInner>360</ConeInner>
+	<ConeOuter>360</ConeOuter>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<GainUpper>1</GainUpper>
+	<GainLower>0.8</GainLower>
+	<RandPitch>1</RandPitch>
+	<PitchUpper>1.1</PitchUpper>
+	<PitchLower>0.9</PitchLower>
+	<Threshold>1</Threshold>
+	<Decay>3</Decay>
+	<Replacement>sel_wonder.ogg</Replacement>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_wonder.ogg</Sound>
+</SoundGroup>
\ No newline at end of file
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
index 5375dfcbea..e517e2c30c 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb4061b4120a2786fe65747f8daf0d3d54206c2493ec287d3350b541e5ae15d7
-size 341848
+oid sha256:d721e7963a22e3f6f29dfa29b5cf3cc1d0bd0dce34923ff8a9e903f37bf50793
+size 342225
diff --git a/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.pmp b/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.pmp
new file mode 100644
index 0000000000..1263c9eedd
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbb07b077b2b9ba6602220d5c62bded25811b4e19d12651bf9903743f1ad7e21
+size 657157
diff --git a/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.xml b/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.xml
new file mode 100644
index 0000000000..5e68b8b5fe
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Median Oasis - 4 Players.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:124f6dfa66b8d8c7c27377c502aa56ca82bff73cfd40b9564770ae5ba8a73074
+size 480686
diff --git a/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.pmp b/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.pmp
new file mode 100644
index 0000000000..3c35b799c1
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7f6f2b9fcf70ef4503b5b4458be29ed33fd46d9c343a80e39bf88037c786224
+size 656920
diff --git a/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.xml b/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.xml
new file mode 100644
index 0000000000..ee6927d101
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Oasis - 2 Players.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b65b0262e1c4a587d0e5070f426de62ecd7d561485a18e27bba4c52103087d6
+size 272769
diff --git a/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.pmp b/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.pmp
new file mode 100644
index 0000000000..500f9e34ec
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac10b6b9e43b1d12af5b2aec279571691dea8d104e64baf8f230a49049384bc3
+size 1025860
diff --git a/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.xml b/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.xml
new file mode 100644
index 0000000000..05e89e47be
--- /dev/null
+++ b/binaries/data/mods/public/maps/skirmishes/Oasis - 4 Players.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:920648401501f6c536604d5da78438298c3e17814ecedbdcce4a3bfd3b931a76
+size 501657
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json b/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json
index ffc3ff9132..789c099291 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_tower_watch.json
@@ -1,6 +1,15 @@
 {
 	"pair": "pair_tower_01",	
 	"genericName": "Sentries",
+	"specificName": {
+		"hele": "Nyktophylakes",
+		"mace": "Nyktophylakes",
+		"spart": "Nyktophylakes",
+		"athen": "Nyktophylakes",
+		"ptol": "Nyktophylakes",
+		"sele": "Nyktophylakes",
+		"rome": "Vigiles"
+	},
 	"description": "A night's watch increases vigilance.",
 	"cost": {"food": 100, "wood": 100, "stone": 0, "metal": 0},
 	"requirements": {"tech": "phase_town"},
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
index 5d7882c51d..3cd47a35c0 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
@@ -38,8 +38,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_theater.xml</select>
-      <constructed>interface/complete/building/complete_theatre.xml</constructed>
+      <select>interface/select/building/sel_greek_theater.xml</select>
+      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml
index b1ff9f7371..239c1613ea 100644
--- a/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/hele_theatron.xml
@@ -37,8 +37,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_theater.xml</select>
-      <constructed>interface/complete/building/complete_theatre.xml</constructed>
+      <select>interface/select/building/sel_greek_theater.xml</select>
+      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
index c7c3bfd5e5..6226183246 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
@@ -37,8 +37,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_theater.xml</select>
-      <constructed>interface/complete/building/complete_theatre.xml</constructed>
+      <select>interface/select/building/sel_greek_theater.xml</select>
+      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml b/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
index e8915771ab..facedc5b35 100644
--- a/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
@@ -38,8 +38,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_broch.xml</select>
-      <constructed>interface/complete/building/complete_broch.xml</constructed>
+      <select>interface/select/building/sel_elephant_stables.xml</select>
+      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml b/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
index 098b6f42de..05a8405e55 100644
--- a/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
@@ -43,6 +43,13 @@
 	  persians/training_conscription_cavalry
     </Technologies>
   </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_cavalry_stables.xml</select>
+      <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
   <VisualActor>
     <Actor>structures/persians/stables.xml</Actor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
index 631435221a..db2b310b14 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_house.xml
@@ -7,7 +7,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="14.0" depth="14.0"/>
+    <Square width="16.0" depth="16.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
@@ -20,7 +20,7 @@
     <History>Since they are made of mud brick, Egyptian houses are free of cost, but are very weak.</History>
   </Identity>
   <Obstruction>
-    <Static width="10.0" depth="10.0"/>
+    <Static width="14.0" depth="14.0"/>
   </Obstruction>
   <VisualActor>
     <Actor>structures/ptolemies/house.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
index 4de539cf7c..e18e293e03 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
@@ -37,8 +37,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_theater.xml</select>
-      <constructed>interface/complete/building/complete_theatre.xml</constructed>
+      <select>interface/select/building/sel_greek_theater.xml</select>
+      <constructed>interface/complete/building/complete_greek_theater.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
index 84db914462..047e71a82f 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
@@ -59,8 +59,8 @@
   </ProductionQueue>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_barracks.xml</select>
-      <constructed>interface/complete/building/complete_barracks.xml</constructed>
+      <select>interface/select/building/sel_blacksmith.xml</select>
+      <constructed>interface/complete/building/complete_blacksmith.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
index 3b6ca8aca9..34598f3efd 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -54,8 +54,8 @@
   <RallyPoint disable=""/>
   <Sound>
     <SoundGroups>
-      <select>interface/select/building/sel_temple.xml</select>
-      <constructed>interface/complete/building/complete_temple.xml</constructed>
+      <select>interface/select/building/sel_wonder.xml</select>
+      <constructed>interface/complete/building/complete_wonder.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
index 9d730a2f4f..e30a312963 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -19,7 +19,7 @@
         <Multiplier>1.5</Multiplier>
       </BonusSecondary>
     </Bonuses>
-  <RestrictedClasses datatype="tokens">-StoneWall</RestrictedClasses>
+    <RestrictedClasses datatype="tokens">-StoneWall</RestrictedClasses>
   </Attack>
   <Cost>
     <Resources>