diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index 3b3c6716eb..8a7ab9ed7e 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -63,6 +63,7 @@ namespace OpenRa.Game
 			controller = new Controller();
 			worldRenderer = new WorldRenderer( renderer );
 
+			SequenceProvider.Initialize(useAftermath);
 			viewport = new Viewport( clientSize, Rules.Map.Offset, Rules.Map.Offset + Rules.Map.Size, renderer );
 
 			world = new World();
diff --git a/OpenRa.Game/Graphics/SequenceProvider.cs b/OpenRa.Game/Graphics/SequenceProvider.cs
index 881c7477a5..e26cecac44 100644
--- a/OpenRa.Game/Graphics/SequenceProvider.cs
+++ b/OpenRa.Game/Graphics/SequenceProvider.cs
@@ -12,10 +12,17 @@ namespace OpenRa.Game.Graphics
 
 		static Dictionary<string, CursorSequence> cursors = new Dictionary<string, CursorSequence>();
 
-		static SequenceProvider()
+		public static void Initialize( bool useAftermath )
+		{
+			LoadSequenceSource("sequences.xml");
+			if (useAftermath)
+				LoadSequenceSource("sequences-aftermath.xml");
+		}
+
+		static void LoadSequenceSource(string filename)
 		{
 			XmlDocument document = new XmlDocument();
-			document.Load(FileSystem.Open("sequences.xml"));
+			document.Load(FileSystem.Open(filename));
 
 			foreach (XmlElement eUnit in document.SelectNodes("/sequences/unit"))
 				LoadSequencesForUnit(eUnit);
diff --git a/OpenRa.Game/Traits/Activities/DeliverOre.cs b/OpenRa.Game/Traits/Activities/DeliverOre.cs
index 89e3e7db4a..c81d6ee416 100644
--- a/OpenRa.Game/Traits/Activities/DeliverOre.cs
+++ b/OpenRa.Game/Traits/Activities/DeliverOre.cs
@@ -45,8 +45,8 @@ namespace OpenRa.Game.Traits.Activities
 					umt = mobile.GetMovementType(),
 					checkForBlocked = false,
 				};
-				var refineries = Game.world.Actors.Where( x => x.unitInfo != null 
-					&& x.unitInfo.Name == "proc" && x.Owner == self.Owner ).ToList();
+				var refineries = Game.world.Actors.Where( x => x.traits.Contains<AcceptsOre>() 
+					&& x.Owner == self.Owner ).ToList();
 				if( refinery != null )
 					search.AddInitialCell( refinery.Location + refineryDeliverOffset );
 				else
diff --git a/sequences-aftermath.xml b/sequences-aftermath.xml
new file mode 100644
index 0000000000..3ac918ed03
--- /dev/null
+++ b/sequences-aftermath.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sequences>
+	<!-- aftermath units -->
+  <unit name="qtnk">
+    <sequence name="idle" start="0" length="32" />
+  </unit>
+  <unit name="ctnk">
+    <sequence name="idle" start="0" length="32" />
+  </unit>
+  <unit name="dtrk">
+    <sequence name="idle" start="0" length="32" />
+  </unit>
+  <unit name="msub">
+    <sequence name="idle" start="0" length="16" />
+  </unit>
+  <unit name="ttnk">
+    <sequence name="idle" start="0" length="32" />
+    <sequence name="spinner" start="32" length="32" />
+  </unit>
+</sequences>
diff --git a/sequences.xml b/sequences.xml
index ee90cf9a03..b4822c05c7 100644
--- a/sequences.xml
+++ b/sequences.xml
@@ -520,20 +520,4 @@
     <sequence name="loop" start="49" length="42" />
     <sequence name="end" start="0" length="26" />
   </unit>
-  <unit name="qtnk">
-    <sequence name="idle" start="0" length="32" />
-  </unit>
-  <unit name="ctnk">
-    <sequence name="idle" start="0" length="32" />
-  </unit>
-  <unit name="dtrk">
-    <sequence name="idle" start="0" length="32" />
-  </unit>
-  <unit name="msub">
-    <sequence name="idle" start="0" length="16" />
-  </unit>
-  <unit name="ttnk">
-    <sequence name="idle" start="0" length="32" />
-    <sequence name="spinner" start="32" length="32" />
-  </unit>
 </sequences>