diff --git a/data/amla.cfg b/data/amla.cfg
new file mode 100644
index 00000000000..0067a7fed22
--- /dev/null
+++ b/data/amla.cfg
@@ -0,0 +1,28 @@
+#this file contains macros for After Max Level Advancement (AMLA)
+
+#macro to define AMLA adding HP
+#define AMLA_TOUGH HP_ADVANCE
+[advancement]
+ max_times=100
+id = tough
+description = _ "tough"
+[effect]
+apply_to=hitpoints
+increase_total={HP_ADVANCE}
+[/effect]
+[/advancement]
+#enddef
+
+#macro to define AMLA full healing 
+#define AMLA_NECROHEAL
+[advancement]
+max_times=100
+id = necroheal
+description = _ "necro-heal"
+[effect]
+apply_to=hitpoints
+increase_total=0%
+heal_full=yes
+[/effect]
+[/advancement]
+#enddef
diff --git a/data/scenarios/Heir_To_The_Throne/Crossroads.cfg b/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
index faa45709454..282d3b0d576 100644
--- a/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
+++ b/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
@@ -48,7 +48,74 @@
 	side=1
 	canrecruit=1
 	controller=human
-	gold=200
+	{GOLD 300 200 200}
+#ifdef EASY
+	{INCOME 10 0 0}
+	{STARTING_VILLAGES 1 10}
+#endif
+		[ai]
+			passive_leader="yes"
+			grouping="offensive"
+			aggression="0.0"
+			caution="-0.75"
+			[protect_location]
+				x=20
+				y=28
+				radius="12"
+				value="20.0"
+			[/protect_location]
+			[protect_location]
+				x=16
+				y=17
+				radius="12"
+				value="10.0"
+			[/protect_location]
+			[protect_location]
+				x=25
+				y=10
+				radius="10"
+				value="10.0"
+			[/protect_location]
+			[target]
+				description=Delfador
+				value=3.0
+			[/target]
+			[protect_unit]
+				description=Delfador
+				radius=6
+				value=20.0
+			[/protect_unit]
+			[protect_unit]
+				description=Konrad
+				radius=10
+				value=20.0
+			[/protect_unit]
+			[target]
+				description=Kalenz
+				value=3.0
+			[/target]
+			[protect_unit]
+				description=Kalenz
+				radius=4
+				value=20.0
+			[/protect_unit]
+
+			[avoid]
+				x="9-23"
+				y="1-9"
+			[/avoid]
+			[avoid]
+				x="14-19"
+				y="10-14"
+			[/avoid]
+			[avoid]
+				x="20-40"
+				y="16-24"
+			[/avoid]
+			{ATTACK_DEPTH 5 5 5}	
+		[/ai]
+
+
 	[/side]
 
 #define CROSSROADS_AI_PARAMS
@@ -306,6 +373,7 @@ SE - Fort Tahn"
 			{TRAIT_LOYAL}
 		[/modifications]
 		[/unit]
+#ifdef NORMAL
 		[unit]
 		description=Orcish Archer
 		generate_description=yes
@@ -317,7 +385,20 @@ SE - Fort Tahn"
 			{TRAIT_LOYAL}
 		[/modifications]
 		[/unit]
+#endif
 #ifdef HARD
+		[unit]
+		description=Orcish Archer
+		generate_description=yes
+		side=3
+		x=$trapx{NUM}
+		y=$trapy{NUM}
+		type=Orcish Archer
+		[modifications]
+			{TRAIT_LOYAL}
+		[/modifications]
+		[/unit]
+
 		[unit]
 		description=Troll Whelp
 		generate_description=yes
diff --git a/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg b/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
index cf412af4529..1068a76b981 100644
--- a/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
+++ b/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
@@ -72,25 +72,35 @@
 		[/modifications]
 		[/unit]
 		[ai]
-		village_value=0.0
-		leader_value=0.0
+			[target]
+				description=Delfador
+				value=3.0
+			[/target]
+			[protect_unit]
+				description=Delfador
+				radius=6
+				value=20.0
+			[/protect_unit]
+			[protect_unit]
+				description=Konrad
+				radius=10
+				value=20.0
+			[/protect_unit]
+			[target]
+				description=Kalenz
+				value=3.0
+			[/target]
+			[protect_unit]
+				description=Kalenz
+				radius=4
+				value=20.0
+			[/protect_unit]
 
 			[avoid]
 			x=20-31
 			y=1-12
 			[/avoid]
 
-			[target]
-			description=Konrad
-			value=8.0
-			[/target]
-
-			[protect_unit]
-			description=Konrad
-			radius=12
-			value=40.0
-			[/protect_unit]
-			
 			[leader_goal]
 			x,y=1,1
 			[/leader_goal]
diff --git a/data/units/Ancient_Lich.cfg b/data/units/Ancient_Lich.cfg
index 639e2a7dd6d..90a8504eceb 100644
--- a/data/units/Ancient_Lich.cfg
+++ b/data/units/Ancient_Lich.cfg
@@ -11,15 +11,8 @@ hitpoints=80
 movement_type=undeadfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Ancient_Wose.cfg b/data/units/Ancient_Wose.cfg
index c98fb65be41..ae8e5638475 100644
--- a/data/units/Ancient_Wose.cfg
+++ b/data/units/Ancient_Wose.cfg
@@ -9,15 +9,8 @@ hitpoints=80
 movement_type=treefolk
 movement=3
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Assassin.cfg b/data/units/Assassin.cfg
index 6f72ea8b97e..58f86c5f128 100644
--- a/data/units/Assassin.cfg
+++ b/data/units/Assassin.cfg
@@ -9,15 +9,10 @@ hitpoints=42
 movement_type=elusivefoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
