diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java
index 04756a40..c3869194 100644
--- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java
+++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java
@@ -1,11 +1,18 @@
 package com.cricketcraft.chisel.block;
 
+import net.minecraft.block.BlockTorch;
+import net.minecraft.client.renderer.texture.IIconRegister;
+
+import com.cricketcraft.chisel.Chisel;
+import com.cricketcraft.chisel.api.ICarvable;
 import com.cricketcraft.chisel.carving.CarvableHelper;
+import com.cricketcraft.chisel.carving.CarvableVariation;
 import com.cricketcraft.chisel.init.ModTabs;
 
-public class BlockCarvableTorch extends BlockCarvable
+public class BlockCarvableTorch extends BlockTorch implements ICarvable
 {
     public CarvableHelper carverHelper;
+    private String texLocation;
 
     public BlockCarvableTorch()
     {
@@ -15,9 +22,15 @@ public class BlockCarvableTorch extends BlockCarvable
 
         setCreativeTab(ModTabs.tabChiselBlocks);
     }
-    @Override
-    public int getRenderType()
-    {
-        return 2;
+	@Override
+	public CarvableVariation getVariation(int metadata) {
+		return carverHelper.getVariation(metadata);
+	}
+	@Override
+    public void registerBlockIcons(IIconRegister icon){
+        this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/"+ texLocation);
+    }
+	public void setInformation(String textureLocation){
+        this.texLocation = textureLocation;
     }
 }
diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java
index d244797e..fa0544ab 100644
--- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java
+++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java
@@ -85,7 +85,7 @@ public class ModBlocks {
     public static BlockCarvable bone;
     public static BlockCarvable scorching;
     public static BlockCarvable brickCustom;
-    public static BlockCarvableTorch torch;
+    public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16];
 
     // 1.7
     public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
@@ -1516,19 +1516,17 @@ public class ModBlocks {
             brickCustom.carverHelper.register(brickCustom, "brickCustom");
             Carving.chisel.registerOre("brickCustom", "brickCustom");
         }
-        /*if(Configurations.featureEnabled("torch"))
+        if(Configurations.featureEnabled("torch"))
         {
-        	torch = (BlockCarvableTorch) new BlockCarvableTorch().setLightLevel(0.8F);
             Carving.chisel.addVariation("torch", Blocks.torch, 0, 0);
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.1.desc"), 1, "torch/candle");
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.2.desc"), 2, "torch/candle-holder");
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.3.desc"), 3, "torch/lantern");
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.4.desc"), 4, "torch/lantern-letters");
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.5.desc"), 5, "torch/lamp");
-            torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.6.desc"), 6, "torch/lamp-tall");
-            torch.carverHelper.register(torch, "torch");
+            for(int metadata = 0; metadata < 6; metadata++){
+                torch[metadata] = (BlockCarvableTorch) new BlockCarvableTorch().setBlockName("torch").setCreativeTab(ModTabs.tabChiselBlocks);
+                torch[metadata].setInformation("torch" + (metadata + 1));
+                GameRegistry.registerBlock(torch[metadata], "torch" + (metadata + 1));
+                Carving.chisel.addVariation("torch", torch[metadata], 0, (metadata + 1));
+            }
             Carving.chisel.registerOre("torch", "torch");
-        }*/
+        }
 
     }
 }
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/candle.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch1.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/candle.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch1.png
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/candle-holder.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch2.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/candle-holder.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch2.png
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lantern.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch3.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/lantern.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch3.png
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lantern-letters.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch4.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/lantern-letters.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch4.png
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lamp.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch5.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/lamp.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch5.png
diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lamp-tall.png b/src/main/resources/assets/chisel/textures/blocks/torch/torch6.png
similarity index 100%
rename from src/main/resources/assets/chisel/textures/blocks/torch/lamp-tall.png
rename to src/main/resources/assets/chisel/textures/blocks/torch/torch6.png