Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/octagram/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/hash/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/actor_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/actor_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/actor_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/actor_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/actor_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/1024x1024_aura.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/star/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/square/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/square/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/plus/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/actor.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/actor.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/actor.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/actor.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/actor.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/512x512.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/64x64.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/32x32_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/circle/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/arrow/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/256x256.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128_mask.png	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128_mask.png	(nonexistent)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/rhombus/128x128_mask.png
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/arrow_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/ellipse_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/octagram_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/plus_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 23703)
@@ -1,44 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>15.0</Hack>
         <Pierce>10.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>4.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.2" depth="6.4"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Walrus</GenericName>
     <SpecificName>Odobenus rosmarus</SpecificName>
     <Icon>gaia/fauna_walrus.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>300</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="4.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Baobab</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="3.0" depth="3.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>400</Amount>
     <MaxGatherers>9</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/baobab.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_patch.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="4.0"/>
     <Height>12.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Cretan Date Palm</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="4.0" depth="4.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>300</Amount>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/palm_cretan_date_patch.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml	(revision 23703)
@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="5.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Teak</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="3.0" depth="3.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/teak.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml	(revision 23703)
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <!--
   <Identity>
     <GenericName>Formation</GenericName>
     <Undeletable>true</Undeletable>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>256x256/rectangle.png</MainTexture>
+        <MainTextureMask>256x256/rectangle_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <VisualActor>
     <Actor>props/special/common/waypoint_flag.xml</Actor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
   -->
   <Formation>
     <RequiredMemberCount>2</RequiredMemberCount>
     <DisabledTooltip>Requires at least 2 Soldiers or Siege engines.</DisabledTooltip>
     <SpeedMultiplier>1</SpeedMultiplier>
     <FormationShape>square</FormationShape>
     <SortingClasses>Hero Champion Cavalry Melee Ranged</SortingClasses>
     <ShiftRows>false</ShiftRows>
     <UnitSeparationWidthMultiplier>1</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>1</UnitSeparationDepthMultiplier>
     <WidthDepthRatio>1</WidthDepthRatio>
     <Sloppyness>0</Sloppyness>
     <AnimationVariants/>
   </Formation>
   <FormationAttack>
     <CanAttackAsFormation>false</CanAttackAsFormation>
   </FormationAttack>
   <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.0</FloatDepth>
     <TurnRate>3.0</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>
   </UnitAI>
   <UnitMotion>
     <FormationController>true</FormationController>
     <WalkSpeed>1.0</WalkSpeed>
     <RunMultiplier>100.0</RunMultiplier> <!-- = Max formation speed -->
     <PassabilityClass>large</PassabilityClass>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 23703)
@@ -1,146 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
   <Armour>
     <Hack>1</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <PopulationBonus>0</PopulationBonus>
     <BuildTime>1</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <Active>false</Active>
     <SinkingAnim>false</SinkingAnim>
     <DelayTime>30.0</DelayTime>
     <SinkRate>0.01</SinkRate>
     <SinkAccel>0.0</SinkAccel>
   </Decay>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Garrisonable/>
   <Guard/>
   <Health>
     <DeathType>corpse</DeathType>
     <Max>100</Max>
     <RegenRate>0</RegenRate>
     <IdleRegenRate>0</IdleRegenRate>
     <Unhealable>false</Unhealable>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Unit Organic ConquestCritical</Classes>
     <GenericName>Unit</GenericName>
     <Formations datatype="tokens">
       special/formations/null
       special/formations/box
       special/formations/column_closed
       special/formations/line_closed
       special/formations/column_open
       special/formations/line_open
       special/formations/flank
       special/formations/battle_line
     </Formations>
     <Phenotype datatype="tokens">male</Phenotype>
     <Undeletable>false</Undeletable>
   </Identity>
   <Looter/>
   <Minimap>
     <Type>unit</Type>
   </Minimap>
   <Obstruction>
     <Unit/>
     <Active>true</Active>
     <BlockMovement>true</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <BlockFoundation>false</BlockFoundation>
     <BlockConstruction>true</BlockConstruction>
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>pitch</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>6.0</TurnRate>
   </Position>
   <RangeOverlayManager/>
   <RangeOverlayRenderer/>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <treasure>1</treasure>
     </Rates>
     <Capacities>
       <food>10</food>
       <wood>10</wood>
       <stone>10</stone>
       <metal>10</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/ellipse.png</MainTexture>
