Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
@@ -36,23 +36,11 @@
 g_SelectionPanels.Alert = {
 	"getMaxNumberOfItems": function()
 	{
-		return 3;
+		return 2;
 	},
-	"conflictsWith": ["Barter"],
 	"getItems": function(unitEntStates)
 	{
-		let ret = [];
-
-		if (unitEntStates.some(state => state.alertRaiser && !state.alertRaiser.hasRaisedAlert))
-			ret.push("raise");
-
-		if (unitEntStates.some(state => state.alertRaiser && state.alertRaiser.hasRaisedAlert && state.alertRaiser.canIncreaseLevel))
-			ret.push("increase");
-
-		if (unitEntStates.some(state => state.alertRaiser && state.alertRaiser.hasRaisedAlert))
-			ret.push("end");
-
-		return ret;
+		return unitEntStates.some(state => !!state.alertRaiser) ? ["raise", "end"] : [];
 	},
 	"setupButton": function(data)
 	{
@@ -62,9 +50,6 @@
 			case "raise":
 				raiseAlert();
 				return;
-			case "increase":
-				increaseAlertLevel();
-				return;
 			case "end":
 				endOfAlert();
 				return;
@@ -77,10 +62,6 @@
 			data.icon.sprite = "stretched:session/icons/bell_level1.png";
 			data.button.tooltip = translate("Raise an alert!");
 			break;
-		case "increase":
-			data.icon.sprite = "stretched:session/icons/bell_level2.png";
-			data.button.tooltip = translate("Increase the alert level to protect more units");
-			break;
 		case "end":
 			data.button.tooltip = translate("End of alert.");
 			data.icon.sprite = "stretched:session/icons/bell_level0.png";
@@ -88,7 +69,7 @@
 		}
 		data.button.enabled = controlsPlayer(data.player);
 
-		setPanelObjectPosition(data.button, this.getMaxNumberOfItems() - data.i - 1, data.rowLength);
+		setPanelObjectPosition(data.button, this.getMaxNumberOfItems() - data.i, data.rowLength);
 		return true;
 	}
 };
@@ -99,7 +80,7 @@
 		return 4;
 	},
 	"rowLength": 4,
-	"conflictsWith": ["Alert", "Garrison"],
+	"conflictsWith": ["Garrison"],
 	"getItems": function(unitEntStates)
 	{
 		// If more than `rowLength` resources, don't display icons.
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_helpers.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_helpers.js
@@ -461,23 +461,10 @@
 function raiseAlert()
 {
 	Engine.PostNetworkCommand({
-		"type": "increase-alert-level",
+		"type": "alert-raise",
 		"entities": g_Selection.toList().filter(ent => {
 			let state = GetEntityState(ent);
-			return state && state.alertRaiser && !state.alertRaiser.hasRaisedAlert;
-		})
-	});
-}
-
-function increaseAlertLevel()
-{
-	raiseAlert();
-
-	Engine.PostNetworkCommand({
-		"type": "increase-alert-level",
-		"entities": g_Selection.toList().filter(ent => {
-			let state = GetEntityState(ent);
-			return state && state.alertRaiser && state.alertRaiser.canIncreaseLevel;
+			return state && !!state.alertRaiser;
 		})
 	});
 }
@@ -488,7 +475,7 @@
 		"type": "alert-end",
 		"entities": g_Selection.toList().filter(ent => {
 			let state = GetEntityState(ent);
-			return state && state.alertRaiser && state.alertRaiser.hasRaisedAlert;
+			return state && !!state.alertRaiser;
 		})
 	});
 }
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="unitBarterPanel"
-	size="4 68 100% 100%"
+	size="12 12 100% 100%"
 	hidden="true"
 >
 	<repeat count="4">
 
 		<!-- Sell -->
-		<object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold" hidden="true">
+		<object name="unitBarterSellButton[n]" style="iconButton" type="button" size="0 0 42 42" tooltip_style="sessionToolTipBottomBold" hidden="true">
 			<object name="unitBarterSellIcon[n]" type="image" ghost="true" size="3 3 100%-3 100%-3"/>
 			<object name="unitBarterSellAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 			<object name="unitBarterSellSelection[n]" hidden="true" type="image" ghost="true" size="3 3 100%-3 100%-3" sprite="stretched:session/icons/corners.png"/>
 		</object>
 
 		<!-- Buy -->
