Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml	(revision 26755)
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml	(revision 26756)
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object>
 	<object hotkey="cancel">
 		<action on="Press">closeOpenDialogs();</action>
 	</object>
 
 	<object hotkey="session.gui.toggle">
 		<action on="Press">toggleGUI();</action>
 	</object>
 
 	<object hotkey="session.gui.tutorial.toggle">
 		<action on="Press">toggleTutorial();</action>
 	</object>
 
 	<object hotkey="silhouettes">
 		<action on="Press">toggleConfigBool("silhouettes");</action>
 	</object>
 
 	<object hotkey="quicksave">
 		<action on="Press">if (!g_IsNetworked) Engine.QuickSave(getSavedGameData());</action>
 	</object>
 
 	<object hotkey="quickload">
 		<action on="Press">if (!g_IsNetworked) Engine.QuickLoad();</action>
 	</object>
 
 	<object hotkey="session.kill">
 		<action on="KeyDown">performCommand(g_Selection.toList().map(ent => GetEntityState(ent)), "delete");</action>
 	</object>
 
 	<object hotkey="session.unload">
 		<action on="KeyDown">unloadAll();</action>
 	</object>
 
 	<object hotkey="session.unloadturrets">
 		<action on="KeyDown">unloadAllTurrets();</action>
 	</object>
 
 	<object hotkey="session.leaveturret">
 		<action on="KeyDown">leaveTurretPoints();</action>
 	</object>
 
 	<object hotkey="session.stop">
 		<action on="KeyDown">stopUnits(g_Selection.toList());</action>
 	</object>
 
 	<object hotkey="session.backtowork">
 		<action on="KeyDown">backToWork();</action>
 	</object>
 
 	<object hotkey="session.batchtrain">
 		<action on="Press">updateSelectionDetails();</action>
 		<action on="Release">updateSelectionDetails();</action>
 	</object>
 
 	<object hotkey="selection.idlebuilder">
 		<action on="KeyDown">findIdleUnit(["Builder"]);</action>
 	</object>
 
 	<!-- Find idle warrior - TODO: Potentially move this to own UI button? -->
 	<object hotkey="selection.idlewarrior">
 		<action on="KeyDown">findIdleUnit(g_MilitaryTypes);</action>
 	</object>
 
 	<object hotkey="selection.idleunit">
-		<action on="KeyDown">findIdleUnit(["!Domestic"]);</action>
+		<action on="KeyDown">findIdleUnit(["!Domestic+!Formation"]);</action>
 	</object>
 
 	<object hotkey="selection.cancel">
 		<action on="KeyDown">clearSelection();</action>
 	</object>
 
 	<object hotkey="session.showstatusbars">
 		<action on="Press">
 			g_ShowAllStatusBars = !g_ShowAllStatusBars;
 			recalculateStatusBarDisplay();
 		</action>
 	</object>
 </object>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml	(revision 26755)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml	(revision 26756)
@@ -1,79 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <!--
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>256x256/rectangle.png</MainTexture>
         <MainTextureMask>256x256/rectangle_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   -->
   <Formation>
     <RequiredMemberCount>2</RequiredMemberCount>
     <DisabledTooltip>Requires at least 2 Soldiers or Siege Engines.</DisabledTooltip>
     <SpeedMultiplier>1</SpeedMultiplier>
     <FormationShape>square</FormationShape>
     <MaxTurningAngle>1</MaxTurningAngle>
     <SortingClasses>Hero Champion Cavalry Melee Ranged</SortingClasses>
     <ShiftRows>false</ShiftRows>
     <UnitSeparationWidthMultiplier>1</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>1</UnitSeparationDepthMultiplier>
     <WidthDepthRatio>1</WidthDepthRatio>
     <Sloppiness>0</Sloppiness>
     <AnimationVariants/>
   </Formation>
   <FormationAttack>
     <CanAttackAsFormation>false</CanAttackAsFormation>
   </FormationAttack>
   <Identity>
     <Civ/> <!-- Unused -->
+    <Classes datatype="tokens">Formation</Classes>
     <Undeletable>true</Undeletable>
   </Identity>
   <Obstruction>
     <Unit/>
     <Active>true</Active>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <BlockFoundation>false</BlockFoundation>
     <BlockConstruction>false</BlockConstruction>
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0</FloatDepth>
     <TurnRate>10</TurnRate>
   </Position>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
   <UnitAI>
     <DefaultStance>aggressive</DefaultStance>
     <FormationController>true</FormationController>
     <FleeDistance>12.0</FleeDistance>
     <CanGuard>true</CanGuard>
     <CanPatrol>true</CanPatrol>
     <PatrolWaitTime>2</PatrolWaitTime>
   </UnitAI>
   <UnitMotion>
     <FormationController>true</FormationController>
     <WalkSpeed>1</WalkSpeed>
     <RunMultiplier>100</RunMultiplier> <!-- = Max formation speed -->
     <InstantTurnAngle>0.1</InstantTurnAngle>
     <Acceleration>100</Acceleration> <!-- Unused -->
     <PassabilityClass>large</PassabilityClass>
     <Weight>100</Weight>
   </UnitMotion>
   <VisualActor>
     <Actor>props/units/standards/formation.xml</Actor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>