diff --git a/src/main/java/team/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java
index 76872b1b..9c66ad9d 100644
--- a/src/main/java/team/chisel/proxy/ClientProxy.java
+++ b/src/main/java/team/chisel/proxy/ClientProxy.java
@@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
+import team.chisel.Features;
 import team.chisel.block.BlockCarvableBeacon;
 import team.chisel.block.tileentity.TileEntityAutoChisel;
 import team.chisel.block.tileentity.TileEntityCarvableBeacon;
@@ -51,30 +52,46 @@ public class ClientProxy extends CommonProxy {
 		RenderingRegistry.registerBlockHandler(new RendererEldritch());
 		RenderingRegistry.registerBlockHandler(new RendererLayeredGlow());
 		RenderingRegistry.registerBlockHandler(new RendererSimpleLayered());
-
 		RenderingRegistry.registerBlockHandler(new RendererMultiLayer());
 
-		RenderAutoChisel rac = new RenderAutoChisel();
-		RenderingRegistry.registerBlockHandler(rac);
-		MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac);
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac);
+		if (Features.AUTO_CHISEL.enabled()) {
+			RenderAutoChisel rac = new RenderAutoChisel();
+			RenderingRegistry.registerBlockHandler(rac);
+			MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac);
+			ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac);
+		}
 
-		RenderCarvableBeacon rcb = new RenderCarvableBeacon();
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCarvableBeacon.class, rcb);
-		RenderingRegistry.registerBlockHandler(rcb);
-		BlockCarvableBeacon.renderId = rcb.getRenderId();
+		if (Features.BEACON.enabled()) {
+			RenderCarvableBeacon rcb = new RenderCarvableBeacon();
+			ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCarvableBeacon.class, rcb);
+			RenderingRegistry.registerBlockHandler(rcb);
+			BlockCarvableBeacon.renderId = rcb.getRenderId();
+		}
 
-		RenderPresent rp = new RenderPresent();
-		MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present), rp);
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, rp);
+		if (Features.PRESENT.enabled()) {
+			RenderPresent rp = new RenderPresent();
+			MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present), rp);
+			ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, rp);
+		}
 
-		RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.cloudinabottle));
-		RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss));
-		RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock));
-		RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman());
+		if (Features.CLOUD.enabled()) {
+			RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.cloudinabottle));
+		}
+		if (Features.BALL_OF_MOSS.enabled()) {
+			RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss));
+		}
+		if (Features.SMASHING_ROCK.enabled()) {
+			RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock));
+		}
+		if (Features.PUMPKIN.enabled()) {
+			RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman());
+		}
+
+		if (Features.CHISEL.enabled()) {
+			MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer);
+			MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer);
+		}
 
-		MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer);
-		MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer);
 //		MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.antiBlock), new SubmapManagerAntiblock.AntiblockItemRenderer());
 	}