@@ -112,15 +107,10 @@ get_hit_sound=groan.wav
         movement_type=elusivefoot
         movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=chaotic
         advanceto=null
diff --git a/data/units/Bandit.cfg b/data/units/Bandit.cfg
index c3f2c59fb0d..2906e6c64cf 100644
--- a/data/units/Bandit.cfg
+++ b/data/units/Bandit.cfg
@@ -9,15 +9,8 @@ hitpoints=50
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Battle_Princess.cfg b/data/units/Battle_Princess.cfg
index 7a6dbc38334..f5635ae25ef 100644
--- a/data/units/Battle_Princess.cfg
+++ b/data/units/Battle_Princess.cfg
@@ -11,15 +11,10 @@ hitpoints=52
 movement_type=elusivefoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -70,15 +65,10 @@ hitpoints=52
 movement_type=elusivefoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Blood_Bat.cfg b/data/units/Blood_Bat.cfg
index 888cfe1a716..b71f40c01a0 100644
--- a/data/units/Blood_Bat.cfg
+++ b/data/units/Blood_Bat.cfg
@@ -8,15 +8,8 @@ hitpoints=24
 movement_type=undeadfly
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Cavalier.cfg b/data/units/Cavalier.cfg
index 0b8dfcde5ad..70cc2169dd1 100644
--- a/data/units/Cavalier.cfg
+++ b/data/units/Cavalier.cfg
@@ -9,15 +9,8 @@ hitpoints=68
 movement_type=mounted
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Cave_Spider.cfg b/data/units/Cave_Spider.cfg
index 83aa985aef7..b4bc86ec2da 100644
--- a/data/units/Cave_Spider.cfg
+++ b/data/units/Cave_Spider.cfg
@@ -8,15 +8,8 @@ hitpoints=54
 movement_type=mountainfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Chocobone.cfg b/data/units/Chocobone.cfg
index cace00acded..848aed84bd0 100644
--- a/data/units/Chocobone.cfg
+++ b/data/units/Chocobone.cfg
@@ -9,15 +9,8 @@ hitpoints=45
 movement_type=undeadfoot
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Cockatrice.cfg b/data/units/Cockatrice.cfg
index d33183f571e..5ae6e1c2f35 100644
--- a/data/units/Cockatrice.cfg
+++ b/data/units/Cockatrice.cfg
@@ -8,15 +8,8 @@ hitpoints=42
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Cuttle_Fish.cfg b/data/units/Cuttle_Fish.cfg
index 1abc59c644b..6e753fae696 100644
--- a/data/units/Cuttle_Fish.cfg
+++ b/data/units/Cuttle_Fish.cfg
@@ -8,15 +8,8 @@ hitpoints=52
 movement_type=deepsea
 movement=8
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Dark_Queen.cfg b/data/units/Dark_Queen.cfg
index b724e917492..1ef7668dfde 100644
--- a/data/units/Dark_Queen.cfg
+++ b/data/units/Dark_Queen.cfg
@@ -9,15 +9,8 @@ hitpoints=48
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Dark_Sorcerer.cfg b/data/units/Dark_Sorcerer.cfg
index 3eebc939fd8..de469bc043b 100644
--- a/data/units/Dark_Sorcerer.cfg
+++ b/data/units/Dark_Sorcerer.cfg
@@ -8,15 +8,8 @@ hitpoints=75
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Dark_Spirit.cfg b/data/units/Dark_Spirit.cfg
index 03c4c62091c..b6a379d83c9 100644
--- a/data/units/Dark_Spirit.cfg
+++ b/data/units/Dark_Spirit.cfg
@@ -8,15 +8,8 @@ hitpoints=48
 movement_type=undeadfly
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Death_Knight.cfg b/data/units/Death_Knight.cfg
index f3d9aaed920..f393f787c0a 100644
--- a/data/units/Death_Knight.cfg
+++ b/data/units/Death_Knight.cfg
@@ -9,15 +9,8 @@ hitpoints=66
 movement_type=undeadfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Deathblade.cfg b/data/units/Deathblade.cfg
index 57f7ed30d56..d4e0ccdfcbc 100644
--- a/data/units/Deathblade.cfg
+++ b/data/units/Deathblade.cfg
@@ -8,15 +8,8 @@ hitpoints=35
 movement_type=undeadfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Direwolf_Rider.cfg b/data/units/Direwolf_Rider.cfg
index dc0171a2a4c..592717cb8ab 100644
--- a/data/units/Direwolf_Rider.cfg
+++ b/data/units/Direwolf_Rider.cfg
@@ -8,15 +8,8 @@ hitpoints=55
 movement_type=orcishfoot
 movement=10
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Drake_Blademaster.cfg b/data/units/Drake_Blademaster.cfg
index 3469b144fd0..f6d02c958c2 100644
--- a/data/units/Drake_Blademaster.cfg
+++ b/data/units/Drake_Blademaster.cfg
@@ -10,15 +10,8 @@ hitpoints=70
 movement_type=drakefly
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Drake_Enforcer.cfg b/data/units/Drake_Enforcer.cfg
index c34871509fb..a772443616b 100644
--- a/data/units/Drake_Enforcer.cfg
+++ b/data/units/Drake_Enforcer.cfg
@@ -9,15 +9,8 @@ hitpoints=79
 movement_type=drakefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Drake_Flameheart.cfg b/data/units/Drake_Flameheart.cfg