-		<object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottomBold" hidden="true">
+		<object name="unitBarterBuyButton[n]" style="iconButton" type="button" size="0 0 42 42" tooltip_style="sessionToolTipBottomBold" hidden="true">
 			<object name="unitBarterBuyIcon[n]" type="image" ghost="true" size="3 3 100%-3 100%-3"/>
 			<object name="unitBarterBuyAmount[n]" ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 		</object>
Index: ps/trunk/binaries/data/mods/public/simulation/components/AlertRaiser.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/AlertRaiser.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/AlertRaiser.js
@@ -1,72 +1,64 @@
 function AlertRaiser() {}
 
 AlertRaiser.prototype.Schema =
-	"<element name='MaximumLevel'><data type='nonNegativeInteger'/></element>" +
-	"<element name='Range'><data type='nonNegativeInteger'/></element>";
+	"<element name='List' a:help='Classes of entities which are affected by this alert raiser'>" +
+		"<attribute name='datatype'>" +
+			"<value>tokens</value>" +
+		"</attribute>" +
+		"<text/>" +
+	"</element>" +
+	"<element name='RaiseAlertRange'><data type='integer'/></element>" +
+	"<element name='EndOfAlertRange'><data type='integer'/></element>" +
+	"<element name='SearchRange'><data type='integer'/></element>";
 
 AlertRaiser.prototype.Init = function()
 {
-	this.level = 0;
-
-	// Range at which units will search for garrison holders
-	this.searchRange = 100;
-
-	// Extra allowance for units to garrison in buildings outside the alert range
-	this.bufferRange = 50;
-};
-
-AlertRaiser.prototype.GetLevel = function()
-{
-	return this.level;
-};
-
-AlertRaiser.prototype.HasRaisedAlert = function()
-{
-	return this.level > 0;
-};
-
-AlertRaiser.prototype.CanIncreaseLevel = function()
-{
-	return this.template.MaximumLevel > this.level;
+	// Store the last time the alert was used so players can't lag the game by raising alerts repeatedly.
+	this.lastTime = 0;
 };
 
-AlertRaiser.prototype.SoundAlert = function()
+AlertRaiser.prototype.UnitFilter = function(unit)
 {
-	PlaySound("alert" + this.level, this.entity);
+	let cmpIdentity = Engine.QueryInterface(unit, IID_Identity);
+	return cmpIdentity && MatchesClassList(cmpIdentity.GetClassesList(), this.template.List._string);
 };
 
