diff --git a/data/core/units/orcs/Nightblade.cfg b/data/core/units/orcs/Nightblade.cfg
index d0725dfb6d47..e8bdd615627e 100644
--- a/data/core/units/orcs/Nightblade.cfg
+++ b/data/core/units/orcs/Nightblade.cfg
@@ -65,288 +65,69 @@
         [/specials]
     [/attack]
 	
+    {DEFENSE_ANIM "units/orcs/nightblade-defend-se2-1.png" "units/orcs/nightblade-defend-se2-2.png" {SOUND_LIST:ORC_SMALL_HIT}}
+    
     [defend]
-        hits=miss
-        [frame]
-            begin=-149
-            end=-150
-            image="units/orcs/nightblade.png"
-        [/frame]
-        [frame]
-            begin=-150
-            end=-50
-            image="units/orcs/nightblade-defend-se2-1.png"
-        [/frame]
-        [frame]
-            begin=-50
-            end=50
-            image="units/orcs/nightblade-defend-se2-2.png"
-        [/frame]
-        [frame]
-            begin=50
-            end=150
-            image="units/orcs/nightblade-defend-se2-1.png"
-        [/frame]
-        [frame]
-            begin=150
-            end=151
-            image="units/orcs/nightblade.png"
-        [/frame]
-    [/defend]
-
-    [defend]
-        hits=miss
-        [frame]
-            begin=-370
-            end=-270
-            image="units/orcs/nightblade.png"
-        [/frame]
-        [frame]
-            begin=-270
-            end=-170
-            image="units/orcs/nightblade-defend-se1-1.png"
-        [/frame]
-        [frame]
-            begin=-170
-            end=-70
-            image="units/orcs/nightblade-defend-se1-2.png"
-        [/frame]
-        [frame]
-            begin=-70
-            end=70
-            image="units/orcs/nightblade-defend-se1-3.png"
-        [/frame]
-        [frame]
-            begin=70
-            end=170
-            image="units/orcs/nightblade-defend-se1-4.png"
-        [/frame]
-        [frame]
-            begin=170
-            end=270
-            image="units/orcs/nightblade-defend-se1-5.png"
-        [/frame]
-        [frame]
-            begin=270
-            end=370
-            image="units/orcs/nightblade.png"
-        [/frame]
-    [/defend]
-
-    [defend]
-        hits=hit
-        [frame]
-            begin=-126
-            end=-125
-            image="units/orcs/nightblade.png"
-        [/frame]
-        [frame]
-            begin=-125
-            end=125
-            image="units/orcs/nightblade-defend-se1-1.png"
-            sound={SOUND_LIST:ORC_HIT}
-        [/frame]
+        start_time=-150
+        [if]
+            hits=hit
+            sound_start_time=-25
+            [sound_frame]
+                sound={SOUND_LIST:ORC_SMALL_HIT}
+            [/sound_frame]
+        [/if]
         [frame]
-            begin=125
-            end=126
-            image="units/orcs/nightblade.png"
+            image="units/orcs/nightblade-defend-se1-[1~5].png:100"
         [/frame]
     [/defend]
 
-
     [attack_anim]
         [filter_attack]
             name=throwing knives
         [/filter_attack]
-        start_time=-450
-        [missile_frame]
-            begin=-150
-            end=0
-            image="projectiles/dagger-n.png"
-            image_diagonal="projectiles/dagger-ne.png"
-        [/missile_frame]
-
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se1.png"
-        [/frame]
-
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se2.png"
-        [/frame]
-
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se3.png"
-        [/frame]
-
-        [if]
-            hits=yes
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-throw-se4.png"
-                sound=throwing-knife.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-throw-se4.png"
-                sound=throwing-knife-miss.ogg
-            [/frame]
-        [/else]
-
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se5.png"
-        [/frame]
-
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se6.png"
-        [/frame]
 
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se7.png"
-        [/frame]
+        start_time=-350
+        missile_start_time=-100
 
-        [frame]
+        [missile_frame]
             duration=100
-            image="units/orcs/nightblade-throw-se8.png"
-        [/frame]
+            image=projectiles/dagger-n.png
+            image_diagonal=projectiles/dagger-ne.png
+        [/missile_frame]
 
         [frame]
-            duration=100
-            image="units/orcs/nightblade-throw-se9.png"
+            image="units/orcs/nightblade-throw-se[1~9].png:100"
         [/frame]
 
+        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -100}
         {SOUND:POISON}
     [/attack_anim]
-
     [attack_anim]
         [filter_attack]
             name=blade
         [/filter_attack]
-        start_time=-500
-        offset=0.0~0.5:500,0.5~0.0:500
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se4.png"
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-attack-se5.png"
-                sound={SOUND_LIST:SWORD_SWISH}
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-attack-se5.png"
-                sound={SOUND_LIST:MISS}
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se6.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se7.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se8.png"
-        [/frame]
+
+        start_time=-550
         [frame]
-            duration=100
-            image="units/orcs/nightblade-attack-se9.png"
+            image="units/orcs/nightblade-attack-se[1~9].png:100"
+        #   offset=0.0~0.5:500,0.5~0.0:400
         [/frame]
+
+        {SOUND:HIT_AND_MISS dagger-swish.wav {SOUND_LIST:MISS} -100}
     [/attack_anim]
+    
 
     [attack_anim]
         [filter_attack]
             name=kick
         [/filter_attack]
-        start_time=-500
-        offset=0.0~0.0:300,0.0~0.3:300,0.3~0.4:200,0.4~0.4:200,0.4~0.0:200
+        
+        start_time=-500       
         [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se1.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se2.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se3.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se4.png"
-        [/frame]
-        [if]
-            hits=yes
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-kick-se5.png"
-                sound=club.ogg
-            [/frame]
-        [/if]
-        [else]
-            hits=no
-            [frame]
-                duration=100
-                image="units/orcs/nightblade-kick-se5.png"
-                sound={SOUND_LIST:MISS}
-            [/frame]
-        [/else]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se6.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se7.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se8.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se9.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se10.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se11.png"
-        [/frame]
-        [frame]
-            duration=100
-            image="units/orcs/nightblade-kick-se12.png"
+            image=units/orcs/nightblade-kick-se[1~12].png:[100,150*2,50*4,100*5]
+            offset=0.0~0.1:400,0.1~0.3:100,0.3~0.4:400,0.4~0.0:200
         [/frame]
+        
+        {SOUND:HIT_AND_MISS club.ogg {SOUND_LIST:MISS} -100}
     [/attack_anim]
-[/unit_type]
+[/unit_type]
\ No newline at end of file