index be59698b867..7cb2b7cab56 100644
--- a/data/units/Drake_Flameheart.cfg
+++ b/data/units/Drake_Flameheart.cfg
@@ -10,15 +10,8 @@ hitpoints=84
 movement_type=drakefly
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 ability=leadership
diff --git a/data/units/Drake_Gladiator.cfg b/data/units/Drake_Gladiator.cfg
index 65d7c869053..b0a28b0ca9f 100644
--- a/data/units/Drake_Gladiator.cfg
+++ b/data/units/Drake_Gladiator.cfg
@@ -9,15 +9,8 @@ hitpoints=59
 movement_type=drakefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 #advanceto=Drake Enforcer
diff --git a/data/units/Drake_Hurricane.cfg b/data/units/Drake_Hurricane.cfg
index 4e9c7bb290a..4fa6b0e26c3 100644
--- a/data/units/Drake_Hurricane.cfg
+++ b/data/units/Drake_Hurricane.cfg
@@ -9,15 +9,8 @@ hitpoints=50
 movement_type=fly
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Drake_Inferno.cfg b/data/units/Drake_Inferno.cfg
index 5a982e43fb0..5aeb76edc59 100644
--- a/data/units/Drake_Inferno.cfg
+++ b/data/units/Drake_Inferno.cfg
@@ -9,15 +9,8 @@ hitpoints=71
 movement_type=drakefly
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Drake_Warden.cfg b/data/units/Drake_Warden.cfg
index 3eabb3bcb76..3ad769d1bb8 100644
--- a/data/units/Drake_Warden.cfg
+++ b/data/units/Drake_Warden.cfg
@@ -10,15 +10,8 @@ hitpoints=88
 movement_type=drakefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3 
 alignment=lawful
 advanceto=null 
diff --git a/data/units/Draug.cfg b/data/units/Draug.cfg
index 720c4b7bcd4..08f725d0731 100644
--- a/data/units/Draug.cfg
+++ b/data/units/Draug.cfg
@@ -8,15 +8,8 @@ hitpoints=50
 movement_type=undeadfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Dread_Lich.cfg b/data/units/Dread_Lich.cfg
index 6997b411895..89233147292 100644
--- a/data/units/Dread_Lich.cfg
+++ b/data/units/Dread_Lich.cfg
@@ -9,15 +9,8 @@ hitpoints=80
 movement_type=undeadfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Duelist.cfg b/data/units/Duelist.cfg
index 9e3a563165d..5e2bda91942 100644
--- a/data/units/Duelist.cfg
+++ b/data/units/Duelist.cfg
@@ -8,15 +8,8 @@ hitpoints=44
 movement_type=elusivefoot
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
diff --git a/data/units/Dwarvish_Berserker.cfg b/data/units/Dwarvish_Berserker.cfg
index de3436c9779..8cb25f11b7a 100644
--- a/data/units/Dwarvish_Berserker.cfg
+++ b/data/units/Dwarvish_Berserker.cfg
@@ -8,15 +8,8 @@ hitpoints=48
 movement_type=dwarvishfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Dwarvish_Dragonguard.cfg b/data/units/Dwarvish_Dragonguard.cfg
index 51617bc94e8..fbe40e60932 100644
--- a/data/units/Dwarvish_Dragonguard.cfg
+++ b/data/units/Dwarvish_Dragonguard.cfg
@@ -8,15 +8,8 @@ hitpoints=52
 movement_type=dwarvishfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Dwarvish_Lord.cfg b/data/units/Dwarvish_Lord.cfg
index 92174743139..59b9e61d7c0 100644
--- a/data/units/Dwarvish_Lord.cfg
+++ b/data/units/Dwarvish_Lord.cfg
@@ -11,15 +11,8 @@ hitpoints=75
 movement_type=dwarvishfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Dwarvish_Runemaster.cfg b/data/units/Dwarvish_Runemaster.cfg
index 528f13c101d..b1cb62f714d 100644
--- a/data/units/Dwarvish_Runemaster.cfg
+++ b/data/units/Dwarvish_Runemaster.cfg
@@ -8,15 +8,8 @@ hitpoints=75
 movement_type=dwarvishfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Dwarvish_Sentinel.cfg b/data/units/Dwarvish_Sentinel.cfg
index 8b5d6cffa5d..55529450e49 100644
--- a/data/units/Dwarvish_Sentinel.cfg
+++ b/data/units/Dwarvish_Sentinel.cfg
@@ -15,15 +15,8 @@ movement_type=dwarvishfoot
 movement=4
 num_traits=1
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 ability=steadfast
 level=3
 alignment=neutral
diff --git a/data/units/Elder_Mage.cfg b/data/units/Elder_Mage.cfg
index a3aa4f60978..cfe6ed8117b 100644
--- a/data/units/Elder_Mage.cfg
+++ b/data/units/Elder_Mage.cfg
@@ -12,15 +12,8 @@ movement_type=smallfoot
     [/resistance]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=5
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Avenger.cfg b/data/units/Elvish_Avenger.cfg
index 7805c9c2242..3696546010f 100644
--- a/data/units/Elvish_Avenger.cfg
+++ b/data/units/Elvish_Avenger.cfg
@@ -11,15 +11,10 @@ hitpoints=60
 movement_type=woodland
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -131,15 +126,10 @@ get_hit_sound=groan.wav
         movement_type=woodland
         movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=neutral
         advanceto=null
