diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/attack_melee_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/attack_melee_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/spearman/attack_melee_a.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/spearman/attack_melee_01.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shield.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shield.dae
index 66200ec2eb..af3633ee51 100644
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shield.dae
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_ready_shield.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77b8aab814636306209cb6a9c1fb9365fe2dfa3dea8ea14fafdb90f166391c0f
-size 1333791
+oid sha256:fd08aba9be50cafd202b29ef189e7f5a982560668b1ac4b9ca939a013d00ec68
+size 1428983
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield.dae
deleted file mode 100644
index ebafaab905..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:090559bdb4c88c10aa35312b0e2c6ad5b50bc08d04dd91a3c72aad8932775bf8
-size 1361572
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_01.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_01.dae
new file mode 100644
index 0000000000..fcbef19ddb
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8bf2e368fca8803ed20cf4a4b71519c4ba40702ac70388156af498fba0efe3e
+size 1434901
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_02.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_02.dae
new file mode 100644
index 0000000000..cbbf19907d
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87aa2fe63083d6c0720885c4b6d30232a078b2f5ab70fddbb5c21fa00b5b0484
+size 1436343
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_03.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_03.dae
new file mode 100644
index 0000000000..b43951b5e1
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cb6f2a9d866146ba3562fea40f1728c5991fe8aa7b4ce454510f3efa3388a9d
+size 1436431
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_04.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_04.dae
new file mode 100644
index 0000000000..da2a181dd6
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_04.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21b1e85ecb6b24525421a15912a0494526bb9a57e962988544fb5d9074bb6db4
+size 1437027
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_05.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_05.dae
new file mode 100644
index 0000000000..8e21e008aa
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_05.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04d9b620ef05e67c5250d1e0d9c87aeeb81683d2457afc27b2fca275a5d27689
+size 1436340
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_a.dae
deleted file mode 100644
index c64f452e8e..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_a.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:900c50178e396f0cc297e2e93b4726f25786c2b8c813c1d1da74c472902d5e85
-size 1437061
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_b.dae
deleted file mode 100644
index 510b7ac688..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_b.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:622c326de502257842b63460c031f40f7a0899dfcb03499be63c99db44a9d9d8
-size 1436034
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_c.dae
deleted file mode 100644
index 7092dbdcd5..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_c.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cf74b51c8e2ba48ae3008ec5c512fba107f7e58f0d5dd43acbe245422753ee8
-size 1436664
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_d.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_d.dae
deleted file mode 100644
index 1835e91a67..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_d.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62e80436eb4bdfa06ec7c81ce94d172094569fec6f4504eb0fd44faa2a54138e
-size 1437103
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_e.dae b/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_e.dae
deleted file mode 100644
index b459cd027f..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/spearman/idle_relax_shield_e.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d8fedf18b12fb9f353bb24cba5259c210a4a571b59e68e5efa36e81b4534125
-size 1436707
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_a.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_01.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_02.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_b.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_02.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_03.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_c.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_03.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_d.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_04.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_d.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_2h_04.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_01.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_01.dae
new file mode 100644
index 0000000000..54917b245b
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8397b7e93744f614c2d0109be758c4ed852773bebccbfc1249efad1839b0c049
+size 990085
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_02.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_02.dae
new file mode 100644
index 0000000000..a71a005bfa
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c390260af558f26c518c0b0d0fa3b4558183b676ca0097141e5d5b1f379058a
+size 987915
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_03.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_03.dae
new file mode 100644
index 0000000000..6b0bb4802d
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:784916de8fb494a6fc62b8ebd1f02bacbe976328b9a2bea4fa09c28e55630310
+size 990300
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_d.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_04.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_d.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_04.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_05.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_05.dae
new file mode 100644
index 0000000000..427dc75424
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_05.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98c92039b0949e16a3246c778bcc53f3fba84539ce8266a0f1204f00cd917f49
+size 988474
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_a.dae
deleted file mode 100644
index e764c6088e..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_a.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79bb04eb7521dd31728e2f9101123493bc673e2466b74213e93bbe8783f08200
-size 984167
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_b.dae
deleted file mode 100644
index 6e04d37900..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_b.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c89ac04094ee4207812d7a4d5f575c08c89114444fb3a18b1a2f374f340b24
-size 981997
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_c.dae
deleted file mode 100644
index f6154d83bb..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shield_c.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac01db60520ba375a918bae77170d95e4e9f56360d15e2eaa67e03dc2bf387ee
-size 984382
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_01.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_a.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_01.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_02.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_b.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_02.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_03.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_c.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldarm_03.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_04.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_a.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_04.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_05.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_b.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_05.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_06.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_c.dae
rename to binaries/data/mods/public/art/animation/biped/infantry/swordsman/attack_melee_shieldsmall_06.dae
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_01.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_01.dae
new file mode 100644
index 0000000000..5130094ba0
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0af2b023ccb622db0e361c89ca4773eae0efcb275b4de7645e00bf071ddd11de
+size 1419599
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_02.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_02.dae
new file mode 100644
index 0000000000..a0eaeab597
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ee7f4c32714e4e191fd3353b72f71282db3102912834267ac009758ba20bbea
+size 1421379
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_03.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_03.dae
new file mode 100644
index 0000000000..c04fa7f4ab
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de084e5f2c2df9c973fbbf347ac2da181005c26fc143c8ceb61963eadaf71f7c
+size 1421252
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_04.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_04.dae
new file mode 100644
index 0000000000..682e464ab7
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_04.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1b377dca6e53c430c71e7c3ac30050f026095d4aba184b17989ad691cd9f889
+size 1431538
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_05.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_05.dae
new file mode 100644
index 0000000000..32d07ac81a
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_05.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b110c6c9131e06573ae2d8d8cbefd4bf48ecc283aa4eec2274e9b196d16a0766
+size 1423221
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_06.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_06.dae
new file mode 100644
index 0000000000..72e77bc76a
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_06.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:436715d7b7d038582f3cdb3b86615597e8965e071c5dc4231b23b8575de9ee37
+size 1419170
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_a.dae
deleted file mode 100644
index 0494f732d6..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_a.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ffad1217c192e71811c22843dd48a7a87b12ad4bc4cc392462cab291707817f
-size 1419678
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_b.dae
deleted file mode 100644
index eed8339b33..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_b.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:488a769e58d2a51a04d627fbece707f4dae05c964922728eefcc74ee275cc846
-size 1421458
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_c.dae
deleted file mode 100644
index 361cc87554..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_c.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95d217ff22767318bc8e5a54605eaee71c772190ff03e3d46b0d35b00c2ca2e1
-size 1420997
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_long_celt_01.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_long_celt_01.dae
new file mode 100644
index 0000000000..34afad2b4f
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_ready_shield_long_celt_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2752de110d3d69ca0d19af23f59eb2192aa6c4d8f3c78d2b54c8be06a7318001
+size 2345123
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_01.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_01.dae
new file mode 100644
index 0000000000..2ba174962b
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b302dc90c707a211c4c517653d86bb04e94246e7eee93ff20ab9e92c8f1c3b5
+size 1457865
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_02.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_02.dae
new file mode 100644
index 0000000000..a9fb33c905
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dabc81efef051a51dc66c86c726def3d21c18a5e362b930676d9b8368cfc1035
+size 1435081
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_03.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_03.dae
new file mode 100644
index 0000000000..6de7184d58
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_03.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:438e75f56fcb275470faac6c9bda5d4ed8926f7cb352ff1ef727512d67047d11
+size 1431539
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_04.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_04.dae
new file mode 100644
index 0000000000..5858581c7d
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_04.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76f05d9f9a5fa1195d122cdcedbf8d2f5050a95e670eacde9732def01aae4f4e
+size 1437528
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_05.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_05.dae
new file mode 100644
index 0000000000..b2e312ba74
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_05.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cc36fba6729c423130a4eaf842beb58c9e6c9af4ff16c6458c22d73739ab6cc
+size 1435502
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_06.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_06.dae
new file mode 100644
index 0000000000..7ed5a6d324
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_06.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bf78472a2b63984f377c485c87b5e2277b3eb29c556dac92e8bc48fd3b9dcc6
+size 1434952
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_07.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_07.dae
new file mode 100644
index 0000000000..2f084c973f
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_07.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d17d90e7b84f46f29007705d46ab0ce469f71379284040f9283fc42313817b9
+size 1434597
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_a.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_a.dae
deleted file mode 100644
index 6cc2bb7c24..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_a.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9338c27311e367aba17a5f1cd254e4d914f6754adee21906cb64b256f7e32d9e
-size 1438291
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_b.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_b.dae
deleted file mode 100644
index 4da06c1fdc..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_b.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5042adc62cdafcef8a8c9cb907ecdf979585ec5c39754ca716b88e6e5072ba46
-size 1435481
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_c.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_c.dae
deleted file mode 100644
index 6b484478a5..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_c.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f92b37ef88d2978d3f5801414c12e07aaa0b09da8365a8bfed360f2794a18453
-size 1436754
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_d.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_d.dae
deleted file mode 100644
index ad76a41dd1..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_d.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:964a81949c8c0fdaa163961e28759d6100747a5acb719b804a60bec96f95f239
-size 1438148
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_e.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_e.dae
deleted file mode 100644
index aa59380715..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_e.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f076ebdfbc8bbb4b57cf2fa5373730378529753d57ad2d7343e66d87db0437cc
-size 1436627
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_f.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_f.dae
deleted file mode 100644
index ea3a490710..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_f.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54406aba97ce1df468932416810e5f52dcc4dc547968cf1293390406a8feb887
-size 1435228
diff --git a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_g.dae b/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_g.dae
deleted file mode 100644
index 39798f1b24..0000000000
--- a/binaries/data/mods/public/art/animation/biped/infantry/swordsman/idle_relax_shield_g.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9387780dc98252b5c5458b6cbafdcc03aa4587cb404f3e3f1fe1e31e76e570d1
-size 1434609
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
index 55cd74d897..fffa36ea63 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
@@ -9,9 +9,9 @@
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="Attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack3" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="Attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack3" speed="120"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
index 30ed309342..592be96053 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
@@ -9,8 +9,8 @@
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_01.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
index 2ab0b38e3e..ce8fa7858b 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
@@ -9,8 +9,8 @@
     <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/spearman/attack_melee_01.dae" name="Attack_melee" id="attack1" speed="30"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
