diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index 3be2eef74b..a2c506dd81 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -37,26 +37,11 @@ namespace OpenRA.Graphics
 		{
 			Game.Renderer.LineRenderer.DrawLine(start,end,startColor,endColor);
 		}
-		
-		public int GetPaletteIndex(string name)
-		{
-			return palette.GetPaletteIndex(name);
-		}
 
-		public Palette GetPalette(string name)
-		{
-			return palette.GetPalette(name);
-		}
-		
-		public void AddPalette(string name, Palette pal)
-		{
-			palette.AddPalette(name, pal);
-		}
-		
-		public void UpdatePalette(string name, Palette pal)
-		{
-			palette.UpdatePalette(name, pal);
-		}
+		public int GetPaletteIndex(string name) { return palette.GetPaletteIndex(name); }
+		public Palette GetPalette(string name) { return palette.GetPalette(name); }
+		public void AddPalette(string name, Palette pal) { palette.AddPalette(name, pal); }
+		public void UpdatePalette(string name, Palette pal) { palette.UpdatePalette(name, pal); }
 		
 		void DrawSpriteList(IEnumerable<Renderable> images)
 		{
@@ -369,7 +354,7 @@ namespace OpenRA.Graphics
 			var prev = location + Game.CellSize * range * float2.FromAngle(0);
 			for (var i = 1; i <= 32; i++)
 			{
-				var pos = location + Game.CellSize * range * float2.FromAngle((float)(Math.PI * i) / 8);
+				var pos = location + Game.CellSize * range * float2.FromAngle((float)(Math.PI * i) / 16);
 				Game.Renderer.LineRenderer.DrawLine(prev, pos, c, c);
 				prev = pos;
 			}
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 4540344119..41486cd242 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -81,7 +81,6 @@
     <Compile Include="Orders\GenericSelectTarget.cs" />
     <Compile Include="Server\ProtocolVersion.cs" />
     <Compile Include="Traits\BaseBuilding.cs" />
-    <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index 4c8e0027cc..92cb9b33b4 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -41,15 +41,8 @@ namespace OpenRA.Orders
 			{
 				world.WorldRenderer.DrawSelectionBox(a, Color.White, true);
 				if (a.Owner == world.LocalPlayer)
-				{
-					//if (a.traits.Contains<RenderRangeCircle>())
-					//    world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.Yellow),
-					//        a.CenterLocation, (int)a.GetPrimaryWeapon().Range);
-
-					if (a.traits.Contains<DetectCloaked>())
-						world.WorldRenderer.DrawRangeCircle(Color.FromArgb(128, Color.LimeGreen),
-							a.CenterLocation, a.Info.Traits.Get<DetectCloakedInfo>().Range);
-				}
+					foreach (var t in a.traits.WithInterface<IRenderSelection>())
+						t.Render(a);
 			}
 		}
 
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index b70f1847f0..a74a24228a 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -166,6 +166,8 @@ namespace OpenRA.Traits
 	public interface IVictoryConditions { }
 	public interface IBlocksBullets { }
 
+	public interface IRenderSelection { void Render(Actor self); }
+
 	public struct Target		// a target: either an actor, or a fixed location.
 	{
 		Actor actor;
diff --git a/OpenRA.Game/Traits/DetectCloaked.cs b/OpenRA.Mods.RA/DetectCloaked.cs
similarity index 86%
rename from OpenRA.Game/Traits/DetectCloaked.cs
rename to OpenRA.Mods.RA/DetectCloaked.cs
index 6d4576f54a..96f2af8ddb 100644
--- a/OpenRA.Game/Traits/DetectCloaked.cs
+++ b/OpenRA.Mods.RA/DetectCloaked.cs
@@ -9,8 +9,9 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class DetectCloakedInfo : TraitInfo<DetectCloaked>
 	{
@@ -22,7 +23,8 @@ namespace OpenRA.Traits
 
 	class DetectCloaked : ITick
 	{
-		[Sync] int ticks;
+		[Sync]
+		int ticks;
 
 		public void Tick(Actor self)
 		{
@@ -42,7 +44,4 @@ namespace OpenRA.Traits
 			}
 		}
 	}
-
-	class RenderRangeCircleInfo : TraitInfo<RenderRangeCircle> { }
-	class RenderRangeCircle { }
 }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index ca630ade20..c7c44ad9f4 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -80,6 +80,7 @@
     <Compile Include="AttackBase.cs" />
     <Compile Include="Combat.cs" />
     <Compile Include="ConstructionYard.cs" />
+    <Compile Include="DetectCloaked.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Explosion.cs" />
     <Compile Include="Effects\GravityBomb.cs" />
@@ -91,6 +92,8 @@
     <Compile Include="LimitedAmmo.cs" />
     <Compile Include="Player\ActorGroupProxy.cs" />
     <Compile Include="Aircraft.cs" />
+    <Compile Include="RenderDetectionCircle.cs" />
+    <Compile Include="RenderRangeCircle.cs" />
     <Compile Include="Render\RenderBuilding.cs" />
     <Compile Include="Render\RenderBuildingTurreted.cs" />
     <Compile Include="Render\RenderUnit.cs" />
@@ -232,6 +235,9 @@
       <Name>OpenRA.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Chrome\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -246,8 +252,4 @@ copy "$(TargetPath)" "$(SolutionDir)mods/ra/"
 cd "$(SolutionDir)"
 ralint ra</PostBuildEvent>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="Widgets\" />
-    <Folder Include="Widgets\Delegates\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/RenderDetectionCircle.cs b/OpenRA.Mods.RA/RenderDetectionCircle.cs
new file mode 100644
index 0000000000..7f42eac1c1
--- /dev/null
+++ b/OpenRA.Mods.RA/RenderDetectionCircle.cs
@@ -0,0 +1,26 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class RenderDetectionCircleInfo : TraitInfo<RenderDetectionCircle> { }
+	class RenderDetectionCircle : IRenderSelection
+	{
+		public void Render(Actor self)
+		{
+			self.World.WorldRenderer.DrawRangeCircle(
+				Color.FromArgb(128, Color.LimeGreen),
+				self.CenterLocation, self.Info.Traits.Get<DetectCloakedInfo>().Range);
+		}
+	}
+}
diff --git a/OpenRA.Mods.RA/RenderRangeCircle.cs b/OpenRA.Mods.RA/RenderRangeCircle.cs
new file mode 100644
index 0000000000..3c17c652d0
--- /dev/null
+++ b/OpenRA.Mods.RA/RenderRangeCircle.cs
@@ -0,0 +1,26 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
+{
+	class RenderRangeCircleInfo : TraitInfo<RenderRangeCircle> { }
+	class RenderRangeCircle : IRenderSelection
+	{
+		public void Render(Actor self)
+		{
+			self.World.WorldRenderer.DrawRangeCircle(
+				Color.FromArgb(128, Color.Yellow),
+				self.CenterLocation, (int)self.GetPrimaryWeapon().Range);
+		}
+	}
+}