diff --git a/gradle.properties b/gradle.properties
index 76d1e9a..1c60d94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 version_major=2
 version_minor=2
-version_rev=0
+version_rev=1
 
 version_forestry=3.4.0.7
 version_bloodmagic=1.3.1-7
diff --git a/src/main/java/magicbees/item/ItemThaumiumGrafter.java b/src/main/java/magicbees/item/ItemThaumiumGrafter.java
index de00783..2aea66f 100644
--- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java
+++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java
@@ -3,11 +3,9 @@ package magicbees.item;
 import java.util.HashSet;
 import java.util.Set;
 
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import magicbees.main.CommonProxy;
 import magicbees.main.Config;
+import magicbees.main.utils.compat.ThaumcraftHelper;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
@@ -19,11 +17,14 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import thaumcraft.api.IRepairableExtended;
 import thaumcraft.api.ThaumcraftApi;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.arboriculture.IToolGrafter;
 
 @Optional.InterfaceList(
 		{
-				@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = CommonProxy.ThaumcraftID, striprefs = true)
+				@Optional.Interface(iface = "thaumcraft.api.IRepairableExtended", modid = ThaumcraftHelper.Name, striprefs = true)
 		}
 )
 public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IToolGrafter
@@ -107,7 +108,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
 	/**
 	 * Return the enchantability factor of the item, most of the time is based on material.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public int getItemEnchantability()
 	{
 		return ThaumcraftApi.toolMatThaumium.getEnchantability();
@@ -116,7 +117,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
 	/**
 	 * Return the name for this tool's material.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public String getToolMaterialName()
 	{
 		return ThaumcraftApi.toolMatThaumium.toString();
@@ -125,7 +126,7 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
 	/**
 	 * Return whether this item is repairable in an anvil.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
 	{
 		return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() || super.getIsRepairable(par1ItemStack, par2ItemStack);
diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java
index 34e5bb6..d5a5faf 100644
--- a/src/main/java/magicbees/item/ItemThaumiumScoop.java
+++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import magicbees.main.CommonProxy;
+import magicbees.main.utils.compat.ThaumcraftHelper;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
@@ -20,7 +21,7 @@ import forestry.api.core.IToolScoop;
 
 @Optional.InterfaceList(
 		{
-				@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = CommonProxy.ThaumcraftID, striprefs = true)
+				@Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true)
 		}
 )
 public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
@@ -71,7 +72,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
 	/**
 	 * Return the enchantability factor of the item, most of the time is based on material.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public int getItemEnchantability()
 	{
 		return ThaumcraftApi.toolMatThaumium.getEnchantability();
@@ -80,7 +81,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
 	/**
 	 * Return the name for this tool's material.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public String getToolMaterialName()
 	{
 		return ThaumcraftApi.toolMatThaumium.toString();
@@ -89,7 +90,7 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
 	/**
 	 * Return whether this item is repairable in an anvil.
 	 */
-	@Optional.Method(modid = CommonProxy.ThaumcraftID)
+	@Optional.Method(modid = ThaumcraftHelper.Name)
 	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack)
 	{
 		return ThaumcraftApi.toolMatThaumium.customCraftingMaterial == par2ItemStack.getItem() || super.getIsRepairable(par1ItemStack, par2ItemStack);
diff --git a/src/main/java/magicbees/main/CommonProxy.java b/src/main/java/magicbees/main/CommonProxy.java
index 95bd6ab..ffb2c86 100644
--- a/src/main/java/magicbees/main/CommonProxy.java
+++ b/src/main/java/magicbees/main/CommonProxy.java
@@ -8,9 +8,6 @@ public class CommonProxy
 	public static final String ITEM_TEXTURE = TEXTURE + "items/";
 	public static final String MODEL = "model/";
 	public static final String LANGS = "lang/";
-
-	public static final String ForestryID = "forestry";
-	public static final String ThaumcraftID = "Thaumcraft";
 	
 	@Deprecated
 	public static final String RESOURCE_PATH = "/assets/magicbees/";