diff --git a/src/main/java/cr0s/warpdrive/item/ItemTuningFork.java b/src/main/java/cr0s/warpdrive/item/ItemTuningFork.java
index 50bacb69..8c2d23c6 100644
--- a/src/main/java/cr0s/warpdrive/item/ItemTuningFork.java
+++ b/src/main/java/cr0s/warpdrive/item/ItemTuningFork.java
@@ -18,7 +18,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemDye;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumActionResult;
@@ -47,7 +46,7 @@ public class ItemTuningFork extends ItemAbstractBase implements IWarpTool {
 	}
 	
 	@Override
-	public void getSubItems(final Item item, final CreativeTabs creativeTab, List<ItemStack> list) {
+	public void getSubItems(@Nonnull final Item item, final CreativeTabs creativeTab, List<ItemStack> list) {
 		for (int dyeColor = 0; dyeColor < 16; dyeColor++) {
 			list.add(new ItemStack(item, 1, dyeColor));
 		}
@@ -153,11 +152,11 @@ public class ItemTuningFork extends ItemAbstractBase implements IWarpTool {
 		super.addInformation(itemStack, entityPlayer, list, advancedItemTooltips);
 		
 		String tooltip = "";
-		tooltip += new TextComponentTranslation("warpdrive.video_channel.tooltip", getVideoChannel(itemStack));
-		tooltip += "\n" + new TextComponentTranslation("warpdrive.beam_frequency.tooltip", getBeamFrequency(itemStack));
-		tooltip += "\n" + new TextComponentTranslation("warpdrive.control_channel.tooltip", getControlChannel(itemStack));
+		tooltip += new TextComponentTranslation("warpdrive.video_channel.tooltip", getVideoChannel(itemStack)).getFormattedText();
+		tooltip += "\n" + new TextComponentTranslation("warpdrive.beam_frequency.tooltip", getBeamFrequency(itemStack)).getFormattedText();
+		tooltip += "\n" + new TextComponentTranslation("warpdrive.control_channel.tooltip", getControlChannel(itemStack)).getFormattedText();
 		
-		tooltip += "\n\n" + new TextComponentTranslation("item.warpdrive.tool.tuning_fork.tooltip.usage");
+		tooltip += "\n\n" + new TextComponentTranslation("item.warpdrive.tool.tuning_fork.tooltip.usage").getFormattedText();
 		
 		Commons.addTooltip(list, tooltip);
 	}
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-black.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-black.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-black.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-black.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-blue.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-blue.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-blue.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-blue.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-brown.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-brown.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-brown.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-brown.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-cyan.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-cyan.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-cyan.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-cyan.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-gray.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-gray.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-gray.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-gray.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-green.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-green.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-green.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-green.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-lightBlue.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-lightBlue.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-lightBlue.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-lightBlue.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-lime.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-lime.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-lime.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-lime.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-magenta.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-magenta.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-magenta.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-magenta.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-orange.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-orange.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-orange.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-orange.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-pink.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-pink.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-pink.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-pink.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-purple.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-purple.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-purple.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-purple.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-red.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-red.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-red.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-red.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-silver.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-silver.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-silver.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-silver.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-white.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-white.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-white.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-white.json
diff --git a/src/main/resources/assets/warpdrive/models/item/itemTuningRod-yellow.json b/src/main/resources/assets/warpdrive/models/item/itemTuningFork-yellow.json
similarity index 100%
rename from src/main/resources/assets/warpdrive/models/item/itemTuningRod-yellow.json
rename to src/main/resources/assets/warpdrive/models/item/itemTuningFork-yellow.json