-AlertRaiser.prototype.IncreaseAlertLevel = function()
+AlertRaiser.prototype.RaiseAlert = function()
 {
-	if (!this.CanIncreaseLevel())
-		return false;
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	if (cmpTimer.GetTime() == this.lastTime)
+		return;
 
-	++this.level;
-	this.SoundAlert();
+	this.lastTime = cmpTimer.GetTime();
+	PlaySound("alert_raise", this.entity);
 
-	// Find buildings/units owned by this unit's player
 	let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
 	if (!cmpOwnership || cmpOwnership.GetOwner() == INVALID_PLAYER)
-		return false;
+		return;
 
-	let players = [cmpOwnership.GetOwner()];
+	let owner = cmpOwnership.GetOwner();
+	let cmpPlayer = QueryOwnerInterface(this.entity);
+	let mutualAllies = cmpPlayer ? cmpPlayer.GetMutualAllies() : [owner];
 	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
 
-	// Select units to put under alert, according to their reaction to this level
-	let units = cmpRangeManager.ExecuteQuery(this.entity, 0, this.template.Range, players, IID_UnitAI).filter(ent =>
-		Engine.QueryInterface(ent, IID_UnitAI).ReactsToAlert(this.level)
-	);
-
-	// Store the number of available garrison spots, so that units don't try to garrison in buildings that will be full
+	// Store the number of available garrison spots so that units don't try to garrison in buildings that will be full
 	let reserved = new Map();
+
+	let units = cmpRangeManager.ExecuteQuery(this.entity, 0, +this.template.RaiseAlertRange, [owner], IID_UnitAI).filter(ent => this.UnitFilter(ent));
 	for (let unit of units)
 	{
-		let holder = cmpRangeManager.ExecuteQuery(unit, 0, this.searchRange, players, IID_GarrisonHolder).find(ent => {
+		let cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
+
+		let holder = cmpRangeManager.ExecuteQuery(unit, 0, +this.template.SearchRange, mutualAllies, IID_GarrisonHolder).find(ent => {
 			// Ignore moving garrison holders
 			if (Engine.QueryInterface(ent, IID_UnitAI))
 				return false;
 
 			// Ensure that the garrison holder is within range of the alert raiser
-			if (DistanceBetweenEntities(this.entity, ent) > +this.template.Range + this.bufferRange)
+			if (+this.template.EndOfAlertRange > 0 && DistanceBetweenEntities(this.entity, ent) > +this.template.EndOfAlertRange)
+				return false;
+
+			if (!cmpUnitAI.CheckTargetVisible(ent))
 				return false;
 
 			let cmpGarrisonHolder = Engine.QueryInterface(ent, IID_GarrisonHolder);
@@ -76,47 +68,49 @@
 			return cmpGarrisonHolder.IsAllowedToGarrison(unit) && reserved.get(ent);
 		});
 
-		let cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
 		if (holder)
 		{
 			reserved.set(holder, reserved.get(holder) - 1);
 			cmpUnitAI.ReplaceOrder("Garrison", { "target": holder, "force": true });
 		}
 		else
-			// If no available spots, move to the alert raiser
-			cmpUnitAI.ReplaceOrder("WalkToTarget", { "target": this.entity, "force": true });
+			// If no available spots, stop moving
+			cmpUnitAI.ReplaceOrder("Stop", { "force": true });
 	}
-	return true;
 };
 
 AlertRaiser.prototype.EndOfAlert = function()
 {
-	this.SoundAlert();
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	if (cmpTimer.GetTime() == this.lastTime)
+		return;
+
+	this.lastTime = cmpTimer.GetTime();
+	PlaySound("alert_end", this.entity);
 
 	let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
 	if (!cmpOwnership || cmpOwnership.GetOwner() == INVALID_PLAYER)
-		return false;
-
-	let players = [cmpOwnership.GetOwner()];
+		return;
 
-	// Units that are not garrisoned should stop and go back to work
+	let owner = cmpOwnership.GetOwner();
+	let cmpPlayer = QueryOwnerInterface(this.entity);
+	let mutualAllies = cmpPlayer ? cmpPlayer.GetMutualAllies() : [owner];
 	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
-	let units = cmpRangeManager.ExecuteQuery(this.entity, 0, +this.template.Range + this.bufferRange, players, IID_UnitAI).filter(ent =>
-		Engine.QueryInterface(ent, IID_UnitAI).ReactsToAlert(this.level)
-	);
 
+	// Units that are not garrisoned should go back to work
+	let units = cmpRangeManager.ExecuteQuery(this.entity, 0, +this.template.EndOfAlertRange, [owner], IID_UnitAI).filter(ent => this.UnitFilter(ent));
 	for (let unit of units)
 	{
 		let cmpUnitAI = Engine.QueryInterface(unit, IID_UnitAI);
-		if (cmpUnitAI.HasWorkOrders() && (cmpUnitAI.HasGarrisonOrder() || cmpUnitAI.IsIdle()))
+		if (cmpUnitAI.HasWorkOrders() && cmpUnitAI.ShouldRespondToEndOfAlert())
 			cmpUnitAI.BackToWork();
-		else if (cmpUnitAI.HasGarrisonOrder())
+		else if (cmpUnitAI.ShouldRespondToEndOfAlert())
 			// Stop rather than continue to try to garrison
-			cmpUnitAI.ReplaceOrder("Stop", undefined);
+			cmpUnitAI.ReplaceOrder("Stop", { "force": true });
 	}
 
 	// Units that are garrisoned should ungarrison and go back to work
-	let holders = cmpRangeManager.ExecuteQuery(this.entity, 0, +this.template.Range + this.bufferRange, players, IID_GarrisonHolder);
+	let holders = cmpRangeManager.ExecuteQuery(this.entity, 0, +this.template.EndOfAlertRange, mutualAllies, IID_GarrisonHolder);
 	if (Engine.QueryInterface(this.entity, IID_GarrisonHolder))
 		holders.push(this.entity);
 
@@ -126,10 +120,10 @@
 			continue;
 
 		let cmpGarrisonHolder = Engine.QueryInterface(holder, IID_GarrisonHolder);
-		let units = cmpGarrisonHolder.GetEntities().filter(ent =>
-			Engine.QueryInterface(ent, IID_UnitAI).ReactsToAlert(this.level) &&
-			Engine.QueryInterface(ent, IID_Ownership).GetOwner() == players[0]
-		);
+		let units = cmpGarrisonHolder.GetEntities().filter(ent => {
+			let cmpOwner = Engine.QueryInterface(ent, IID_Ownership);
+			return cmpOwner && cmpOwner.GetOwner() == owner && this.UnitFilter(ent);
+		});
 
 		for (let unit of units)
 			if (cmpGarrisonHolder.PerformEject([unit], false))
@@ -139,12 +133,9 @@
 					cmpUnitAI.BackToWork();
 				else
 					// Stop rather than walk to the rally point
-					cmpUnitAI.ReplaceOrder("Stop", undefined);
+					cmpUnitAI.ReplaceOrder("Stop", { "force": true });
 			}
 	}
-
-	this.level = 0;
-	return true;
 };
 
 Engine.RegisterComponentType(IID_AlertRaiser, "AlertRaiser", AlertRaiser);