+        <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attacked>interface/alarm/alarm_attackplayer.xml</attacked>
       <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <StatusEffectsReceiver/>
   <UnitAI>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>false</FormationController>
     <CanGuard>true</CanGuard>
     <CanPatrol>true</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
     <PassabilityClass>default</PassabilityClass>
     <WalkSpeed>9.0</WalkSpeed>
     <RunMultiplier>1.67</RunMultiplier>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
   </Visibility>
   <Vision>
     <Range>12</Range>
   </Vision>
   <VisionSharing>
     <Bribable>false</Bribable>
   </VisionSharing>
   <VisualActor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml	(revision 23703)
@@ -1,47 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <Damage>
         <Hack>30.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>1.5</Height>
   </Footprint>
   <Identity>
     <GenericName>Nile Crocodile</GenericName>
     <SpecificName>Crocodylus niloticus</SpecificName>
     <Icon>gaia/fauna_crocodile.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/crocodile.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml	(revision 23703)
@@ -1,53 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>12</Hack>
         <Pierce>12</Pierce>
       </Damage>
       <MaxRange>3</MaxRange>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.5" depth="5"/>
     <Height>1.5</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Hippopotamus</GenericName>
     <SpecificName>Hippopotamus amphibius</SpecificName>
     <Icon>gaia/fauna_hippopotamus.png</Icon>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
   <ResourceSupply>
     <Amount>400</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>fauna/hippopotamus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml	(revision 23703)
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_passive">
   <Footprint>
     <Square width="2.0" depth="8.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <GenericName>Great White Shark</GenericName>
     <SpecificName>Carcharodon carcharias</SpecificName>
     <Classes datatype="tokens">SeaCreature</Classes>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Minimap disable=""/>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Altitude>-1</Altitude>
     <Anchor>upright</Anchor>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>5.0</TurnRate>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <RoamDistance>100.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
   <VisualActor>
     <Actor>fauna/shark.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banyan.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banyan.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_banyan.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="8.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Banyan</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>600</Amount>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/banyan.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_4_dead.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_4_dead.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_4_dead.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="8.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Dead Baobab</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>550</Amount>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/baobab_new_dead.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_strangler.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_strangler.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_strangler.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="7.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Strangler Fig</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
     <MaxGatherers>10</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/strangler.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_bird.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_bird.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_bird.xml	(revision 23703)
@@ -1,64 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This entity file is meant to make birds move
   on the map instead of just staying there,
   but not affect the gameplay in any way.
   They have a minimum number of components. -->
 <Entity>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>1.0</TurnRate>
   </Position>
   <Selectable>
     <EditorOnly/>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <FormationController>false</FormationController>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
     <RoamDistance>1000.0</RoamDistance>
     <FleeDistance>10.0</FleeDistance>
     <RoamTimeMin>10000</RoamTimeMin>
     <RoamTimeMax>100000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotionFlying>
     <MaxSpeed>15.0</MaxSpeed>
     <TakeoffSpeed>1.0</TakeoffSpeed>
     <LandingSpeed>5.0</LandingSpeed>
     <AccelRate>5.0</AccelRate>
     <SlowingRate>5.0</SlowingRate>
     <BrakingRate>5.0</BrakingRate>
     <TurnRate>0.5</TurnRate>
     <OvershootTime>2.0</OvershootTime>
     <FlyingHeight>40.0</FlyingHeight>
     <ClimbRate>4.0</ClimbRate>
     <DiesInWater>false</DiesInWater>
     <PassabilityClass>unrestricted</PassabilityClass>
   </UnitMotionFlying>
   <Visibility>
     <RetainInFog>true</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
   </Visibility>
   <Vision>
     <Range>0</Range>
   </Vision>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_territory_pull.xml	(revision 23703)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <Capturable>
     <CapturePoints>5</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>0</GarrisonRegenRate>
   </Capturable>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>upright</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>6.0</TurnRate>
   </Position>
   <Selectable>
     <EditorOnly/>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/octagram.png</MainTexture>
