diff --git a/gradle.properties b/gradle.properties
index 7cc9576..b2a74a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,7 +45,7 @@ enableModernJavaSyntax = true
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = false
+enableGenericInjection = true
 
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
@@ -56,13 +56,13 @@ generateGradleTokenClass = com.caedis.duradisplay.Tags
 gradleTokenVersion = VERSION
 
 # [DEPRECATED] Mod ID replacement token.
-gradleTokenModId = MODID
+#gradleTokenModId = MODID
 
 # [DEPRECATED] Mod name replacement token.
-gradleTokenModName = MODNAME
+#gradleTokenModName = MODNAME
 
 # [DEPRECATED] Mod Group replacement token.
-gradleTokenGroupName = GROUPNAME
+#gradleTokenGroupName = GROUPNAME
 
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
diff --git a/src/main/java/com/caedis/duradisplay/DuraDisplay.java b/src/main/java/com/caedis/duradisplay/DuraDisplay.java
index 66c913b..98b72c4 100644
--- a/src/main/java/com/caedis/duradisplay/DuraDisplay.java
+++ b/src/main/java/com/caedis/duradisplay/DuraDisplay.java
@@ -13,16 +13,19 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 @Mod(
-    modid = Tags.MODID,
+    modid = DuraDisplay.MODID,
     version = Tags.VERSION,
-    name = Tags.MODNAME,
+    name = DuraDisplay.NAME,
     acceptedMinecraftVersions = "[1.7.10]",
     guiFactory = "com.caedis.duradisplay.config.GuiFactory",
     acceptableRemoteVersions = "*",
-    dependencies = "after:gregtech@[5.09.43.63,);" + " after:EnderIO@[2.4.18,);")
+    dependencies = "after:gregtech;" + " after:EnderIO@[2.4.18,);")
 public class DuraDisplay {
 
-    public static final Logger LOG = LogManager.getLogger(Tags.MODID);
+    public final static String MODID = "duradisplay";
+    public final static String NAME = "DuraDisplay";
+
+    public static final Logger LOG = LogManager.getLogger(MODID);
 
     @SuppressWarnings("unused")
     @Mod.EventHandler
@@ -45,7 +48,7 @@ public void init(FMLInitializationEvent event) {
     @SuppressWarnings("unused")
     @SubscribeEvent
     public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
-        if (event.modID.equals(Tags.MODID)) {
+        if (event.modID.equals(DuraDisplay.MODID)) {
             DuraDisplayConfig.config.save();
             DuraDisplayConfig.reloadConfigObject();
         }
diff --git a/src/main/java/com/caedis/duradisplay/config/GuiConfigDuraDisplay.java b/src/main/java/com/caedis/duradisplay/config/GuiConfigDuraDisplay.java
index 7094826..4f064d6 100644
--- a/src/main/java/com/caedis/duradisplay/config/GuiConfigDuraDisplay.java
+++ b/src/main/java/com/caedis/duradisplay/config/GuiConfigDuraDisplay.java
@@ -7,7 +7,7 @@
 import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.common.config.Configuration;
 
-import com.caedis.duradisplay.Tags;
+import com.caedis.duradisplay.DuraDisplay;
 import com.caedis.duradisplay.overlay.OverlayInfo;
 
 import cpw.mods.fml.client.config.GuiConfig;
@@ -20,7 +20,7 @@ public GuiConfigDuraDisplay(GuiScreen parent) {
         super(
             parent,
             getCategories(),
-            Tags.MODID,
+            DuraDisplay.MODID,
             "general",
             false,
             false,