diff --git a/data/units/Elvish_Champion.cfg b/data/units/Elvish_Champion.cfg
index 35bcd562cad..b35061d5f98 100644
--- a/data/units/Elvish_Champion.cfg
+++ b/data/units/Elvish_Champion.cfg
@@ -11,15 +11,8 @@ movement_type=woodland
 movement=5
 {LESS_NIMBLE_ELF}
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_High_Lord.cfg b/data/units/Elvish_High_Lord.cfg
index 3dc59961fb9..4daeed85a1e 100644
--- a/data/units/Elvish_High_Lord.cfg
+++ b/data/units/Elvish_High_Lord.cfg
@@ -10,15 +10,8 @@ hitpoints=63
 movement_type=woodland
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Lady.cfg b/data/units/Elvish_Lady.cfg
index 8edfe5aa60d..c1019b2277b 100644
--- a/data/units/Elvish_Lady.cfg
+++ b/data/units/Elvish_Lady.cfg
@@ -9,15 +9,8 @@ hitpoints=30
 movement_type=fly
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Marshal.cfg b/data/units/Elvish_Marshal.cfg
index f52954c928c..daea960a711 100644
--- a/data/units/Elvish_Marshal.cfg
+++ b/data/units/Elvish_Marshal.cfg
@@ -14,15 +14,8 @@ movement_type=woodland
 movement=5
 {LESS_NIMBLE_ELF}
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Outrider.cfg b/data/units/Elvish_Outrider.cfg
index 99b0f0086b7..2a5064ab9c4 100644
--- a/data/units/Elvish_Outrider.cfg
+++ b/data/units/Elvish_Outrider.cfg
@@ -9,15 +9,8 @@ hitpoints=50
 movement_type=woodland
 movement=10
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Sharpshooter.cfg b/data/units/Elvish_Sharpshooter.cfg
index ca8ef24b899..6606ec636e3 100644
--- a/data/units/Elvish_Sharpshooter.cfg
+++ b/data/units/Elvish_Sharpshooter.cfg
@@ -11,15 +11,10 @@ hitpoints=45
 movement_type=woodland
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -137,15 +132,10 @@ get_hit_sound=groan.wav
         movement_type=woodland
         movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
         level=3
         alignment=neutral
         advanceto=null
diff --git a/data/units/Elvish_Shyde.cfg b/data/units/Elvish_Shyde.cfg
index 8154eaf0589..6a4e9d8d3f1 100644
--- a/data/units/Elvish_Shyde.cfg
+++ b/data/units/Elvish_Shyde.cfg
@@ -12,15 +12,8 @@ hitpoints=46
 movement_type=woodlandfloat
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
diff --git a/data/units/Elvish_Sylph.cfg b/data/units/Elvish_Sylph.cfg
index c41d75003e7..cbd3ef6c5d6 100644
--- a/data/units/Elvish_Sylph.cfg
+++ b/data/units/Elvish_Sylph.cfg
@@ -12,15 +12,8 @@ movement_type=woodlandfloat
 [/resistance]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null
diff --git a/data/units/Fire_Dragon.cfg b/data/units/Fire_Dragon.cfg
index 3f39bcd003c..88d9276a318 100644
--- a/data/units/Fire_Dragon.cfg
+++ b/data/units/Fire_Dragon.cfg
@@ -9,15 +9,8 @@ hitpoints=101
 movement_type=drakefly
 movement=8
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Fireball.cfg b/data/units/Fireball.cfg
index faf85cf659a..cb5a523d91c 100644
--- a/data/units/Fireball.cfg
+++ b/data/units/Fireball.cfg
@@ -8,15 +8,8 @@ hitpoints=1
 movement_type=fly
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=0
 alignment=neutral
 advanceto=null
diff --git a/data/units/Galleon.cfg b/data/units/Galleon.cfg
index da5193e83f9..bb6c392f0ba 100644
--- a/data/units/Galleon.cfg
+++ b/data/units/Galleon.cfg
@@ -8,15 +8,8 @@ hitpoints=1
 movement_type=fly
 movement=10
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
diff --git a/data/units/Gate.cfg b/data/units/Gate.cfg
index 14334eff094..6e85d31ec1c 100644
--- a/data/units/Gate.cfg
+++ b/data/units/Gate.cfg
@@ -10,15 +10,8 @@ movement_type=none
 	[/resistance]
 movement=1
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=0
 alignment=neutral
 advanceto=null
diff --git a/data/units/Giant_Mudcrawler.cfg b/data/units/Giant_Mudcrawler.cfg
index 3106b407b47..a2d3d0400d2 100644
--- a/data/units/Giant_Mudcrawler.cfg
+++ b/data/units/Giant_Mudcrawler.cfg
@@ -9,15 +9,8 @@ hitpoints=36
 movement_type=scuttlefoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
diff --git a/data/units/Giant_Scorpion.cfg b/data/units/Giant_Scorpion.cfg
index 671f856ca8c..0dcbb3394f2 100644
--- a/data/units/Giant_Scorpion.cfg
+++ b/data/units/Giant_Scorpion.cfg
@@ -8,15 +8,8 @@ hitpoints=40
 movement_type=scuttlefoot
 movement=8
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
diff --git a/data/units/Goblin_Impaler.cfg b/data/units/Goblin_Impaler.cfg
index 176fe622885..3341378cead 100644
--- a/data/units/Goblin_Impaler.cfg
+++ b/data/units/Goblin_Impaler.cfg
@@ -9,15 +9,8 @@ hitpoints=26
 movement_type=orcishfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Goblin_Pillager.cfg b/data/units/Goblin_Pillager.cfg