Index: ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -374,11 +374,7 @@
 
 	let cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
 	if (cmpAlertRaiser)
-		ret.alertRaiser = {
-			"level": cmpAlertRaiser.GetLevel(),
-			"canIncreaseLevel": cmpAlertRaiser.CanIncreaseLevel(),
-			"hasRaisedAlert": cmpAlertRaiser.HasRaisedAlert(),
-		};
+		ret.alertRaiser = true;
 
 	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
 	ret.visibility = cmpRangeManager.GetLosVisibility(ent, player);
Index: ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -3,9 +3,6 @@
 UnitAI.prototype.Schema =
 	"<a:help>Controls the unit's movement, attacks, etc, in response to commands from the player.</a:help>" +
 	"<a:example/>" +
-	"<element name='AlertReactiveLevel'>" +
-		"<data type='nonNegativeInteger'/>" +
-	"</element>" +
 	"<element name='DefaultStance'>" +
 		"<choice>" +
 			"<value>violent</value>" +
@@ -3261,11 +3258,6 @@
 	return cmpPosition && cmpPosition.GetTurretParent() != INVALID_ENTITY;
 };
 
-UnitAI.prototype.ReactsToAlert = function(level)
-{
-	return this.template.AlertReactiveLevel <= level;
-};
-
 UnitAI.prototype.IsFormationController = function()
 {
 	return (this.template.FormationController == "true");
@@ -3334,9 +3326,9 @@
 	return INVALID_ENTITY;
 };
 
