diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend1.png
new file mode 100644
index 000000000000..57b577f87dd8
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend2.png
new file mode 100644
index 000000000000..720e1332a1e8
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/archer-defend2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend1.png
new file mode 100644
index 000000000000..c0c7b8290176
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend2.png
new file mode 100644
index 000000000000..97500ad97e9e
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid-defend2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png
index 318c833bc0c2..30d39cec055e 100644
Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/druid.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend1.png
new file mode 100644
index 000000000000..c9daf06493f6
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend2.png
new file mode 100644
index 000000000000..b2a7eb5e3f33
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/flanker-defend2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas1.png
new file mode 100644
index 000000000000..a2dcef7acea0
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas2.png
new file mode 100644
index 000000000000..7289e5b8446d
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas3.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas3.png
new file mode 100644
index 000000000000..c254d840d90f
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas3.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas4.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas4.png
new file mode 100644
index 000000000000..7b91eccc44bb
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-bolas4.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead1.png
new file mode 100644
index 000000000000..17d543bab439
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead2.png
new file mode 100644
index 000000000000..2b3af1492651
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh-lead2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead1.png
new file mode 100644
index 000000000000..59c7a219bb0b
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead2.png
new file mode 100644
index 000000000000..70d6d6094eea
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/nym-lead2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend1.png
new file mode 100644
index 000000000000..a6698ccf97cb
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend1.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend2.png
new file mode 100644
index 000000000000..37aab5e34aba
Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/ranger-defend2.png differ
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
index 13d72ed9dd61..f7eb90356c48 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Archer.cfg
@@ -45,7 +45,7 @@
         icon=attacks/bow-elven.png
         movement_used=0
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/archer.png" "units/quenoth/archer.png" {SOUND_LIST:HORSE_HIT}}
+    {DEFENSE_ANIM "units/quenoth/archer-defend2.png" "units/quenoth/archer-defend1.png" {SOUND_LIST:HORSE_HIT}}
     [attack_anim]
         [filter_attack]
             name=sword
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
index 9970d9077247..db93ef113046 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Druid.cfg
@@ -58,7 +58,7 @@
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/druid.png" "units/quenoth/druid.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {DEFENSE_ANIM "units/quenoth/druid-defend2.png" "units/quenoth/druid-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} }
     [healing_anim]
         start_time=-250
         [frame]
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
index fd614c133f0a..a4a0b236215b 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Flanker.cfg
@@ -48,7 +48,7 @@
             {WEAPON_SPECIAL_POISON}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/flanker.png" "units/quenoth/flanker.png" {SOUND_LIST:ELF_HIT}}
+    {DEFENSE_ANIM "units/quenoth/flanker-defend2.png" "units/quenoth/flanker-defend1.png" {SOUND_LIST:ELF_HIT}}
     [attack_anim]
         [filter_attack]
             name=sword
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
index c64dfc57c827..9089a8f00440 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Ranger.cfg
@@ -49,7 +49,7 @@
             {WEAPON_SPECIAL_POISON}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/ranger.png" "units/quenoth/ranger.png" {SOUND_LIST:ELF_HIT}}
+    {DEFENSE_ANIM "units/quenoth/ranger-defend2.png" "units/quenoth/ranger-defend1.png" {SOUND_LIST:ELF_HIT}}
     [attack_anim]
         [filter_attack]
             name=sword
diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
index 706e7a4c7011..e05e0cd860f2 100644
--- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Youth.cfg
@@ -317,8 +317,18 @@ _"Nym is Kaleh’s childhood friend, a young, rebellious lady with quick wits an
 #enddef
 
 #define KALEH_ANIMATIONS
+    {LEADING_ANIM "units/quenoth/kaleh-lead2.png" "units/quenoth/kaleh-lead1.png" (12,-32)}
     {DEFENSE_ANIM_RANGE "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_HIT} melee}
-    {DEFENSE_ANIM_RANGE "units/quenoth/kaleh-bow-defend-2.png" "units/quenoth/kaleh-bow-defend-1.png" {SOUND_LIST:ELF_HIT} ranged}
+    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-bow-defend-2.png" "units/quenoth/kaleh-bow-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
+        [filter_second_attack]
+            name=bow
+        [/filter_second_attack] 
+	)}
+    {DEFENSE_ANIM_FILTERED "units/quenoth/kaleh-defend-2.png" "units/quenoth/kaleh-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
+        [filter_second_attack]
+            name=bolas
+        [/filter_second_attack] 
+	)}
     [attack_anim]
         [filter_attack]
             name=bow
@@ -356,15 +366,16 @@ _"Nym is Kaleh’s childhood friend, a young, rebellious lady with quick wits an
             image=projectiles/bolas-n.png
             image_diagonal=projectiles/bolas-ne.png
         [/missile_frame]
-        start_time=-300
+        start_time=-400
         [frame]
-            image=units/quenoth/kaleh.png:400
+            image=units/quenoth/kaleh-bolas[1,2,3,4].png:[70,80,100,200]
         [/frame]
         {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -300}
     [/attack_anim]
 #enddef
 
 #define NYM_ANIMATIONS
+    {LEADING_ANIM "units/quenoth/nym-lead2.png" "units/quenoth/nym-lead1.png" (12,-32)}
     {DEFENSE_ANIM_RANGE "units/quenoth/nym-defend-2.png" "units/quenoth/nym-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
     {DEFENSE_ANIM_FILTERED "units/quenoth/nym-bow-defend-2.png" "units/quenoth/nym-bow-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
         [filter_second_attack]