index 16df4fabcca..51148f44acb 100644
--- a/data/units/Goblin_Pillager.cfg
+++ b/data/units/Goblin_Pillager.cfg
@@ -9,15 +9,8 @@ hitpoints=40
 movement_type=orcishfoot
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Grand_Knight.cfg b/data/units/Grand_Knight.cfg
index 2fe3ad4dfa7..1d6d87f3876 100644
--- a/data/units/Grand_Knight.cfg
+++ b/data/units/Grand_Knight.cfg
@@ -9,15 +9,8 @@ hitpoints=78
 movement_type=mounted
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Grand_Marshal.cfg b/data/units/Grand_Marshal.cfg
index 14bfb1c7f27..7cbaf16b98b 100644
--- a/data/units/Grand_Marshal.cfg
+++ b/data/units/Grand_Marshal.cfg
@@ -12,15 +12,8 @@ hitpoints=68
 movement_type=armoredfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=lawful
 advanceto=null
diff --git a/data/units/Great_Mage.cfg b/data/units/Great_Mage.cfg
index 94d17627760..497bc36e8e7 100644
--- a/data/units/Great_Mage.cfg
+++ b/data/units/Great_Mage.cfg
@@ -12,15 +12,10 @@ movement_type=smallfoot
     [/resistance]
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null
@@ -118,15 +113,10 @@ get_hit_sound=groan.wav
 	    [/resistance]
 	movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 	level=4
 	alignment=neutral
 	advanceto=null
diff --git a/data/units/Great_Troll.cfg b/data/units/Great_Troll.cfg
index a9fa2659812..ce1359c2e02 100644
--- a/data/units/Great_Troll.cfg
+++ b/data/units/Great_Troll.cfg
@@ -9,15 +9,8 @@ hitpoints=80
 movement_type=largefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Gryphon.cfg b/data/units/Gryphon.cfg
index 3a2b5a092b5..d54c973a498 100644
--- a/data/units/Gryphon.cfg
+++ b/data/units/Gryphon.cfg
@@ -8,15 +8,8 @@ hitpoints=44
 movement_type=fly
 movement=9
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Gryphon_Master.cfg b/data/units/Gryphon_Master.cfg
index 4724a1b61e9..857c1067c4a 100644
--- a/data/units/Gryphon_Master.cfg
+++ b/data/units/Gryphon_Master.cfg
@@ -10,15 +10,8 @@ hitpoints=46
 movement_type=fly
 movement=10
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Halbardier.cfg b/data/units/Halbardier.cfg
index 2aa1d479bd4..93703583626 100644
--- a/data/units/Halbardier.cfg
+++ b/data/units/Halbardier.cfg
@@ -12,15 +12,8 @@ movement_type=smallfoot
     [/resistance]
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Iron_Mauler.cfg b/data/units/Iron_Mauler.cfg
index 358f90db905..af154a4a77f 100644
--- a/data/units/Iron_Mauler.cfg
+++ b/data/units/Iron_Mauler.cfg
@@ -8,15 +8,8 @@ hitpoints=64
 movement_type=armoredfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Javelineer.cfg b/data/units/Javelineer.cfg
index bac7808d111..4b62d73aa73 100644
--- a/data/units/Javelineer.cfg
+++ b/data/units/Javelineer.cfg
@@ -9,15 +9,8 @@ hitpoints=45
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
diff --git a/data/units/Lancer.cfg b/data/units/Lancer.cfg
index acb4b9bc49f..979941b5962 100644
--- a/data/units/Lancer.cfg
+++ b/data/units/Lancer.cfg
@@ -10,15 +10,8 @@ hitpoints=48
 movement_type=mounted
 movement=10
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
diff --git a/data/units/Lich.cfg b/data/units/Lich.cfg
index 38780438841..2eb8665d939 100644
--- a/data/units/Lich.cfg
+++ b/data/units/Lich.cfg
@@ -8,15 +8,8 @@ hitpoints=66
 movement_type=undeadfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Lord.cfg b/data/units/Lord.cfg
index cc164b0d3f2..b701cfb999d 100644
--- a/data/units/Lord.cfg
+++ b/data/units/Lord.cfg
@@ -11,15 +11,10 @@ ability=leadership
 movement_type=smallfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
@@ -95,15 +90,10 @@ ability=leadership
 movement_type=smallfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Mage_of_Light.cfg b/data/units/Mage_of_Light.cfg
index 997ba7308f6..38d193f973f 100644
--- a/data/units/Mage_of_Light.cfg
+++ b/data/units/Mage_of_Light.cfg
@@ -19,15 +19,10 @@ movement=5
     holy=70
     [/resistance]
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
@@ -104,15 +99,10 @@ get_hit_sound=groan.wav
 	    holy=70
 	    [/resistance]
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 	level=3
 	alignment=lawful
 	advanceto=null
diff --git a/data/units/Master_Bowman.cfg b/data/units/Master_Bowman.cfg
index 9fef6a7022a..a13628e4fdc 100644
--- a/data/units/Master_Bowman.cfg
+++ b/data/units/Master_Bowman.cfg
@@ -9,15 +9,8 @@ hitpoints=50
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Mermaid_Diviner.cfg b/data/units/Mermaid_Diviner.cfg
index d019b928c78..4eef7e0e663 100644
--- a/data/units/Mermaid_Diviner.cfg
+++ b/data/units/Mermaid_Diviner.cfg
@@ -18,15 +18,8 @@ movement_type=swimmer
 [/resistance]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Mermaid_Siren.cfg b/data/units/Mermaid_Siren.cfg