-UnitAI.prototype.HasGarrisonOrder = function()
+UnitAI.prototype.ShouldRespondToEndOfAlert = function()
 {
-	return this.orderQueue.length && this.orderQueue[0].type == "Garrison";
+	return !this.orderQueue.length || this.orderQueue[0].type == "Garrison";
 };
 
 UnitAI.prototype.IsFleeing = function()
Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_AlertRaiser.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_AlertRaiser.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_AlertRaiser.js
@@ -1,73 +0,0 @@
-Engine.LoadHelperScript("Entity.js");
-Engine.LoadComponentScript("interfaces/AlertRaiser.js")
-Engine.LoadComponentScript("interfaces/GarrisonHolder.js");
-Engine.LoadComponentScript("interfaces/UnitAI.js");
-Engine.LoadComponentScript("AlertRaiser.js");
-
-const alertRaiserID = 5;
-const unitIDs = [10, 11, 12];
-const buildingIDs = [13, 14, 15];
-
-let cmpAlertRaiser = ConstructComponent(alertRaiserID, "AlertRaiser", {
-	"MaximumLevel": 0,
-	"Range": 50
-});
-
-Engine.RegisterGlobal("PlaySound", (name, source) => {
-	TS_ASSERT_EQUALS(name, "alert" + cmpAlertRaiser.GetLevel());
-	TS_ASSERT_EQUALS(source, alertRaiserID);
-});
-
-AddMock(alertRaiserID, IID_Ownership, {
-	"GetOwner": () => 1
-});
-
-AddMock(SYSTEM_ENTITY, IID_RangeManager, {
-	"ExecuteQuery": (ent, value, range, players, iid) => iid === IID_UnitAI ? unitIDs : buildingIDs
-});
-
-for (let unitID of unitIDs)
-	AddMock(unitID, IID_UnitAI, {
-		"ReactsToAlert": (alertLevel) => alertLevel >= 2,
-		"ReplaceOrder": () => {},
-		"HasWorkOrders": () => true,
-		"HasGarrisonOrder": () => true,
-		"BackToWork": () => {}
-	});
-
-for (let buildingID of buildingIDs)
-	AddMock(buildingID, IID_GarrisonHolder, {
-		"GetCapacity": () => 10,
-		"GetGarrisonedEntitiesCount": () => 0,
-		"IsAllowedToGarrison": () => true,
-		"GetEntities": () => []
-	});
-
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 0);
-TS_ASSERT_EQUALS(cmpAlertRaiser.HasRaisedAlert(), false);
-TS_ASSERT_EQUALS(cmpAlertRaiser.CanIncreaseLevel(), false);
-TS_ASSERT_EQUALS(cmpAlertRaiser.IncreaseAlertLevel(), false);
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 0);
-
-cmpAlertRaiser = ConstructComponent(alertRaiserID, "AlertRaiser", {
-	"MaximumLevel": 2,
-	"Range": 50
-});
-
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 0);
-TS_ASSERT_EQUALS(cmpAlertRaiser.HasRaisedAlert(), false);
-TS_ASSERT_EQUALS(cmpAlertRaiser.CanIncreaseLevel(), true);
-TS_ASSERT_EQUALS(cmpAlertRaiser.IncreaseAlertLevel(), true);
-
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 1);
-TS_ASSERT_EQUALS(cmpAlertRaiser.HasRaisedAlert(), true);
-TS_ASSERT_EQUALS(cmpAlertRaiser.CanIncreaseLevel(), true);
-TS_ASSERT_EQUALS(cmpAlertRaiser.IncreaseAlertLevel(), true);
-
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 2);
-TS_ASSERT_EQUALS(cmpAlertRaiser.HasRaisedAlert(), true);
-TS_ASSERT_EQUALS(cmpAlertRaiser.CanIncreaseLevel(), false);
-TS_ASSERT_EQUALS(cmpAlertRaiser.IncreaseAlertLevel(), false);
-
-TS_ASSERT_EQUALS(cmpAlertRaiser.EndOfAlert(), true);
-TS_ASSERT_EQUALS(cmpAlertRaiser.GetLevel(), 0);
Index: ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
+++ ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
@@ -552,13 +552,13 @@
 		}
 	},
 
-	"increase-alert-level": function(player, cmd, data)
+	"alert-raise": function(player, cmd, data)
 	{
 		for (let ent of data.entities)
 		{
 			var cmpAlertRaiser = Engine.QueryInterface(ent, IID_AlertRaiser);
-			if (!cmpAlertRaiser || !cmpAlertRaiser.IncreaseAlertLevel())
-				notifyAlertFailure(player);
+			if (cmpAlertRaiser)
+				cmpAlertRaiser.RaiseAlert();
 		}
 	},
 