+        <MainTextureMask>128x128/octagram_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <TerritoryDecay>
     <DecayRate>5</DecayRate>
   </TerritoryDecay>
   <Visibility>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
     <RetainInFog>false</RetainInFog>
   </Visibility>
   <VisualActor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>true</SilhouetteOccluder>
     <Actor>props/special/common/waypoint_flag.xml</Actor>
     <VisibleInAtlasOnly>true</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rectangle_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/rhombus_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/128x128/star_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/arrow_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/ellipse_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/octagram_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/plus_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle_mask.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle_mask.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle_mask.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle_mask.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rectangle_mask.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/rhombus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star.png
===================================================================
--- ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star.png	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star.png	(revision 23703)

Property changes on: ps/trunk/binaries/data/mods/public/art/textures/selection/256x256/star.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 23703)
@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Dromedary</GenericName>
     <SpecificName>Camelus dromedarius</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel_select.xml</select>
       <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 23703)
@@ -1,35 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="3.3" depth="6.6"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
   </Health>
   <Identity>
     <GenericName>Giraffe</GenericName>
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>350</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml	(revision 23703)
@@ -1,44 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>20.0</Crush>
       </Damage>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.8" depth="5.6"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
     <GenericName>White Rhinoceros</GenericName>
     <SpecificName>Ceratotherium simum</SpecificName>
     <Icon>gaia/fauna_rhino.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>300</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <Actor>fauna/rhino.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="8.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Dragon Bamboo</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>1000</Amount>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/bamboo_dragon.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_3_mature.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_3_mature.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_baobab_3_mature.xml	(revision 23703)
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree">
   <Footprint>
     <Circle radius="8.0"/>
     <Height>15.0</Height>
   </Footprint>
   <Identity>
     <SpecificName>Baobab</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="6.0" depth="6.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>600</Amount>
     <MaxGatherers>12</MaxGatherers>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/baobab_new.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml	(revision 23703)
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_flora_tree_fruit">
   <Footprint>
     <Circle radius="4.0"/>
   </Footprint>
   <Identity>
     <SpecificName>Fig</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
   </Obstruction>
   <ResourceSupply>
     <Amount>500</Amount>
   </ResourceSupply>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <VisualActor>
     <Actor>flora/trees/fig.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml	(revision 23703)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_treasure">
   <Footprint replace="">
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Identity>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>treasure.food</Type>
   </ResourceSupply>
   <Selectable replace="">
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/ellipse.png</MainTexture>
+        <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <VisualActor>
     <Actor>props/special/eyecandy/barrel_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_gaia_flora.xml	(revision 23703)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia">
   <Identity>
     <Classes datatype="tokens">ForestPlant</Classes>
     <Icon>gaia/flora_tree_generic.png</Icon>
     <Tooltip>Chop trees for wood.</Tooltip>
   </Identity>
   <Minimap>
     <Type>wood</Type>
     <Color r="69" g="107" b="68"/>
   </Minimap>
   <Obstruction>
     <Static width="1.6" depth="1.6"/>
     <!-- Trees are deleted as a workaround for gates until random maps are smart enough to not place trees inside walls -->
     <DeleteUponConstruction>true</DeleteUponConstruction>
   </Obstruction>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>200</Amount>
     <Type>wood.tree</Type>
     <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Outline disable=""/>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/ellipse.png</MainTexture>
+        <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>interface/select/resource/sel_tree.xml</select>
     </SoundGroups>
   </Sound>
   <VisualActor>
     <SelectionShape>
       <Footprint/>
     </SelectionShape>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml	(revision 23703)
@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <Capture>5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
   </Attack>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Champion</VisibleClasses>
     <GenericName>Champion Unit</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>256x256/arrow.png</MainTexture>
+        <MainTextureMask>256x256/arrow_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Loot>
     <xp>150</xp>
     <food>10</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>20</metal>
   </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 23703)