index bf1e229862..7abd22c6ce 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/infantry/spearman/idle_relax_shield_a.dae" name="Idle" id="idle1" frequency="10" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_b.dae" name="Idle" id="idle2" frequency="2" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_c.dae" name="Idle" id="idle3" frequency="2" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_d.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_e.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_long_a.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_01.dae" name="Idle" id="idle1" frequency="10" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_02.dae" name="Idle" id="idle2" frequency="2" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_03.dae" name="Idle" id="idle3" frequency="2" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_long_01.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
     <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk1" speed="30"/>
     <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk2" speed="32"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="Attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack3" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="Attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack3" speed="120"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_shield_ready.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_ready.xml
new file mode 100644
index 0000000000..e29e0d5023
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_ready.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Ready">
+  <animations>
+    <animation file="biped/infantry/spearman/idle_ready_shield.dae" name="Idle" id="idle1" speed="30"/>
+    <animation file="biped/infantry/spearman/idle_ready_shield.dae" name="Idle" id="idle2" speed="31"/>
+    <animation file="biped/infantry/spearman/idle_ready_shield.dae" name="Idle" id="idle3" speed="32"/>
+    <animation file="biped/infantry/spearman/walk_ready_shield.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_ready_shield.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="Attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack3" speed="120"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax.xml
new file mode 100644
index 0000000000..f4f5039eaf
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/spearman/idle_relax_shield_01.dae" name="Idle" id="idle1" frequency="10" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_02.dae" name="Idle" id="idle2" frequency="2" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_03.dae" name="Idle" id="idle3" frequency="2" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
+    <animation file="biped/infantry/spearman/idle_relax_shield_long_01.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk1" speed="30"/>
+    <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk2" speed="32"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="Attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack3" speed="120"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax_celt.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax_celt.xml
index 67cdcd40a0..8e5df886f1 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax_celt.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_shield_relax_celt.xml
@@ -7,15 +7,14 @@
     <animation file="biped/infantry/spearman/idle_relax_shield_celt_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
     <animation file="biped/infantry/spearman/idle_relax_shield_celt_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
     <animation file="biped/infantry/spearman/idle_relax_shield_long_celt_01.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
