diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs
index 337df2bcbc..739c00d96b 100644
--- a/OpenRa.Game/Chrome.cs
+++ b/OpenRa.Game/Chrome.cs
@@ -1,4 +1,4 @@
-#region Copyright & License Information
+#region Copyright & License Information
 /*
  * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
  * This file is part of OpenRA.
@@ -74,7 +74,6 @@ namespace OpenRa
 		readonly Animation cantBuild;
 		readonly Animation ready;
 		readonly Animation clock;
-		const int NumClockFrames = 54;
 
 		// Radar
 		static float2 radarOpenOrigin = new float2(Game.viewport.Width - 215, 29);
@@ -912,9 +911,8 @@ namespace OpenRa
 				{
 					clock.PlayFetchIndex( "idle", 
 						() => (firstOfThis.TotalTime - firstOfThis.RemainingTime) 
-							* NumClockFrames / firstOfThis.TotalTime);
+							* (clock.CurrentSequence.Length - 1)/ firstOfThis.TotalTime);
 					clock.Tick();
-
 					shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");
 
 					if (firstOfThis.Done)
@@ -1149,7 +1147,7 @@ namespace OpenRa
 
 					clock.PlayFetchIndex("idle",
 						() => (sp.TotalTime - sp.RemainingTime)
-							* NumClockFrames / sp.TotalTime);
+							* (clock.CurrentSequence.Length - 1) / sp.TotalTime);
 					clock.Tick();
 
 					shpRenderer.DrawSprite(clock.Image, drawPos, "chrome");
diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs
index 345566f424..4774abe858 100644
--- a/OpenRa.Game/Graphics/Renderer.cs
+++ b/OpenRa.Game/Graphics/Renderer.cs
@@ -55,10 +55,10 @@ namespace OpenRa.Graphics
 		{
 			device = CreateDevice( Assembly.LoadFile( Path.GetFullPath( "OpenRa.Gl.dll" ) ), resolution.Width, resolution.Height, windowed, false );
 
-			SpriteShader = device.CreateShader(FileSystem.Open("world-shp.fx"));
-			LineShader = device.CreateShader(FileSystem.Open("line.fx"));
-			RgbaSpriteShader = device.CreateShader(FileSystem.Open("chrome-rgba.fx"));
-			WorldSpriteShader = device.CreateShader(FileSystem.Open("chrome-shp.fx"));
+			SpriteShader = device.CreateShader(FileSystem.Open("shaders/world-shp.fx"));
+			LineShader = device.CreateShader(FileSystem.Open("shaders/line.fx"));
+			RgbaSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-rgba.fx"));
+			WorldSpriteShader = device.CreateShader(FileSystem.Open("shaders/chrome-shp.fx"));
 
 			//fDebug = new Font("Tahoma", 10, FontStyle.Regular);
 			//fTitle = new Font("Tahoma", 10, FontStyle.Bold);
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 13dec7bbd9..feebc8e69d 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -2,8 +2,7 @@
 
 Folders:
 	./mods/cnc/
-	./mods/cnc/packages_ra/
-	./shaders
+	./mods/ra/packages/
 	./
 
 Packages:
@@ -19,11 +18,7 @@ Packages:
 # Cannot qualify the RA names because they may live inside a mix
 	~main.mix
 	redalert.mix
-	hires.mix
-	local.mix
 	speech.mix
-	allies.mix
-	russian.mix
 	temperat.mix
 	snow.mix
 	interior.mix
diff --git a/mods/cnc/sequences.xml b/mods/cnc/sequences.xml
index ea3ddc210c..4722751583 100644
--- a/mods/cnc/sequences.xml
+++ b/mods/cnc/sequences.xml
@@ -2,7 +2,7 @@
 <sequences>
   <!-- build clock - hacked in -->
   <unit name="clock">
-    <sequence name="idle" start="0" length="*" />
+    <sequence name="idle" start="0" length="*" src="hclock" />
   </unit>
   <cursor src="mouse">
     <sequence name="default" start="0" />
@@ -65,17 +65,17 @@
     <sequence name="8" start="0" length="22" src="art-exp1" />
   </unit>
   <unit name="pips">
+	<!-- TODO: Pull these out into their own shp in overrides -->
     <sequence name="groups" start="8" length="10" />
-    <sequence name="medic" start="20" length="1" />
-    <sequence name="ready" start="3" length="1" />
-    <sequence name="hold" start="4" length="1" />
-    <sequence name="pip-empty" start="0" length="1" />
-    <sequence name="pip-green" start="1" length="1" />
-    <sequence name="pip-yellow" start="5" length="1" />
-    <sequence name="pip-gray" start="6" length="1" />
-    <sequence name="pip-red" start="7" length="1" />
-    <sequence name="tag-fake" start="18" length="1" />
-    <sequence name="tag-primary" start="2" length="1" />
+
+    <sequence name="ready" start="3" length="1" src="hpips" />
+    <sequence name="hold" start="4" length="1" src="hpips" />
+    <sequence name="pip-empty" start="0" length="1" src="hpips" />
+    <sequence name="pip-green" start="1" length="1" src="hpips" />
+    <sequence name="pip-yellow" start="5" length="1" src="hpips" />
+    <sequence name="pip-gray" start="6" length="1" src="hpips" />
+    <sequence name="pip-red" start="7" length="1" src="hpips" />
+    <sequence name="tag-primary" start="2" length="1" src="hpips" />
   </unit>
   <unit name="flagfly">
     <sequence name="idle" start="0" length="14" />
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index a8e7cd8b1f..f8b9c86132 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -3,7 +3,6 @@
 Folders:
 	./mods/ra/packages
 	./mods/ra
-	./shaders
 	./
 
 Packages: