diff --git a/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs b/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
index ccbe67b77f..3b9579fd7a 100644
--- a/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
@@ -19,26 +19,56 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Traits
 {
-	class RenderShroudCircleInfo : TraitInfo<RenderShroudCircle>, IPlaceBuildingDecorationInfo
+	class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecorationInfo
 	{
+		[Desc("Color of the circle.")]
+		public readonly Color Color = Color.FromArgb(128, Color.Cyan);
+
+		[Desc("Contrast color of the circle.")]
+		public readonly Color ContrastColor = Color.FromArgb(96, Color.Black);
+
 		public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
 		{
-			var localRange = new RangeCircleRenderable(
-				centerPosition,
-				ai.TraitInfo<CreatesShroudInfo>().Range,
-				0,
-				Color.FromArgb(128, Color.Cyan),
-				Color.FromArgb(96, Color.Black));
+			var localRange = ai.TraitInfos<CreatesShroudInfo>()
+				.Where(csi => csi.EnabledByDefault)
+				.Select(csi => csi.Range)
+				.DefaultIfEmpty(WDist.Zero)
+				.Max();
 
-			var otherRanges = w.ActorsWithTrait<RenderShroudCircle>()
+			var localRangeRenderable = new RangeCircleRenderable(
+				centerPosition,
+				localRange,
+				0,
+				Color,
+				ContrastColor);
+
+			var otherRangeRenderables = w.ActorsWithTrait<RenderShroudCircle>()
 				.SelectMany(a => a.Trait.RangeCircleRenderables(a.Actor, wr));
 
-			return otherRanges.Append(localRange);
+			return otherRangeRenderables.Append(localRangeRenderable);
 		}
+
+		public object Create(ActorInitializer init) { return new RenderShroudCircle(init.Self, this); }
 	}
 
-	class RenderShroudCircle : IRenderAboveShroudWhenSelected
+	class RenderShroudCircle : INotifyCreated, IRenderAboveShroudWhenSelected
 	{
+		readonly RenderShroudCircleInfo info;
+		WDist range;
+
+		public RenderShroudCircle(Actor self, RenderShroudCircleInfo info)
+		{
+			this.info = info;
+		}
+
+		void INotifyCreated.Created(Actor self)
+		{
+			range = self.TraitsImplementing<CreatesShroud>()
+				.Select(cs => cs.Info.Range)
+				.DefaultIfEmpty(WDist.Zero)
+				.Max();
+		}
+
 		public IEnumerable<IRenderable> RangeCircleRenderables(Actor self, WorldRenderer wr)
 		{
 			if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
@@ -46,10 +76,10 @@ namespace OpenRA.Mods.Cnc.Traits
 
 			yield return new RangeCircleRenderable(
 				self.CenterPosition,
-				self.Info.TraitInfo<CreatesShroudInfo>().Range,
+				range,
 				0,
-				Color.FromArgb(128, Color.Cyan),
-				Color.FromArgb(96, Color.Black));
+				info.Color,
+				info.ContrastColor);
 		}
 
 		IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)