-    <animation file="biped/infantry/spearman/idle_relax_shield_celt_01.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
     <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk1" speed="30"/>
     <animation file="biped/infantry/spearman/walk_relax_shield.dae" name="Walk" id="walk2" speed="32"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="Attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack3" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="Attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="Attack_melee" id="attack2" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack3" speed="120"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
index 882da1c2e0..73c4148271 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_ready.xml
@@ -9,9 +9,9 @@
     <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_2h.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_a.dae" name="attack_melee" id="attack1" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_c.dae" name="attack_melee" id="attack3" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_01.dae" name="attack_melee" id="attack1" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_03.dae" name="attack_melee" id="attack3" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
index cc2d05559d..9fbac70287 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_2hand_relax.xml
@@ -9,9 +9,9 @@
     <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_relax_2h.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_a.dae" name="attack_melee" id="attack1" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_c.dae" name="attack_melee" id="attack3" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_01.dae" name="attack_melee" id="attack1" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_2h_03.dae" name="attack_melee" id="attack3" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
index 59ad9801d0..4e5304a99c 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
@@ -7,9 +7,9 @@
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
index 909db3ecb1..9cd80f376a 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
@@ -8,9 +8,9 @@
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
index dc9fb30b84..7b1d2ffd59 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/infantry/swordsman/idle_ready_shield_a.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_ready_shield_b.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_ready_shield_c.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_01.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_02.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_03.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_04.dae" name="Idle" id="idle4" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_05.dae" name="Idle" id="idle5" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_06.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
     <animation file="biped/infantry/swordsman/walk_ready_shield.dae" name="Walk" speed="30"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack4" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack4" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_05.dae" name="attack_melee" id="attack5" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready_celt.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready_celt.xml
