diff --git a/StevenDimDoors/mod_pocketDim/RailTeleporter.java b/StevenDimDoors/mod_pocketDim/RailTeleporter.java
index 09183cb..cb9d12e 100644
--- a/StevenDimDoors/mod_pocketDim/RailTeleporter.java
+++ b/StevenDimDoors/mod_pocketDim/RailTeleporter.java
@@ -94,7 +94,7 @@ public class RailTeleporter extends Teleporter
 	 	}
 	  
 	    @Override
-	    public void func_85189_a(long par1)
+	    public void removeStalePortalLocations(long par1)
 	    {
 	    
 	    }
diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java
index 3c160ab..5dc459c 100644
--- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java
+++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java
@@ -207,7 +207,7 @@ public class SchematicLoader
 					
 	    			}
 					
-					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID)
+					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
 	    			{
 	    				switch (metadata)
 	    				{
@@ -377,7 +377,7 @@ public class SchematicLoader
 					
 	    			}
 					
-					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID)
+					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
 	    			{
 	    				switch (metadata)
 	    				{
@@ -543,7 +543,7 @@ public class SchematicLoader
 					
 	    			}
 					
-					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorSteel.blockID||blockID==Block.doorWood.blockID)
+					if(blockID== Block.redstoneRepeaterActive.blockID||blockID==Block.redstoneRepeaterIdle.blockID||blockID== Block.tripWireSource.blockID||blockID== Block.doorIron.blockID||blockID==Block.doorWood.blockID)
 	    			{
 	    				switch (metadata)
 	    				{
@@ -707,7 +707,7 @@ public class SchematicLoader
 		                    int size = tileEntity.tagCount();
 		                    
 		                    
-		                    if(blockToReplace==Block.doorSteel.blockID)
+		                    if(blockToReplace==Block.doorIron.blockID)
 		                    {
 		                    	this.sideLinks.add(new Point3D(i+xCooe, j+yCooe, k+zCooe));
 		                    }
@@ -737,7 +737,7 @@ public class SchematicLoader
 		                    	
 		                    	this.transMeta=this.transformMetadata(blockMetaData, link.linkOrientation, blockToReplace);
 
-		                    	if(blockToReplace==Block.doorSteel.blockID)
+		                    	if(blockToReplace==Block.doorIron.blockID)
 				                {
 		                    		setBlockDirectly(world,i+xCooe,j+yCooe,k+zCooe,mod_pocketDim.dimDoorID, transMeta );
 				                }
diff --git a/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java b/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java
index 38a2e3c..34f2ebf 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java
+++ b/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java
@@ -634,12 +634,12 @@ public class dimDoor extends BlockContainer
      */
     public int idPicked(World par1World, int par2, int par3, int par4)
     {
-        return Item.doorSteel.itemID;
+        return Item.doorIron.itemID;
     }
     
     public int idDropped(int par1, Random par2Random, int par3)
     {
-        return (par1 & 8) != 0 ? 0 : (Item.doorSteel.itemID);
+        return (par1 & 8) != 0 ? 0 : (Item.doorIron.itemID);
     }
 
     /**
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemChaosDoor.java b/StevenDimDoors/mod_pocketDim/items/ItemChaosDoor.java
index 5f13ee8..88374a5 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemChaosDoor.java
+++ b/StevenDimDoors/mod_pocketDim/items/ItemChaosDoor.java
@@ -26,7 +26,7 @@ public class ItemChaosDoor extends itemDimDoor
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
     @Override
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
index 27d5ff7..fc545a5 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
+++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
@@ -42,7 +42,7 @@ public class ItemRiftBlade extends itemDimDoor
          this.weaponDamage =8;
       
 
-      //   this.iconIndex=5;
+      //   this.itemIcon=5;
          this.setMaxDamage(500);
          this.hasSubtypes=false;
     	 //TODO move to proxy
@@ -290,7 +290,7 @@ public class ItemRiftBlade extends itemDimDoor
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
     public int getItemEnchantability()
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
index 182e8c5..11adc81 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
+++ b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
@@ -29,7 +29,7 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
     	// this.setTextureFile("/PocketBlockTextures.png");
          this.setCreativeTab(CreativeTabs.tabTransport);
 
-      //   this.iconIndex=5;
+      //   this.itemIndex=5;
          this.setMaxDamage(0);
          this.hasSubtypes=true;
     	 //TODO move to proxy
@@ -55,7 +55,7 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
 
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
index e5a5832..af83f71 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
+++ b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
@@ -26,13 +26,13 @@ public class ItemStableFabric extends Item
     public ItemStableFabric(int par1, int par2)
     {
     	  super(par1);
-        //  this.setIconIndex(Item.doorWood.getIconFromDamage(0));
+        //  this.setitemIcon(Item.doorWood.getIconFromDamage(0));
           this.setCreativeTab(CreativeTabs.tabTransport);
 
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
     public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
diff --git a/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java b/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java
index f1a6570..67e1469 100644
--- a/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java
+++ b/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java
@@ -33,7 +33,7 @@ public class itemDimDoor extends ItemDoor
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
     
diff --git a/StevenDimDoors/mod_pocketDim/items/itemExitDoor.java b/StevenDimDoors/mod_pocketDim/items/itemExitDoor.java
index 651905b..309291d 100644
--- a/StevenDimDoors/mod_pocketDim/items/itemExitDoor.java
+++ b/StevenDimDoors/mod_pocketDim/items/itemExitDoor.java
@@ -24,12 +24,12 @@ public class itemExitDoor extends itemDimDoor
           this.doorMaterial = par2Material;
           this.setCreativeTab(CreativeTabs.tabTransport);
 
-          //  this.setIconIndex(Item.doorWood.getIconFromDamage(0));
+          //  this.setitemIcon(Item.doorWood.getIconFromDamage(0));
     }
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
     
diff --git a/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java b/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java
index d385225..9a3f387 100644
--- a/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java
+++ b/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java
@@ -30,7 +30,7 @@ public class itemLinkSignature extends Item
     	// this.setTextureFile("/PocketBlockTextures.png");
          this.setCreativeTab(CreativeTabs.tabTransport);
 
-      //   this.iconIndex=5;
+      //   this.itemIcon=5;
          this.setMaxDamage(0);
          this.hasSubtypes=true;
     	 //TODO move to proxy
@@ -56,7 +56,7 @@ public class itemLinkSignature extends Item
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
 
diff --git a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
index 3433d20..00e6f5e 100644
--- a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
+++ b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
@@ -30,7 +30,7 @@ public class itemRiftRemover extends Item
     	// this.setTextureFile("/PocketBlockTextures.png");
          this.setCreativeTab(CreativeTabs.tabTransport);
 
-        // this.iconIndex=6;
+        // this.itemIcon=6;
          this.setMaxDamage(5);
          this.hasSubtypes=true;
     	 //TODO move to proxy
@@ -39,7 +39,7 @@ public class itemRiftRemover extends Item
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.iconIndex = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 
     }
    
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 57e448d..5965750 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -409,12 +409,12 @@ public class mod_pocketDim
         {
     	 GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[]
                  {
-                     "   ", "yxy", "   ", 'x', Item.enderPearl,  'y', Item.doorSteel 
+                     "   ", "yxy", "   ", 'x', Item.enderPearl,  'y', Item.doorIron 
                  });
     	 
     	 GameRegistry.addRecipe(new ItemStack(itemDimDoor, 1), new Object[]
                  {
-                     "   ", "yxy", "   ", 'x', this.itemStableFabric,  'y', Item.doorSteel 
+                     "   ", "yxy", "   ", 'x', this.itemStableFabric,  'y', Item.doorIron 
                  });
         }
         
@@ -526,7 +526,7 @@ public class mod_pocketDim
     	 this.blocksImmuneToRift.add(this.chaosDoorID);
     	 this.blocksImmuneToRift.add(this.blockRiftID);
     	 this.blocksImmuneToRift.add(this.transientDoorID);
-    	 this.blocksImmuneToRift.add(Block.blockSteel.blockID);
+    	 this.blocksImmuneToRift.add(Block.blockIron.blockID);
     	 this.blocksImmuneToRift.add(Block.blockDiamond.blockID);
     	 this.blocksImmuneToRift.add(Block.blockEmerald.blockID);
     	 this.blocksImmuneToRift.add(Block.blockGold.blockID);
@@ -625,7 +625,7 @@ public class mod_pocketDim
     		this.metadataFlipList.add(Block.torchWood.blockID);
     		this.metadataFlipList.add(Block.torchRedstoneIdle.blockID);
     		this.metadataFlipList.add(Block.torchRedstoneActive.blockID);
-    		this.metadataFlipList.add(Block.doorSteel.blockID);
+    		this.metadataFlipList.add(Block.doorIron.blockID);
     		this.metadataFlipList.add(Block.doorWood.blockID);
     		this.metadataFlipList.add(Block.pistonBase.blockID);
     		this.metadataFlipList.add(Block.pistonStickyBase.blockID);
diff --git a/StevenDimDoors/mod_pocketDimClient/RiftFX.java b/StevenDimDoors/mod_pocketDimClient/RiftFX.java
index f645ffa..a46d6e0 100644
--- a/StevenDimDoors/mod_pocketDimClient/RiftFX.java
+++ b/StevenDimDoors/mod_pocketDimClient/RiftFX.java
@@ -96,18 +96,19 @@ public class RiftFX extends EntityFX
         float f9 = f8 + 0.0624375F;
         float f10 = 0.1F * this.particleScale;
 
-        if (this.particleTextureIndex != null)
+        if (this.particleIcon != null)
         {
-            f6 = this.particleTextureIndex.getMinU();
-            f7 = this.particleTextureIndex.getMaxU();
-            f8 = this.particleTextureIndex.getMinV();
-            f9 = this.particleTextureIndex.getMaxV();
+            f6 = this.particleIcon.getMinU();
+            f7 = this.particleIcon.getMaxU();
+            f8 = this.particleIcon.getMinV();
+            f9 = this.particleIcon.getMaxV();
         }
 
         float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);
         float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY);
         float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ);
-        float f14 = .0F;
+        float f14 = 0F;
+
         
         try
         {
diff --git a/build.xml b/build.xml
index d4503ea..d632e8c 100644
--- a/build.xml
+++ b/build.xml
@@ -87,11 +87,11 @@
 
 		<!-- Reobf -->
 		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
-			<arg line="/c reobfuscate.bat"/>
+			<arg line="/c reobfuscate_srg.bat"/>
 		</exec>
 
 		<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
-			<arg value="reobfuscate.sh" />
+			<arg value="reobfuscate_srg.sh" />
 		</exec>
 
 		<copy todir="${classes.dir}">
@@ -144,7 +144,7 @@
 
 		<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
-		<chmod file="${mcp.dir}/reobfuscate.sh" perm="+x"/>
+		<chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" />
 		<chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" />
 		<!-- Copy libraries -->