@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>2</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <Population>1</Population>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4" depth="6"/>
     <Height>7.5</Height>
   </Footprint>
   <Health>
     <Max>160</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.95</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 23703)
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>125</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>75</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>arrow/128x128.png</MainTexture>
-        <MainTextureMask>arrow/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/arrow.png</MainTexture>
+        <MainTextureMask>128x128/arrow_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>84</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml	(revision 23703)
@@ -1,49 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Capturable>
     <CapturePoints>250</CapturePoints>
     <GarrisonRegenRate>0</GarrisonRegenRate>
     <RegenRate>10</RegenRate>
   </Capturable>
   <Cost disable=""/>
   <Footprint replace="">
     <Height>2.0</Height>
     <Square width="5.0" depth="12.0"/>
   </Footprint>
   <Identity>
     <Classes datatype="tokens">-Organic -ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Relic</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Catafalque</GenericName>
     <Icon>units/catafalque.png</Icon>
     <SelectionGroupName>template_unit_catafalque</SelectionGroupName>
     <Tooltip>A catafalque that holds the remains of a great leader.</Tooltip>
     <Undeletable>true</Undeletable>
   </Identity>
   <Minimap>
     <Color r="148" g="0" b="211"/>
   </Minimap>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
   <ResourceGatherer disable=""/>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/cartouche.png</MainTexture>
+        <MainTextureMask>128x256/cartouche_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <order_walk>actor/singlesteps/steps_grass_order.xml</order_walk>
       <run>actor/singlesteps/steps_grass.xml</run>
       <select>attack/siege/siege_select.xml</select>
       <walk>actor/singlesteps/steps_grass.xml</walk>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
     <CanGuard>false</CanGuard>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.55</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/global/catafalque.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 23703)
@@ -1,61 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <Population>3</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>250</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="3.5"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>750</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>War Elephant</GenericName>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>arrow/256x256.png</MainTexture>
-        <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 23703)
@@ -1,63 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>7</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>250</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Champion Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>arrow/256x256.png</MainTexture>
-        <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2.25</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 23703)
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>1</Hack>
     <Pierce>2</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>15</BuildTime>
     <Population>0</Population>
     <Resources>
       <food>100</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Health>
     <Max>90</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Dog Melee</VisibleClasses>
     <GenericName>War Dog</GenericName>
     <Rank>Basic</Rank>
     <Tooltip>Cannot attack structures.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>arrow/256x256.png</MainTexture>
-        <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/global/civ_dog_bark.xml</select>
       <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
       <order_gather>voice/global/civ_dog_move.xml</order_gather>
       <order_repair>voice/global/civ_dog_move.xml</order_repair>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/fauna/death/death_animal_gen.xml</death>
       <trained>interface/complete/building/complete_kennel.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <TrainingRestrictions>
     <Category>WarDog</Category>
   </TrainingRestrictions>
   <UnitMotion>
     <WalkSpeed op="mul">1.6</WalkSpeed>
     <RunMultiplier>2.5</RunMultiplier>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 23703)
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
     <Max>200</Max>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Tooltip>Kill to butcher for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Anchor>upright</Anchor>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/512x512.png</MainTexture>
-        <MainTextureMask>circle/512x512_mask.png</MainTextureMask>
+        <MainTexture>128x512/ellipse.png</MainTexture>
+        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 23703)
@@ -1,135 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>2</Hack>
     <Pierce>4</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>2</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}_civil_centre
       structures/{civ}_crannog
       structures/{civ}_military_colony
       structures/{civ}_house
       structures/{civ}_storehouse
       structures/{civ}_farmstead
       structures/{civ}_field
       structures/{civ}_corral
       structures/{civ}_outpost
       structures/wallset_palisade
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
       structures/{civ}_blacksmith
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
       structures/{civ}_workshop
       structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>
   </Builder>
   <Cost>
     <BuildTime>10</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.75</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.5</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.5</metal.ore>
     </Rates>
   </ResourceGatherer>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/128x128.png</MainTexture>