index 122e8e8dfcc..09600901fd0 100644
--- a/data/units/Mermaid_Siren.cfg
+++ b/data/units/Mermaid_Siren.cfg
@@ -9,15 +9,8 @@ hitpoints=49
 movement_type=swimmer
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Merman_Entangler.cfg b/data/units/Merman_Entangler.cfg
index 71575abc33b..cf85ff6fa29 100644
--- a/data/units/Merman_Entangler.cfg
+++ b/data/units/Merman_Entangler.cfg
@@ -7,15 +7,8 @@ hitpoints=55
 movement_type=swimmer
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Merman_Hoplite.cfg b/data/units/Merman_Hoplite.cfg
index 97b8d71b5e8..01eb375d350 100644
--- a/data/units/Merman_Hoplite.cfg
+++ b/data/units/Merman_Hoplite.cfg
@@ -23,15 +23,8 @@ movement_type=swimmer
 [/resistance]
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 ability=steadfast
 level=3
 alignment=lawful
diff --git a/data/units/Merman_Javelineer.cfg b/data/units/Merman_Javelineer.cfg
index d10c53fa813..42fff83ae81 100644
--- a/data/units/Merman_Javelineer.cfg
+++ b/data/units/Merman_Javelineer.cfg
@@ -8,15 +8,8 @@ hitpoints=55
 movement_type=swimmer
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Merman_Triton.cfg b/data/units/Merman_Triton.cfg
index 0c0b4faf35f..32441fb8bf0 100644
--- a/data/units/Merman_Triton.cfg
+++ b/data/units/Merman_Triton.cfg
@@ -11,15 +11,8 @@ movement_type=swimmer
     [/defense]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Naga-Myrmidon.cfg b/data/units/Naga-Myrmidon.cfg
index dc10bf86cb1..011a1c882ff 100644
--- a/data/units/Naga-Myrmidon.cfg
+++ b/data/units/Naga-Myrmidon.cfg
@@ -13,15 +13,10 @@ movement_type=naga
 [/defense]
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -62,15 +57,10 @@ get_hit_sound=hiss.wav
 	[/defense]
 	movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 	level=3
 	alignment=neutral
 	advanceto=null
diff --git a/data/units/Necrophage.cfg b/data/units/Necrophage.cfg
index 94ec563c431..0d5c3df25c4 100644
--- a/data/units/Necrophage.cfg
+++ b/data/units/Necrophage.cfg
@@ -7,20 +7,12 @@ image_defensive="undead-necrophage-defend.png"
 hitpoints=42
 movement_type=undeadfoot
 movement=5
-experience=65
+experience=66
+{amla.cfg}
+{AMLA_NECROHEAL}
 level=2
 alignment=chaotic
 advanceto=null
-	[advancement]
-	max_times=100
-	id = Satiated
-	description = _ "satiated"
-		[effect]
-		apply_to=hitpoints
-		increase_total=0%
-		heal_full=yes
-		[/effect]
-	[/advancement]
 cost=36
 usage=fighter
 unit_description= _ "Driven ravenous by an unholy hunger for dead flesh, Necrophages attack their hoped-for food with beast-like ferocity. When they are sated with the flesh of their victims, they simply shrug off all damage sustained as if they had been freshly summoned, to begin their search for flesh again.
diff --git a/data/units/Nightgaunt.cfg b/data/units/Nightgaunt.cfg
index 412cbadd989..ceab878db57 100644
--- a/data/units/Nightgaunt.cfg
+++ b/data/units/Nightgaunt.cfg
@@ -8,15 +8,8 @@ hitpoints=32
 movement_type=undeadspirit
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Noble_Lord.cfg b/data/units/Noble_Lord.cfg
index d36df252528..7bd12fea709 100644
--- a/data/units/Noble_Lord.cfg
+++ b/data/units/Noble_Lord.cfg
@@ -16,15 +16,8 @@ ability=leadership
 movement_type=smallfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Ogre.cfg b/data/units/Ogre.cfg
index a53e6ac6948..e4c276663e5 100644
--- a/data/units/Ogre.cfg
+++ b/data/units/Ogre.cfg
@@ -8,15 +8,8 @@ hitpoints=68
 movement_type=largefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Orcish_Shaman.cfg b/data/units/Orcish_Shaman.cfg
index 9a824ef41b5..dbf7ada3084 100644
--- a/data/units/Orcish_Shaman.cfg
+++ b/data/units/Orcish_Shaman.cfg
@@ -8,15 +8,12 @@ hitpoints=20
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -76,15 +73,12 @@ hitpoints=20
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -144,15 +138,12 @@ hitpoints=20
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Orcish_Slayer.cfg b/data/units/Orcish_Slayer.cfg
index 6eaab578851..b99c63c177a 100644
--- a/data/units/Orcish_Slayer.cfg
+++ b/data/units/Orcish_Slayer.cfg
@@ -8,15 +8,8 @@ hitpoints=36
 movement_type=elusivefoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Orcish_Slurbow.cfg b/data/units/Orcish_Slurbow.cfg
index 71190485201..e4752a9ca7e 100644
--- a/data/units/Orcish_Slurbow.cfg
+++ b/data/units/Orcish_Slurbow.cfg
@@ -8,15 +8,8 @@ hitpoints=50
 movement_type=orcishfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Orcish_Sovereign.cfg b/data/units/Orcish_Sovereign.cfg
index 57928160ddf..deb11b40d65 100644
--- a/data/units/Orcish_Sovereign.cfg
+++ b/data/units/Orcish_Sovereign.cfg
@@ -10,15 +10,8 @@ ability=leadership
 movement_type=orcishfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Orcish_Warlord.cfg b/data/units/Orcish_Warlord.cfg
