diff --git a/OpenRA.FileFormats/FieldLoader.cs b/OpenRA.FileFormats/FieldLoader.cs
index 5e250651d6..d09b2c517f 100644
--- a/OpenRA.FileFormats/FieldLoader.cs
+++ b/OpenRA.FileFormats/FieldLoader.cs
@@ -55,7 +55,6 @@ namespace OpenRA.FileFormats
 				FieldLoader.LoadField(self,field,my[field].Value);
 			}
 		}
-		
 
 		public static void LoadField( object self, string key, string value )
 		{
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 4f7cdb18ce..bb172e0721 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -223,7 +223,6 @@
     <Compile Include="Traits\Helicopter.cs" />
     <Compile Include="Traits\Modifiers\InvisibleToOthers.cs" />
     <Compile Include="Traits\ConstructionYard.cs" />
-    <Compile Include="Traits\World\LightPaletteRotator.cs" />
     <Compile Include="Traits\LimitedAmmo.cs" />
     <Compile Include="Traits\World\PaletteFromFile.cs" />
     <Compile Include="Traits\World\PaletteFromRGBA.cs" />
@@ -266,7 +265,6 @@
     <Compile Include="Traits\Unit.cs" />
     <Compile Include="Traits\World\SpawnMapActors.cs" />
     <Compile Include="Traits\World\UnitInfluence.cs" />
-    <Compile Include="Traits\World\WaterPaletteRotation.cs" />
     <Compile Include="Traits\Modifiers\WithShadow.cs" />
     <Compile Include="Network\UnitOrders.cs" />
     <Compile Include="Traits\Util.cs" />
diff --git a/OpenRA.Game/Traits/World/LightPaletteRotator.cs b/OpenRA.Mods.RA/LightPaletteRotator.cs
similarity index 90%
rename from OpenRA.Game/Traits/World/LightPaletteRotator.cs
rename to OpenRA.Mods.RA/LightPaletteRotator.cs
index de956920c7..b7c22f94b1 100644
--- a/OpenRA.Game/Traits/World/LightPaletteRotator.cs
+++ b/OpenRA.Mods.RA/LightPaletteRotator.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class LightPaletteRotatorInfo : TraitInfo<LightPaletteRotator> { }
 	class LightPaletteRotator : ITick, IPaletteModifier
@@ -38,7 +39,7 @@ namespace OpenRA.Traits
 				rotate = 18 - rotate;
 			
 			using (var bitmapCopy = new Bitmap(b))
-				for (int j = 0; j < 16; j++)
+				for (int j = 0; j < b.Height; j++)
 					b.SetPixel(0x67, j, b.GetPixel(230+rotate, j));
 		}
 	}
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 30cc2f2641..62c609239a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -74,6 +74,7 @@
     <Compile Include="HasUnitOnBuild.cs" />
     <Compile Include="Husk.cs" />
     <Compile Include="LeavesHusk.cs" />
+    <Compile Include="LightPaletteRotator.cs" />
     <Compile Include="OreRefinery.cs" />
     <Compile Include="ChronoshiftPaletteEffect.cs" />
     <Compile Include="ChronoshiftPower.cs" />
@@ -111,6 +112,7 @@
     <Compile Include="ThrowsParticles.cs" />
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="DefaultShellmapScript.cs" />
+    <Compile Include="WaterPaletteRotation.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Game/Traits/World/WaterPaletteRotation.cs b/OpenRA.Mods.RA/WaterPaletteRotation.cs
similarity index 90%
rename from OpenRA.Game/Traits/World/WaterPaletteRotation.cs
rename to OpenRA.Mods.RA/WaterPaletteRotation.cs
index fc29c84596..4953e4f66c 100644
--- a/OpenRA.Game/Traits/World/WaterPaletteRotation.cs
+++ b/OpenRA.Mods.RA/WaterPaletteRotation.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class WaterPaletteRotationInfo : TraitInfo<WaterPaletteRotation> { }
 
@@ -36,7 +37,7 @@ namespace OpenRA.Traits
 		{
 			var rotate = (int)t % 7;
 			using (var bitmapCopy = new Bitmap(b))
-				for (int j = 0; j < 16; j++)
+				for (int j = 0; j < b.Height; j++)
 					for (int i = 0; i < 7; i++)
 						b.SetPixel(0x60 + (rotate + i) % 7, j, bitmapCopy.GetPixel(0x60 + i, j));
 		}