-        <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml	(revision 23703)
@@ -1,90 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>150.0</Pierce>
         <Crush>25.0</Crush>
       </Damage>
       <MaxRange>80.0</MaxRange>
       <MinRange>26.0</MinRange>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>6000</RepeatTime>
       <Delay>0</Delay>
       <Splash>
         <Shape>Linear</Shape>
         <Range>8.0</Range>
         <FriendlyFire>false</FriendlyFire>
         <Damage>
           <Hack>0.0</Hack>
           <Pierce>75.0</Pierce>
           <Crush>5.0</Crush>
         </Damage>
       </Splash>
       <Projectile>
         <Speed>150.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Ranged>
   </Attack>
   <Capturable>
     <RegenRate>20</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <wood>250</wood>
       <metal>250</metal>
     </Resources>
     <Population>2</Population>
   </Cost>
   <Footprint replace="">
     <Square width="5.0" depth="12.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <GenericName>Bolt Shooter</GenericName>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>0</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>10</metal>
   </Loot>
   <Pack>
     <Time>10000</Time>
   </Pack>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>120</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml	(revision 23703)
@@ -1,57 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
     <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
       <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <GenericName>Trader</GenericName>
     <SelectionGroupName>template_unit_support_trader</SelectionGroupName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
     <Formations disable=""/>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_trade>voice/{lang}/civ/civ_{phenotype}_trade.xml</order_trade>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
     </SoundGroups>
   </Sound>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
   <UnitAI>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisionSharing>
     <Bribable>true</Bribable>
   </VisionSharing>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml	(revision 23703)
@@ -1,49 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>50.0</Crush>
       </Damage>
       <MaxRange>12</MaxRange>
       <MinRange>8.0</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>10.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
     </Ranged>
   </Attack>
   <DeathDamage>
     <Shape>Circular</Shape>
     <Range>20</Range>
     <FriendlyFire>true</FriendlyFire>
     <Damage>
       <Hack>200.0</Hack>
       <Pierce>200.0</Pierce>
       <Crush>200.0</Crush>
     </Damage>
   </DeathDamage>
   <Footprint replace="">
     <Square width="6.0" depth="20.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Identity>
     <GenericName>Fire Raiser</GenericName>
     <SpecificName>Pyrobolos</SpecificName>
     <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/rounded_rectangle.png</MainTexture>
+        <MainTextureMask>128x512/rounded_rectangle_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>units/thebans/siege_fireraiser.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 23703)
@@ -1,55 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>10.0</Pierce>
         <Crush>20.0</Crush>
       </Damage>
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCav>
           <Classes>Cavalry</Classes>
           <Multiplier>1.5</Multiplier>
         </BonusCav>
       </Bonuses>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 23703)
@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>8</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>200</food>
       <wood>200</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Hero</GenericName>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x128/star.png</MainTexture>
+        <MainTextureMask>128x128/star_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml	(revision 23703)
@@ -1,62 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>1</Hack>
     <Pierce>50</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Capturable>
     <CapturePoints>500</CapturePoints>
     <RegenRate>10</RegenRate>
     <GarrisonRegenRate>10</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <Population>3</Population>
   </Cost>
   <Decay>
     <DelayTime>0.0</DelayTime>
     <SinkRate>0.0</SinkRate>
     <SinkAccel>2.0</SinkAccel>
   </Decay>
   <Health>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>60</xp>
     <food>0</food>
     <wood>50</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
   <Repairable>
     <RepairTimeRatio>4.0</RepairTimeRatio>
   </Repairable>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/rounded_rectangle.png</MainTexture>
+        <MainTextureMask>128x256/rounded_rectangle_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <order_attack>attack/siege/ram_move.xml</order_attack>
       <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitAI>
     <CanGuard>false</CanGuard>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 23703)
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
     <Resources>
       <food>250</food>
     </Resources>
   </Cost>
   <Heal>
     <Range>12</Range>
     <HP>5</HP>
     <Rate>2000</Rate>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
   </Heal>
   <Health>
     <Max>85</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
     <SelectionGroupName>template_unit_support_healer</SelectionGroupName>
     <Rank>Basic</Rank>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Heal units.</Tooltip>
   </Identity>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>plus/128x128.png</MainTexture>