index 93553b2f879..5c3bee18424 100644
--- a/data/units/Orcish_Warlord.cfg
+++ b/data/units/Orcish_Warlord.cfg
@@ -8,15 +8,8 @@ hitpoints=80
 movement_type=orcishfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Outlaw.cfg b/data/units/Outlaw.cfg
index 8cbd9e232ad..57159a69222 100644
--- a/data/units/Outlaw.cfg
+++ b/data/units/Outlaw.cfg
@@ -9,15 +9,10 @@ hitpoints=40
 movement_type=elusivefoot
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
@@ -90,15 +85,10 @@ get_hit_sound=groan.wav
 	movement_type=elusivefoot
 	movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 	level=2
 	alignment=chaotic
 	advanceto=null
diff --git a/data/units/Outlaw_Queen.cfg b/data/units/Outlaw_Queen.cfg
index 099ddb5a6d9..1b9b2daba0b 100644
--- a/data/units/Outlaw_Queen.cfg
+++ b/data/units/Outlaw_Queen.cfg
@@ -13,15 +13,8 @@ hitpoints=62
 movement_type=elusivefoot
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Paladin.cfg b/data/units/Paladin.cfg
index 065539053a2..7930be7bdf0 100644
--- a/data/units/Paladin.cfg
+++ b/data/units/Paladin.cfg
@@ -13,15 +13,8 @@ movement=8
     holy=50
     [/resistance]
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Pirate_Galleon.cfg b/data/units/Pirate_Galleon.cfg
index 72d77c3ffc8..e227f02778d 100644
--- a/data/units/Pirate_Galleon.cfg
+++ b/data/units/Pirate_Galleon.cfg
@@ -6,15 +6,8 @@ hitpoints=35
 movement_type=float
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
diff --git a/data/units/Royal_Guard.cfg b/data/units/Royal_Guard.cfg
index 575727d3015..614021d8118 100644
--- a/data/units/Royal_Guard.cfg
+++ b/data/units/Royal_Guard.cfg
@@ -13,15 +13,8 @@ movement_type=smallfoot
     [/resistance]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Saurian_Flanker.cfg b/data/units/Saurian_Flanker.cfg
index 1626798508a..ccba4395e21 100644
--- a/data/units/Saurian_Flanker.cfg
+++ b/data/units/Saurian_Flanker.cfg
@@ -9,15 +9,8 @@ hitpoints=43
 movement_type=lizard
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Saurian_Icecaster.cfg b/data/units/Saurian_Icecaster.cfg
index 9702978f4b1..61933478ee1 100644
--- a/data/units/Saurian_Icecaster.cfg
+++ b/data/units/Saurian_Icecaster.cfg
@@ -9,15 +9,8 @@ hitpoints=25
 movement_type=lizard
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Saurian_Soothsayer.cfg b/data/units/Saurian_Soothsayer.cfg
index 23869baddd7..85d09408f47 100644
--- a/data/units/Saurian_Soothsayer.cfg
+++ b/data/units/Saurian_Soothsayer.cfg
@@ -10,15 +10,8 @@ hitpoints=25
 movement_type=lizard
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Saurian_Warrior.cfg b/data/units/Saurian_Warrior.cfg
index de5a87bc8be..75e61f78503 100644
--- a/data/units/Saurian_Warrior.cfg
+++ b/data/units/Saurian_Warrior.cfg
@@ -11,15 +11,8 @@ hitpoints=32
 movement_type=lizard
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic 
 advanceto=null
diff --git a/data/units/Sea_Hag.cfg b/data/units/Sea_Hag.cfg
index 30119c5ef15..15875cdd3d6 100644
--- a/data/units/Sea_Hag.cfg
+++ b/data/units/Sea_Hag.cfg
@@ -12,15 +12,8 @@ hitpoints=37
 movement_type=swimmer
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Sea_Orc.cfg b/data/units/Sea_Orc.cfg
index 47af33cf48b..b4d4d8ad611 100644
--- a/data/units/Sea_Orc.cfg
+++ b/data/units/Sea_Orc.cfg
@@ -8,15 +8,8 @@ hitpoints=31
 movement_type=swimmer
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Sea_Serpent.cfg b/data/units/Sea_Serpent.cfg
index 19a132da7ad..2570ba1db48 100644
--- a/data/units/Sea_Serpent.cfg
+++ b/data/units/Sea_Serpent.cfg
@@ -8,15 +8,8 @@ hitpoints=85
 movement_type=deepsea
 movement=8
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Silver_Mage.cfg b/data/units/Silver_Mage.cfg
index 83bad1ef3ec..2747dc3459c 100644
--- a/data/units/Silver_Mage.cfg
+++ b/data/units/Silver_Mage.cfg
@@ -13,15 +13,10 @@ movement_type=smallfoot
     [/resistance]
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=neutral
 advanceto=null
@@ -157,15 +152,10 @@ get_hit_sound=groan.wav
 	    [/resistance]
 	movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 	level=3
 	alignment=neutral
 	advanceto=null
diff --git a/data/units/Skeletal_Dragon.cfg b/data/units/Skeletal_Dragon.cfg
index a325d2d5df1..5ec04f6d863 100644
--- a/data/units/Skeletal_Dragon.cfg
+++ b/data/units/Skeletal_Dragon.cfg
@@ -9,15 +9,8 @@ hitpoints=86
 movement_type=undeadfly
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Sleeping_Gryphon.cfg b/data/units/Sleeping_Gryphon.cfg
index 7a6b6bd67b5..e2cd8d9b890 100644
--- a/data/units/Sleeping_Gryphon.cfg
+++ b/data/units/Sleeping_Gryphon.cfg
@@ -7,15 +7,8 @@ hitpoints=44
 movement_type=mounted
 movement=1
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=neutral
 advanceto=null
