diff --git a/data/core/about.cfg b/data/core/about.cfg
index 28c7b24a1e1b..bc0c59d9752e 100644
--- a/data/core/about.cfg
+++ b/data/core/about.cfg
@@ -902,7 +902,7 @@
     [/entry]
     [entry]
         name = "Aishiko"
-	comment = "Unit instance recall cost implementation"
+        comment = "Unit instance recall cost implementation"
     [/entry]
     [entry]
         name = "Alesis Novik"
diff --git a/data/core/editor/help.cfg b/data/core/editor/help.cfg
index 8d56120026e7..1c80e065b231 100644
--- a/data/core/editor/help.cfg
+++ b/data/core/editor/help.cfg
@@ -55,4 +55,3 @@ bah, too technical"
 #     title= _ "Selection Tool"
 #     text= _ "Many words about the cool selection tool"
 # [/topic]
-
diff --git a/data/core/team-colors.cfg b/data/core/team-colors.cfg
index bf191cb75504..54890a212a18 100644
--- a/data/core/team-colors.cfg
+++ b/data/core/team-colors.cfg
@@ -144,7 +144,6 @@
     name= _ "Gold"
 [/color_range]
 
-
 # The following team colors are an extended palette meant specifically to recolor the background of terrain type icons
 # Each color range is named after the terrain type it corresponds to.
 
diff --git a/data/core/units/orcs/Nightblade.cfg b/data/core/units/orcs/Nightblade.cfg
index e8bdd615627e..3d833e0abca1 100644
--- a/data/core/units/orcs/Nightblade.cfg
+++ b/data/core/units/orcs/Nightblade.cfg
@@ -1,133 +1,132 @@
-#textdomain wesnoth-units
-[unit_type]
-    id=Orcish Nightblade
-    name= _ "Orcish Nightblade"
-    race=orc
-    image="units/orcs/nightblade.png"
-    {MAGENTA_IS_THE_TEAM_COLOR}
-    profile="portraits/orcs/slayer.png"
-    hitpoints=48
-    movement_type=elusivefoot
-    [resistance]
-        arcane=100
-    [/resistance]
-    movement=6
-    experience=150
-    level=3
-    alignment=chaotic
-    advances_to=null
-    {AMLA_DEFAULT}
-    cost=43
-    usage=mixed fighter
-    description= _ "."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_SKIRMISHER}
-    die_sound={SOUND_LIST:ORC_DIE}
-    [portrait]
-        size=400
-        side="left"
-        mirror="false"
-        image="portraits/orcs/transparent/slayer.png"
-    [/portrait]
-    [portrait]
-        size=400
-        side="right"
-        mirror="true"
-        image="portraits/orcs/transparent/slayer.png"
-    [/portrait]
-    [attack]
-        name=blade
-        description=_"blade"
-        icon=attacks/dagger-orcish.png
-        type=blade
-        range=melee
-        damage=12
-        number=2
-    [/attack]
-    [attack]
-        name=kick
-        description=_"kick"
-        icon=attacks/blank-attack.png
-        type=impact
-        range=melee
-        damage=11
-        number=2
-    [/attack]
-    [attack]
-        name=throwing knives
-        description=_"throwing knives"
-        icon=attacks/dagger-thrown-poison-orcish.png
-        type=blade
-        range=ranged
-        damage=6
-        number=4
-        [specials]
-            {WEAPON_SPECIAL_MARKSMAN}
-            {WEAPON_SPECIAL_POISON}
-        [/specials]
-    [/attack]
-	
-    {DEFENSE_ANIM "units/orcs/nightblade-defend-se2-1.png" "units/orcs/nightblade-defend-se2-2.png" {SOUND_LIST:ORC_SMALL_HIT}}
-    
-    [defend]
-        start_time=-150
-        [if]
-            hits=hit
-            sound_start_time=-25
-            [sound_frame]
-                sound={SOUND_LIST:ORC_SMALL_HIT}
-            [/sound_frame]
-        [/if]
-        [frame]
-            image="units/orcs/nightblade-defend-se1-[1~5].png:100"
-        [/frame]
-    [/defend]
-
-    [attack_anim]
-        [filter_attack]
-            name=throwing knives
-        [/filter_attack]
-
-        start_time=-350
-        missile_start_time=-100
-
-        [missile_frame]
-            duration=100
-            image=projectiles/dagger-n.png
-            image_diagonal=projectiles/dagger-ne.png
-        [/missile_frame]
-
-        [frame]
-            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=-550
-        [frame]
-            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       
-        [frame]
-            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]
\ No newline at end of file
+#textdomain wesnoth-units
+[unit_type]
+    id=Orcish Nightblade
+    name= _ "Orcish Nightblade"
+    race=orc
+    image="units/orcs/nightblade.png"
+    {MAGENTA_IS_THE_TEAM_COLOR}
+    profile="portraits/orcs/slayer.png"
+    hitpoints=48
+    movement_type=elusivefoot
+    [resistance]
+        arcane=100
+    [/resistance]
+    movement=6
+    experience=150
+    level=3
+    alignment=chaotic
+    advances_to=null
+    {AMLA_DEFAULT}
+    cost=43
+    usage=mixed fighter
+    description= _ "."+{SPECIAL_NOTES}+{SPECIAL_NOTES_MARKSMAN}+{SPECIAL_NOTES_POISON}+{SPECIAL_NOTES_SKIRMISHER}
+    die_sound={SOUND_LIST:ORC_DIE}
+    [portrait]
+        size=400
+        side="left"
+        mirror="false"
+        image="portraits/orcs/transparent/slayer.png"
+    [/portrait]
+    [portrait]
+        size=400
+        side="right"
+        mirror="true"
+        image="portraits/orcs/transparent/slayer.png"
+    [/portrait]
+    [attack]
+        name=blade
+        description=_"blade"
+        icon=attacks/dagger-orcish.png
+        type=blade
+        range=melee
+        damage=12
+        number=2
+    [/attack]
+    [attack]
+        name=kick
+        description=_"kick"
+        icon=attacks/blank-attack.png
+        type=impact
+        range=melee
+        damage=11
+        number=2
+    [/attack]
+    [attack]
+        name=throwing knives
+        description=_"throwing knives"
+        icon=attacks/dagger-thrown-poison-orcish.png
+        type=blade
+        range=ranged
+        damage=6
+        number=4
+        [specials]
+            {WEAPON_SPECIAL_MARKSMAN}
+            {WEAPON_SPECIAL_POISON}
+        [/specials]
+    [/attack]
+
+    {DEFENSE_ANIM "units/orcs/nightblade-defend-se2-1.png" "units/orcs/nightblade-defend-se2-2.png" {SOUND_LIST:ORC_SMALL_HIT}}
+
+    [defend]
+        start_time=-150
+        [if]
+            hits=hit
+            sound_start_time=-25
+            [sound_frame]
+                sound={SOUND_LIST:ORC_SMALL_HIT}
+            [/sound_frame]
+        [/if]
+        [frame]
+            image="units/orcs/nightblade-defend-se1-[1~5].png:100"
+        [/frame]
+    [/defend]
+
+    [attack_anim]
+        [filter_attack]
+            name=throwing knives
+        [/filter_attack]
+
+        start_time=-350
+        missile_start_time=-100
+
+        [missile_frame]
+            duration=100
+            image=projectiles/dagger-n.png
+            image_diagonal=projectiles/dagger-ne.png
+        [/missile_frame]
+
+        [frame]
+            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=-550
+        [frame]
+            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
+        [frame]
+            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]