-        <MainTextureMask>plus/128x128_mask.png</MainTextureMask>
+        <MainTexture>128x128/plus.png</MainTexture>
+        <MainTextureMask>128x128/plus_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml	(revision 23703)
@@ -1,46 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <Damage>
         <Hack>1</Hack>
         <Pierce>5</Pierce>
         <Crush>2</Crush>
       </Damage>
       <MaxRange>1.5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="1.9" depth="3.8"/>
     <Height>2.0</Height>
   </Footprint>
   <Loot>
     <xp>50</xp>
   </Loot>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>
       <order_attack>actor/fauna/animal/cattle_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
       <death>actor/fauna/animal/cattle_death.xml</death>
       <trained>actor/fauna/animal/cattle_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.4</WalkSpeed>
     <RunMultiplier>2.0</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml	(revision 23703)
@@ -1,40 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>4</Hack>
     <Pierce>8</Pierce>
     <Crush>4</Crush>
   </Armour>
   <Attack disable=""/>
   <Cost>
     <Resources>
       <food>200</food>
       <wood>150</wood>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Heal>
     <Range>20</Range>
     <HP>6</HP>
     <Rate>2000</Rate>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
   </Heal>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x128/star.png</MainTexture>
+        <MainTextureMask>128x128/star_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 23703)
@@ -1,78 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="10.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
     <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <wood>10</wood>
     <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <Sound>
     <SoundGroups>
       <order_walk>actor/ship/boat_move.xml</order_walk>
       <order_attack>actor/ship/boat_move.xml</order_attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml	(revision 23703)
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
         <Crush>2.5</Crush>
       </Damage>
       <MaxRange>55.0</MaxRange>
       <MinRange>10.0</MinRange>
       <ElevationBonus>10</ElevationBonus>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>500</wood>
       <metal>300</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="15.0" depth="15.0"/>
     <Height>20.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>500</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
     <GenericName>Siege Tower</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+        <MainTexture>256x256/rounded_rectangle.png</MainTexture>
+        <MainTextureMask>256x256/rounded_rectangle_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
       <order_attack>attack/siege/ram_move.xml</order_attack>
       <order_walk>attack/siege/ram_move.xml</order_walk>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
       <trained>attack/siege/ram_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml	(revision 23703)
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="12.0" depth="28.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Trading Ship</GenericName>
     <SpecificName>Vanijyik Nauka</SpecificName>
     <Icon>units/maur_ship_merchant.png</Icon>
   </Identity>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <VisualActor>
     <Actor>structures/mauryas/merchant_ship.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 23703)
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Cost>
     <Population>0</Population>
   </Cost>
   <Footprint replace="">
     <Square width="1.75" depth="3.5"/>
     <Height>2.25</Height>
   </Footprint>
   <Guard disable=""/>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical Animal</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
   <Minimap>
     <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <ResourceGatherer disable=""/>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
   <UnitAI>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>24.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
   </UnitMotion>
   <Visibility>
     <RetainInFog>true</RetainInFog>
   </Visibility>
   <Vision>
     <Range>0</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 23703)
@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>10</Hack>
     <Pierce>20</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Capture>15</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
-        <MainTexture>star/256x256.png</MainTexture>
-        <MainTextureMask>star/256x256_mask.png</MainTextureMask>
+        <MainTexture>256x256/star.png</MainTexture>
+        <MainTextureMask>256x256/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
   <Vision>
     <Range>88</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml	(revision 23703)
@@ -1,94 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>5</Hack>
     <Pierce>10</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>0</food>
       <wood>50</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <SinkingAnim>true</SinkingAnim>
     <DelayTime>0.0</DelayTime>
     <SinkRate>0.5</SinkRate>
     <SinkAccel>7.0</SinkAccel>
   </Decay>
   <Footprint replace="">
     <Square width="6.0" depth="30.0"/>
     <Height>8.0</Height>
     <MaxSpawnDistance>10</MaxSpawnDistance>
   </Footprint>
   <Health>
     <Unhealable>true</Unhealable>
     <Max>200</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Ship</VisibleClasses>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
   </Identity>
   <Loot>
     <xp>60</xp>
     <food>0</food>
     <wood>50</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>3.0</TurnRate>
   </Position>
   <Repairable>
     <RepairTimeRatio>4.0</RepairTimeRatio>
   </Repairable>
   <ResourceGatherer>
     <MaxDistance>4.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Capacities>
       <food>40</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+        <MainTexture>128x512/ellipse.png</MainTexture>