diff --git a/data/units/Soul_Shooter.cfg b/data/units/Soul_Shooter.cfg
index cb7cee71cfc..752c91cd90c 100644
--- a/data/units/Soul_Shooter.cfg
+++ b/data/units/Soul_Shooter.cfg
@@ -10,15 +10,8 @@ hitpoints=50
 movement_type=undeadfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Soulless.cfg b/data/units/Soulless.cfg
index 3f4d5570836..53b09fa4ed5 100644
--- a/data/units/Soulless.cfg
+++ b/data/units/Soulless.cfg
@@ -8,15 +8,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -89,15 +94,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -173,15 +183,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -258,15 +273,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -342,15 +362,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -426,15 +451,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
@@ -510,15 +540,20 @@ hitpoints=28
 movement_type=undeadfoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Spectre.cfg b/data/units/Spectre.cfg
index abab8af734f..1325cbd0ddc 100644
--- a/data/units/Spectre.cfg
+++ b/data/units/Spectre.cfg
@@ -13,15 +13,8 @@ movement=7
 	impact=60
 [/resistance]
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Tentacle.cfg b/data/units/Tentacle.cfg
index eb7a39a6d70..ae55334f270 100644
--- a/data/units/Tentacle.cfg
+++ b/data/units/Tentacle.cfg
@@ -9,15 +9,8 @@ hitpoints=28
 movement_type=float
 movement=2
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Transport_Galleon.cfg b/data/units/Transport_Galleon.cfg
index b424a96dbb6..b8910997c47 100644
--- a/data/units/Transport_Galleon.cfg
+++ b/data/units/Transport_Galleon.cfg
@@ -6,15 +6,8 @@ hitpoints=30
 movement_type=float
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=lawful
 advanceto=null
diff --git a/data/units/Trapper.cfg b/data/units/Trapper.cfg
index 59e67735b9b..5d8c76e048c 100644
--- a/data/units/Trapper.cfg
+++ b/data/units/Trapper.cfg
@@ -8,15 +8,8 @@ hitpoints=45
 movement_type=smallfoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Triton.cfg b/data/units/Triton.cfg
index 9c4c6addf11..5cf429f7106 100644
--- a/data/units/Triton.cfg
+++ b/data/units/Triton.cfg
@@ -14,15 +14,8 @@ hitpoints=40
 movement_type=swimmer
 movement=7
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
diff --git a/data/units/Troll_Rocklobber.cfg b/data/units/Troll_Rocklobber.cfg
index 9a2aa6f5a98..58984a6fe4e 100644
--- a/data/units/Troll_Rocklobber.cfg
+++ b/data/units/Troll_Rocklobber.cfg
@@ -9,15 +9,8 @@ hitpoints=53
 movement_type=largefoot
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Troll_Warrior.cfg b/data/units/Troll_Warrior.cfg
index 88d61ff310d..ce71de13c84 100644
--- a/data/units/Troll_Warrior.cfg
+++ b/data/units/Troll_Warrior.cfg
@@ -9,15 +9,8 @@ hitpoints=70
 movement_type=largefoot
 movement=5
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Vampire_Lady.cfg b/data/units/Vampire_Lady.cfg
index 2a59390f256..22e71ee4007 100644
--- a/data/units/Vampire_Lady.cfg
+++ b/data/units/Vampire_Lady.cfg
@@ -9,15 +9,8 @@ hitpoints=52
 movement_type=undeadfly
 movement=8
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=chaotic
 advanceto=null
diff --git a/data/units/Wall_Guard.cfg b/data/units/Wall_Guard.cfg
index 0e01b6e1d78..1c6ee8a83ea 100644
--- a/data/units/Wall_Guard.cfg
+++ b/data/units/Wall_Guard.cfg
@@ -23,15 +23,8 @@ hitpoints=48
 	[/resistance]
 movement=4
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=2
 alignment=lawful
 advanceto=null
diff --git a/data/units/Warrior_King.cfg b/data/units/Warrior_King.cfg
index 9b63a046bd5..b99dac48824 100644
--- a/data/units/Warrior_King.cfg
+++ b/data/units/Warrior_King.cfg
@@ -13,15 +13,8 @@ hitpoints=64
 movement_type=armoredfoot
 movement=6
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=3
 alignment=lawful
 advanceto=null
diff --git a/data/units/Watch_Tower.cfg b/data/units/Watch_Tower.cfg
index c90e059d51e..d25792f668f 100644
--- a/data/units/Watch_Tower.cfg
+++ b/data/units/Watch_Tower.cfg
@@ -6,15 +6,8 @@ hitpoints=60
 movement_type=none
 movement=1
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=1
 alignment=neutral
 advanceto=null
diff --git a/data/units/Yeti.cfg b/data/units/Yeti.cfg
index f16d15340ca..694783d8519 100644
--- a/data/units/Yeti.cfg
+++ b/data/units/Yeti.cfg
@@ -22,15 +22,8 @@ movement=5
 	[/resistance]
 
 experience=100
-	[advancement]
-	max_times=100
-	id = tough
-	description = _ "tough"
-		[effect]
-		apply_to=hitpoints
-		increase_total=3
-		[/effect]
-	[/advancement]
+{amla.cfg}
+{AMLA_TOUGH 3}
 level=4
 alignment=neutral
 advanceto=null