@@ -860,20 +860,6 @@
 }
 
 /**
- * Sends a GUI notification about Alerts that failed to be raised
- */
-function notifyAlertFailure(player)
-{
-	var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
-	cmpGUIInterface.PushNotification({
-		"type": "text",
-		"players": [player],
-		"message": "You can't raise the alert to a higher level!",
-		"translateMessage": true
-	});
-}
-
-/**
  * Get some information about the formations used by entities.
  * The entities must have a UnitAI component.
  */
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -33,7 +33,6 @@
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
   <UnitAI>
-    <AlertReactiveLevel>2</AlertReactiveLevel>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>true</FormationController>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic">
   <AlertRaiser>
-    <MaximumLevel>2</MaximumLevel>
-    <Range>140</Range>
+    <List datatype="tokens">FemaleCitizen</List>
+    <RaiseAlertRange>140</RaiseAlertRange>
+    <EndOfAlertRange>190</EndOfAlertRange>
+    <SearchRange>100</SearchRange>
   </AlertRaiser>
   <Armour>
     <Hack op="add">5</Hack>
@@ -114,9 +116,8 @@
       <select>interface/select/building/sel_civ_center.xml</select>
       <constructed>interface/complete/building/complete_civ_center.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
-      <alert0>interface/alarm/alarm_alert_0.xml</alert0>
-      <alert1>interface/alarm/alarm_alert_1.xml</alert1>
-      <alert2>interface/alarm/alarm_alert_2.xml</alert2>
+      <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
+      <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
+  <AlertRaiser>
+    <List datatype="tokens">FemaleCitizen</List>
+    <RaiseAlertRange>60</RaiseAlertRange>
+    <EndOfAlertRange>100</EndOfAlertRange>
+    <SearchRange>100</SearchRange>
+  </AlertRaiser>
   <BuildRestrictions>
     <Category>Farmstead</Category>
   </BuildRestrictions>
@@ -48,6 +54,8 @@
       <select>interface/select/building/sel_farmstead.xml</select>
       <constructed>interface/complete/building/complete_farmstead.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
+      <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
+      <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
+  <AlertRaiser>
+    <List datatype="tokens">Trader+!Ship</List>
+    <RaiseAlertRange>-1</RaiseAlertRange>
+    <EndOfAlertRange>-1</EndOfAlertRange>
+    <SearchRange>100</SearchRange>
+  </AlertRaiser>
   <BuildRestrictions>
     <Category>Market</Category>
   </BuildRestrictions>
@@ -58,6 +64,8 @@
       <select>interface/select/building/sel_market.xml</select>
       <constructed>interface/complete/building/complete_market.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
+      <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
+      <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
+  <AlertRaiser>
+    <List datatype="tokens">FemaleCitizen</List>
+    <RaiseAlertRange>60</RaiseAlertRange>
+    <EndOfAlertRange>100</EndOfAlertRange>
+    <SearchRange>100</SearchRange>
+  </AlertRaiser>
   <BuildRestrictions>
     <Category>Storehouse</Category>
   </BuildRestrictions>
@@ -57,6 +63,8 @@
       <select>interface/select/building/sel_storehouse.xml</select>
       <constructed>interface/complete/building/complete_storehouse.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
+      <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
+      <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -101,7 +101,6 @@
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
-    <AlertReactiveLevel>2</AlertReactiveLevel>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>false</FormationController>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -21,7 +21,6 @@
   </Minimap>
   <ResourceGatherer disable=""/>
   <UnitAI>
-    <AlertReactiveLevel>99</AlertReactiveLevel>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
     <RoamDistance>8.0</RoamDistance>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
@@ -21,7 +21,6 @@
     </Overlay>
   </Selectable>
   <UnitAI>
-    <AlertReactiveLevel>0</AlertReactiveLevel>
     <DefaultStance>passive</DefaultStance>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <FormationController>false</FormationController>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -85,7 +85,6 @@
     </SoundGroups>
   </Sound>
   <UnitAI>
-    <AlertReactiveLevel>1</AlertReactiveLevel>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>