+        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_warship.xml</trained>
       <select>actor/ship/ship_select_01.xml</select>
       <order_walk>actor/ship/warship_move_01.xml</order_walk>
       <order_attack>actor/ship/warship_move_01.xml</order_attack>
       <order_gather>actor/ship/warship_move_01.xml</order_gather>
       <death>actor/ship/warship_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml	(revision 23703)
@@ -1,91 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>10.0</Pierce>
         <Crush>100.0</Crush>
       </Damage>
       <MaxRange>80.0</MaxRange>
       <MinRange>26.0</MinRange>
       <PrepareTime>6000</PrepareTime>
       <RepeatTime>7000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>37.5</Speed>
         <Spread>4.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
         <ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>
         <ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>
       </Projectile>
       <Splash>
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
         <Damage>
           <Hack>0.0</Hack>
           <Pierce>15.0</Pierce>
           <Crush>35.0</Crush>
         </Damage>
       </Splash>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Ranged>
   </Attack>
   <Capturable>
     <RegenRate>20</RegenRate>
   </Capturable>
   <Cost>
     <BuildTime>25</BuildTime>
     <Resources>
       <wood>400</wood>
       <stone>250</stone>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="6.0" depth="15.0"/>
     <Height>4.5</Height>
   </Footprint>
   <Health>
     <Max>250</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged StoneThrower</VisibleClasses>
     <GenericName>Siege Catapult</GenericName>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>0</food>
     <wood>20</wood>
     <stone>10</stone>
     <metal>0</metal>
   </Loot>
   <Pack>
     <Time>10000</Time>
   </Pack>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>square/256x256.png</MainTexture>
-        <MainTextureMask>square/256x256_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/siegeprojectilehit.xml</attack_impact_ranged>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>standground</DefaultStance>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>120</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml	(revision 23703)
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged_archer">
   <Armour>
     <Hack op="add">1</Hack>
     <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Capture disable=""/>
     <Ranged>
       <Damage>
         <Hack op="mul">1.5</Hack>
         <Pierce op="mul">1.5</Pierce>
         <Crush op="mul">1.5</Crush>
       </Damage>
       <RepeatTime op="mul">0.75</RepeatTime>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <food>200</food>
       <wood>80</wood>
       <metal>20</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Circle radius="3.5"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max op="mul">2</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <VisibleClasses datatype="tokens">-Cavalry Elephant</VisibleClasses>
     <GenericName>Elephant Archer</GenericName>
     <Icon>units/maur_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <SpecificName>Vachii Gaja</SpecificName>
   </Identity>
   <Loot>
     <xp>260</xp>
     <food>25</food>
     <wood>10</wood>
     <stone>0</stone>
     <metal>5</metal>
   </Loot>
   <Promotion>
     <Entity>units/maur_elephant_archer_a</Entity>
   </Promotion>
   <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+        <MainTexture>256x256/ellipse.png</MainTexture>
+        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/mauryas/elephantry_archer_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml	(revision 23702)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_elephant.xml	(revision 23703)
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Armour>
     <Hack>5</Hack>
     <Pierce>8</Pierce>
     <Crush>10</Crush>
   </Armour>
   <Auras datatype="tokens">
     units/elephant_worker
   </Auras>
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>150</food>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="4.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>Worker Elephant</GenericName>
     <SpecificName>Karmākara Gaja</SpecificName>
     <Icon>units/maur_support_elephant.png</Icon>
     <Tooltip>Mobile dropsite for food, wood, stone, and metal.</Tooltip>
     <Formations disable=""/>
   </Identity>
   <Loot>
     <xp>50</xp>
     <food>25</food>
     <wood>10</wood>
     <stone>10</stone>
     <metal>10</metal>
   </Loot>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>false</Sharable>
   </ResourceDropsite>
   <Selectable>
     <Overlay>
       <Texture>
-        <MainTexture>circle/256x256.png</MainTexture>
-        <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
+        <MainTexture>256x256/ellipse.png</MainTexture>
+        <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisualActor>
     <Actor>units/mauryas/support_elephant.xml</Actor>
   </VisualActor>
 </Entity>