new file mode 100644
index 0000000000..d49f1a2968
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready_celt.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_01.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_02.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_03.dae" name="Idle" id="idle3" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_05.dae" name="Idle" id="idle5" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_06.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_ready_shield_long_celt_01.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/walk_ready_shield.dae" name="Walk" speed="30"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack4" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_05.dae" name="attack_melee" id="attack5" speed="100"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
index 5102b09d22..54351f96ce 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_b.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_c.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_d.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_e.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_f.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_g.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle8" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_01.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_02.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_03.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_06.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_07.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
     <animation file="biped/infantry/swordsman/walk_relax_shield.dae" name="Walk" speed="30"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack4" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack4" speed="120"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax_celt.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax_celt.xml
index b635481401..62a30262a0 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax_celt.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax_celt.xml
@@ -11,10 +11,10 @@
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_d.dae" name="attack_melee" id="attack4" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_03.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_04.dae" name="attack_melee" id="attack4" speed="120"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
index b45de36d75..a6e8f6d400 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
@@ -7,9 +7,9 @@
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
index 8ad51d10a1..e356ee09f1 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
@@ -7,9 +7,9 @@
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
index 7fdf89117a..77963859e2 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_b.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_c.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_d.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_e.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_f.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_g.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle8" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_01.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_02.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_03.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_06.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_07.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_01.dae" name="Idle" id="idle8" frequency="1" speed="80"/>
     <animation file="biped/infantry/swordsman/jog_relax_shieldarm.dae" name="Walk" speed="12"/>
     <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
index 56e701fb4e..8a57fd0aea 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
@@ -7,9 +7,9 @@
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml
index d813bee3b9..669d46e309 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Base" frequency="1">
   <animations>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_b.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_c.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_d.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_e.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_f.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_g.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
-    <animation file="biped/infantry/swordsman/idle_relax_shield_a.dae" name="Idle" id="idle8" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_01.dae" name="Idle" id="idle1" frequency="8" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_02.dae" name="Idle" id="idle2" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_03.dae" name="Idle" id="idle3" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_04.dae" name="Idle" id="idle4" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_05.dae" name="Idle" id="idle5" frequency="3" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_06.dae" name="Idle" id="idle6" frequency="1" speed="80"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shield_07.dae" name="Idle" id="idle7" frequency="1" speed="80"/>
     <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="12"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
     <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_a.dae" name="attack_melee" id="attack1" speed="120"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_b.dae" name="attack_melee" id="attack2" speed="100"/>
-    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_01.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_02.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_03.dae" name="attack_melee" id="attack3" speed="80"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
   </animations>
 </variant>