diff --git a/block/crafting/BlockCraftingUnit.java b/block/crafting/BlockCraftingUnit.java
index cf8d70441..8a387487e 100644
--- a/block/crafting/BlockCraftingUnit.java
+++ b/block/crafting/BlockCraftingUnit.java
@@ -30,7 +30,7 @@ public class BlockCraftingUnit extends AEBaseBlock
 	public BlockCraftingUnit(Class<? extends BlockCraftingUnit> childClass) {
 		super( childClass, Material.iron );
 		hasSubtypes = true;
-		setfeature( EnumSet.of( AEFeature.Crafting ) );
+		setfeature( EnumSet.of( AEFeature.CraftingCPU ) );
 	}
 
 	public BlockCraftingUnit() {
diff --git a/block/crafting/BlockMolecularAssembler.java b/block/crafting/BlockMolecularAssembler.java
index 83b811416..4c9b69e51 100644
--- a/block/crafting/BlockMolecularAssembler.java
+++ b/block/crafting/BlockMolecularAssembler.java
@@ -21,7 +21,7 @@ public class BlockMolecularAssembler extends AEBaseBlock
 
 	public BlockMolecularAssembler() {
 		super( BlockMolecularAssembler.class, Material.iron );
-		setfeature( EnumSet.of( AEFeature.Crafting ) );
+		setfeature( EnumSet.of( AEFeature.MolecularAssembler ) );
 		setTileEntiy( TileMolecularAssembler.class );
 		isOpaque = false;
 		lightOpacity = 1;
diff --git a/block/misc/BlockSkyCompass.java b/block/misc/BlockSkyCompass.java
index 76a117195..74622cc7a 100644
--- a/block/misc/BlockSkyCompass.java
+++ b/block/misc/BlockSkyCompass.java
@@ -27,7 +27,7 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
 
 	public BlockSkyCompass() {
 		super( BlockSkyCompass.class, Material.iron );
-		setfeature( EnumSet.of( AEFeature.Core ) );
+		setfeature( EnumSet.of( AEFeature.MeteoriteCompass ) );
 		setTileEntiy( TileSkyCompass.class );
 		isOpaque = isFullSize = false;
 		lightOpacity = 0;
diff --git a/core/features/AEFeature.java b/core/features/AEFeature.java
index 8fb05e839..0af965673 100644
--- a/core/features/AEFeature.java
+++ b/core/features/AEFeature.java
@@ -26,7 +26,7 @@ public enum AEFeature
 
 	ChargedStaff("Tools"), EntropyManipulator("Tools"), MatterCannon("Tools"), WirelessAccessTerminal("Tools"), ColorApplicator("Tools"),
 
-	Crafting("NetworkFeatures"), PowerGen("NetworkFeatures"), Security("NetworkFeatures"),
+	CraftingCPU("CraftingFeatures"), PowerGen("NetworkFeatures"), Security("NetworkFeatures"),
 
 	// Crafting("NetworkFeatures"), MolecularAssembler("NetworkFeatures"),
 
@@ -54,7 +54,7 @@ public enum AEFeature
 
 	AlphaPass("Rendering"), PaintBalls("Tools"), PacketLogging("Misc", false), CraftingLog("Misc", false), InterfaceTerminal("Crafting"), LightDetector("Misc"),
 
-	enableDisassemblyCrafting("Crafting");
+	enableDisassemblyCrafting("Crafting"), MolecularAssembler("CraftingFeatures"), MeteoriteCompass("Tools"), Patterns("CraftingFeatures");
 
 	String Category;
 	boolean visible = true;
diff --git a/items/misc/ItemEncodedPattern.java b/items/misc/ItemEncodedPattern.java
index 5c3b73755..f1a29a632 100644
--- a/items/misc/ItemEncodedPattern.java
+++ b/items/misc/ItemEncodedPattern.java
@@ -26,7 +26,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 
 	public ItemEncodedPattern() {
 		super( ItemEncodedPattern.class );
-		setfeature( EnumSet.of( AEFeature.Crafting ) );
+		setfeature( EnumSet.of( AEFeature.Patterns ) );
 		setMaxStackSize( 1 );
 		if ( Platform.isClient() )
 			MinecraftForgeClient.registerItemRenderer( this, new ItemEncodedPatternRenderer() );
diff --git a/items/tools/powered/ToolColorApplicator.java b/items/tools/powered/ToolColorApplicator.java
index b6094f2f5..104ba2965 100644
--- a/items/tools/powered/ToolColorApplicator.java
+++ b/items/tools/powered/ToolColorApplicator.java
@@ -74,7 +74,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 
 	public ToolColorApplicator() {
 		super( ToolColorApplicator.class, null );
-		setfeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.StorageCells, AEFeature.PoweredTools ) );
+		setfeature( EnumSet.of( AEFeature.ColorApplicator, AEFeature.PoweredTools ) );
 		maxStoredPower = AEConfig.instance.colorapplicator_battery;
 		if ( Platform.isClient() )
 			MinecraftForgeClient.registerItemRenderer( this, new ToolColorApplicatorRender() );