diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java
index 177e3960..2f6e8e63 100644
--- a/src/main/java/electroblob/wizardry/Wizardry.java
+++ b/src/main/java/electroblob/wizardry/Wizardry.java
@@ -56,21 +56,7 @@ public class Wizardry {
 
 	// IDEA: Improve the algorithm that finds a place to summon creatures to take walls into account.
 	// IDEA: Replace all uses of Math.cos and Math.sin with MathHelper versions
-	// IDEA: API feature that automatically injects custom wand upgrades into wizardry's loot tables
-	// IDEA: Support for the @e selector in the /cast command (the methods already exist, just plug them in)
-	// IDEA: Dispensers shooting spells from scrolls! Imagine the possibilities!
-	// == Rendering overhaul! ==
-	// IDEA: Make spirit animals fade away when dispelled
-	// IDEA: Use your newfound knowledge of OpenGL to render animated boxes around entities being buffed, similar to
-	// creeper charge
-	// IDEA: Redo RenderArc so it looks like lightning (it's literally a load of translucent boxes inside each other)
-	// IDEA: The arcane workbench could use a few particles
-	// IDEA: Add a box to the wizard armour model so that the robes bend when the wearer is sneaking
-	// IDEA: Flash particle (I think it exists in vanilla somewhere) on spell impact
-	// IDEA: Dust particles spray out from projectiles as they move
-	// IDEA: Colour fading for particles
-	// IDEA: Make lightning and other effects particles. There's no reason why you can't pass in a player argument and
-	// have the particles move with them!
+	// IDEA: Triggering of inbuilt Forge events in relevant places?
 
 	/* Minor bugs that need fixing at some point:
 	 * - Player skin hat layer shows through wizard hats - Wizard armour breaks rather than just running out of mana (I
@@ -84,14 +70,10 @@ public class Wizardry {
 	// I can make the healing spells use damage multipliers - hurrah!
 
 	// TODO: Switch from IInventory to IItemHandler (Or don't. It's only useful for automation really.)
-	// TODO: Triggering of inbuilt Forge events in relevant places?
 	// TODO: Rearrange the config gui and file
 
 	// Updating:
 	// TODO: Make sure all obf reflection names are still correct
-	// ItemStacks can no longer be null, only empty, so:
-	// TODO: Replace all instances of stack = null with stack = ItemStack.EMPTY
-	// TODO: For each check, either replace with stack.isEmpty or simply remove it, depending on the use
 	// TODO: Go through each of the summoned creatures and check there are no extra vanilla methods to override
 	// TODO: Check whether Minecraft has added some methods that do the same job as my utilities, particularly in
 	// relation to itemstacks, hotbar, armour slots and inventory slots.
@@ -152,7 +134,7 @@ public class Wizardry {
 
 		WizardryRegistry.registerTileEntities();
 
-		WizardryRegistry.registerEntities(this);
+		WizardryRegistry.registerEntities();
 		// The check for the generateLoot setting is now done within this method.
 		WizardryRegistry.registerLoot();
 
diff --git a/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java b/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
index cd55ad06..62c45ac1 100644
--- a/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
+++ b/src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java
@@ -85,7 +85,7 @@ import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
 public interface ISummonedCreature extends IEntityAdditionalSpawnData {
 
 	// Remember that ALL fields are static and final in interfaces, even if they don't explicitly state that.
-	String NAMEPLATE_TRANSLATION_KEY = "entity.wizardry.summonedcreature.nameplate";
+	String NAMEPLATE_TRANSLATION_KEY = "entity.wizardry:summonedcreature.nameplate";
 
 	// Setters and getters. The subclass fields that these access should be private.
 
diff --git a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java
index a3586556..733df31c 100644
--- a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java
+++ b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java
@@ -68,6 +68,7 @@ import electroblob.wizardry.tileentity.TileEntityPlayerSave;
 import electroblob.wizardry.tileentity.TileEntityStatue;
 import electroblob.wizardry.tileentity.TileEntityTimer;
 import electroblob.wizardry.util.WizardryUtilities;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Biomes;
 import net.minecraft.init.Blocks;
@@ -152,72 +153,66 @@ public final class WizardryRegistry {
 	private static final int PROJECTILE_UPDATE_INTERVAL = 10;
 
 	/** Called from the preInit method in the main mod class to register all the entities. */
-	public static void registerEntities(Wizardry wizardry){
-
-		ResourceLocation wizardID = new ResourceLocation(Wizardry.MODID, "wizard");
-		ResourceLocation evilWizardID = new ResourceLocation(Wizardry.MODID, "evil_wizard");
+	public static void registerEntities(){
 
 		int id = 0; // Incrementable index for the mod specific entity id.
 
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "zombie_minion"), EntityZombieMinion.class, "zombie_minion", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "magic_missile"), EntityMagicMissile.class, "magic_missile", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityZombieMinion.class, "zombie_minion", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityMagicMissile.class, "magic_missile", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
 		// TODO: This should be a particle
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "arc"), EntityArc.class, "arc", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "skeleton_minion"), EntitySkeletonMinion.class, "skeleton_minion", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "spark_bomb"), EntitySparkBomb.class, "spark_bomb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "spirit_wolf"), EntitySpiritWolf.class, "spirit_wolf", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_shard"), EntityIceShard.class, "ice_shard", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "blaze_minion"), EntityBlazeMinion.class, "blaze_minion", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_wraith"), EntityIceWraith.class, "ice_wraith", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_wraith"), EntityLightningWraith.class, "lightning_wraith", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "black_hole"), EntityBlackHole.class, "black_hole", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "shield"), EntityShield.class, "shield", id++, wizardry, 128, 1, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "meteor"), EntityMeteor.class, "meteor", id++, wizardry, 128, 5, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "blizzard"), EntityBlizzard.class, "blizzard", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(wizardID, EntityWizard.class, "wizard", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "bubble"), EntityBubble.class, "bubble", id++, wizardry, 128, 3, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "tornado"), EntityTornado.class, "tornado", id++, wizardry, 128, 1, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_hammer"), EntityHammer.class, "lightning_hammer", id++, wizardry, 128, 1, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "firebomb"), EntityFirebomb.class, "firebomb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "force_orb"), EntityForceOrb.class, "force_orb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "arrow_rain"), EntityArrowRain.class, "arrow_rain", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "spark"), EntitySpark.class, "spark", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "shadow_wraith"), EntityShadowWraith.class, "shadow_wraith", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "darkness_orb"), EntityDarknessOrb.class, "darkness_orb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "spider_minion"), EntitySpiderMinion.class, "spider_minion", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "healing_aura"), EntityHealAura.class, "healing_aura", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "fire_sigil"), EntityFireSigil.class, "fire_sigil", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "frost_sigil"), EntityFrostSigil.class, "frost_sigil", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_sigil"), EntityLightningSigil.class, "lightning_sigil", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_arrow"), EntityLightningArrow.class, "lightning_arrow", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "firebolt"), EntityFirebolt.class, "firebolt", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "poison_bomb"), EntityPoisonBomb.class, "poison_bomb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_charge"), EntityIceCharge.class, "ice_charge", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "force_arrow"), EntityForceArrow.class, "force_arrow", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "dart"), EntityDart.class, "dart", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "magic_slime"), EntityMagicSlime.class, "magic_slime", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "forcefield"), EntityForcefield.class, "forcefield", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ring_of_fire"), EntityFireRing.class, "ring_of_fire", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_disc"), EntityLightningDisc.class, "lightning_disc", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "thunderbolt"), EntityThunderbolt.class, "thunderbolt", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_giant"), EntityIceGiant.class, "ice_giant", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "spirit_horse"), EntitySpiritHorse.class, "spirit_horse", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "phoenix"), EntityPhoenix.class, "phoenix", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "silverfish_minion"), EntitySilverfishMinion.class, "silverfish_minion", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "decay"), EntityDecay.class, "decay", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "storm_elemental"), EntityStormElemental.class, "storm_elemental", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "earthquake"), EntityEarthquake.class, "earthquake", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_lance"), EntityIceLance.class, "ice_lance", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "hailstorm"), EntityHailstorm.class, "hailstorm", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "smoke_bomb"), EntitySmokeBomb.class, "smoke_bomb", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(evilWizardID, EntityEvilWizard.class, "evil_wizard", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "decoy"), EntityDecoy.class, "decoy", id++, wizardry, 128, LIVING_UPDATE_INTERVAL, true);
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "ice_spike"), EntityIceSpike.class, "ice_spike", id++, wizardry, 128, 1, true);
+		registerEntity(EntityArc.class, "arc", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntitySkeletonMinion.class, "skeleton_minion", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntitySparkBomb.class, "spark_bomb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntitySpiritWolf.class, "spirit_wolf", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityIceShard.class, "ice_shard", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityBlazeMinion.class, "blaze_minion", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityIceWraith.class, "ice_wraith", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityLightningWraith.class, "lightning_wraith", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityBlackHole.class, "black_hole", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityShield.class, "shield", id++, 128, 1, true);
+		registerEntity(EntityMeteor.class, "meteor", id++, 128, 5, true);
+		registerEntity(EntityBlizzard.class, "blizzard", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntityAndEgg(EntityWizard.class, "wizard", id++, 128, LIVING_UPDATE_INTERVAL, true, 0x19295e, 0xee9312);
+		registerEntity(EntityBubble.class, "bubble", id++, 128, 3, false);
+		registerEntity(EntityTornado.class, "tornado", id++, 128, 1, false);
+		registerEntity(EntityHammer.class, "lightning_hammer", id++, 128, 1, true);
+		registerEntity(EntityFirebomb.class, "firebomb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityForceOrb.class, "force_orb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityArrowRain.class, "arrow_rain", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntitySpark.class, "spark", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityShadowWraith.class, "shadow_wraith", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityDarknessOrb.class, "darkness_orb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntitySpiderMinion.class, "spider_minion", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityHealAura.class, "healing_aura", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityFireSigil.class, "fire_sigil", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityFrostSigil.class, "frost_sigil", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityLightningSigil.class, "lightning_sigil", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityLightningArrow.class, "lightning_arrow", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityFirebolt.class, "firebolt", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityPoisonBomb.class, "poison_bomb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityIceCharge.class, "ice_charge", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityForceArrow.class, "force_arrow", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityDart.class, "dart", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityMagicSlime.class, "magic_slime", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityForcefield.class, "forcefield", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityFireRing.class, "ring_of_fire", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityLightningDisc.class, "lightning_disc", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityThunderbolt.class, "thunderbolt", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityIceGiant.class, "ice_giant", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntitySpiritHorse.class, "spirit_horse", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityPhoenix.class, "phoenix", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntitySilverfishMinion.class, "silverfish_minion", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityDecay.class, "decay", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityStormElemental.class, "storm_elemental", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityEarthquake.class, "earthquake", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntityIceLance.class, "ice_lance", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntity(EntityHailstorm.class, "hailstorm", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
+		registerEntity(EntitySmokeBomb.class, "smoke_bomb", id++, 128, PROJECTILE_UPDATE_INTERVAL, true);
+		registerEntityAndEgg(EntityEvilWizard.class, "evil_wizard", id++, 128, LIVING_UPDATE_INTERVAL, true, 0x290404, 0xee9312);
+		registerEntity(EntityDecoy.class, "decoy", id++, 128, LIVING_UPDATE_INTERVAL, true);
+		registerEntity(EntityIceSpike.class, "ice_spike", id++, 128, 1, true);
 		// TODO: This should be a particle.
-		EntityRegistry.registerModEntity(new ResourceLocation(Wizardry.MODID, "lightning_pulse"), EntityLightningPulse.class, "lightning_pulse", id++, wizardry, 128, PROJECTILE_UPDATE_INTERVAL, false);
-
-		EntityRegistry.registerEgg(wizardID, 0x19295e, 0xee9312);
-		EntityRegistry.registerEgg(evilWizardID, 0x290404, 0xee9312);
+		registerEntity(EntityLightningPulse.class, "lightning_pulse", id++, 128, PROJECTILE_UPDATE_INTERVAL, false);
 
 		// TODO: May need fixing
 		List<Biome> biomes = new ArrayList<Biome>();
@@ -232,6 +227,21 @@ public final class WizardryRegistry {
 		EntityRegistry.addSpawn(EntityEvilWizard.class, 3, 1, 1, EnumCreatureType.MONSTER, biomes.toArray(new Biome[biomes.size()]));
 
 	}
+	
+	/** Private helper method for registering entities; keeps things neater. For some reason, Forge 1.11.2 wants a
+	 * ResourceLocation and a string name... probably because it's transitioning to the registry system. */
+	private static void registerEntity(Class<? extends Entity> entityClass, String name, int id, int trackingRange, int updateFrequency, boolean sendsVelocityUpdates){
+		ResourceLocation registryName = new ResourceLocation(Wizardry.MODID, name);
+		EntityRegistry.registerModEntity(registryName, entityClass, registryName.toString(), id, Wizardry.instance, trackingRange, updateFrequency, sendsVelocityUpdates);
+	}
+	
+	/** Private helper method for registering entities with eggs; keeps things neater. For some reason, Forge 1.11.2
+	 * wants a ResourceLocation and a string name... probably because it's transitioning to the registry system. */
+	private static void registerEntityAndEgg(Class<? extends Entity> entityClass, String name, int id, int trackingRange, int updateFrequency, boolean sendsVelocityUpdates, int eggColour, int spotColour){
+		ResourceLocation registryName = new ResourceLocation(Wizardry.MODID, name);
+		EntityRegistry.registerModEntity(registryName, entityClass, registryName.toString(), id, Wizardry.instance, trackingRange, updateFrequency, sendsVelocityUpdates);
+		EntityRegistry.registerEgg(registryName, eggColour, spotColour);
+	}
 
 	/** Called from the init method in the main mod class to register all the recipes. */
 	public static void registerRecipes(){
diff --git a/src/main/resources/assets/wizardry/lang/en_GB.lang b/src/main/resources/assets/wizardry/lang/en_GB.lang
index fc660274..8428eb91 100644
--- a/src/main/resources/assets/wizardry/lang/en_GB.lang
+++ b/src/main/resources/assets/wizardry/lang/en_GB.lang
@@ -148,66 +148,66 @@ item.wizardry:spectral_chestplate.name=Spectral Chestplate
 item.wizardry:spectral_leggings.name=Spectral Leggings
 item.wizardry:spectral_boots.name=Spectral Boots
 
-entity.wizardry.summonedcreature.nameplate=%1$s's %2$s
-entity.wizardry.summonedcreature.nameplate_fallback=Someone's %1$s
+entity.wizardry:summonedcreature.nameplate=%1$s's %2$s
+entity.wizardry:summonedcreature.nameplate_fallback=Someone's %1$s
 
-entity.wizardry.zombie_minion.name=Zombie
-entity.wizardry.skeleton_minion.name=Skeleton
-entity.wizardry.spider_minion.name=Spider
-entity.wizardry.blaze_minion.name=Blaze
-entity.wizardry.ice_wraith.name=Ice Wraith
-entity.wizardry.lightning_wraith.name=Lightning Wraith
-entity.wizardry.shadow_wraith.name=Shadow Wraith
-entity.wizardry.spirit_wolf.name=Spirit Wolf
-entity.wizardry.spirit_horse.name=Spirit Horse
-entity.wizardry.ice_giant.name=Ice Giant
-entity.wizardry.phoenix.name=Phoenix
-entity.wizardry.wizard.name=Wizard
-entity.wizardry.magic_slime.name=Magical Slime
-entity.wizardry.silverfish_minion.name=Silverfish
-entity.wizardry.storm_elemental.name=Storm Elemental
-entity.wizardry.evil_wizard.name=Wizard
-entity.wizardry.decoy.name=Decoy
+entity.wizardry:zombie_minion.name=Zombie
+entity.wizardry:skeleton_minion.name=Skeleton
+entity.wizardry:spider_minion.name=Spider
+entity.wizardry:blaze_minion.name=Blaze
+entity.wizardry:ice_wraith.name=Ice Wraith
+entity.wizardry:lightning_wraith.name=Lightning Wraith
+entity.wizardry:shadow_wraith.name=Shadow Wraith
+entity.wizardry:spirit_wolf.name=Spirit Wolf
+entity.wizardry:spirit_horse.name=Spirit Horse
+entity.wizardry:ice_giant.name=Ice Giant
+entity.wizardry:phoenix.name=Phoenix
+entity.wizardry:wizard.name=Wizard
+entity.wizardry:magic_slime.name=Magical Slime
+entity.wizardry:silverfish_minion.name=Silverfish
+entity.wizardry:storm_elemental.name=Storm Elemental
+entity.wizardry:evil_wizard.name=Wizard
+entity.wizardry:decoy.name=Decoy
 
-entity.wizardry.magic_missile.name=Magic
-entity.wizardry.arc.name=Magic
-entity.wizardry.spark_bomb.name=Magic
-entity.wizardry.ice_shard.name=Magic
-entity.wizardry.firebomb.name=Magic
-entity.wizardry.poison_bomb.name=Magic
-entity.wizardry.force_orb.name=Magic
-entity.wizardry.spark.name=Magic
-entity.wizardry.darkness_orb.name=Magic
-entity.wizardry.fire_sigil.name=Magic
-entity.wizardry.frost_sigil.name=Magic
-entity.wizardry.lightning_sigil.name=Magic
-entity.wizardry.lightning_arrow.name=Magic
-entity.wizardry.firebolt.name=Magic
-entity.wizardry.ice_charge.name=Magic
-entity.wizardry.force_arrow.name=Magic
-entity.wizardry.dart.name=Magic
-entity.wizardry.lightning_disc.name=Magic
-entity.wizardry.thunderbolt.name=Magic
-entity.wizardry.decay.name=Magic
-entity.wizardry.ice_lance.name=Magic
-entity.wizardry.smoke_bomb.name=Magic
-entity.wizardry.ice_spike.name=Magic
+entity.wizardry:magic_missile.name=Magic
+entity.wizardry:arc.name=Magic
+entity.wizardry:spark_bomb.name=Magic
+entity.wizardry:ice_shard.name=Magic
+entity.wizardry:firebomb.name=Magic
+entity.wizardry:poison_bomb.name=Magic
+entity.wizardry:force_orb.name=Magic
+entity.wizardry:spark.name=Magic
+entity.wizardry:darkness_orb.name=Magic
+entity.wizardry:fire_sigil.name=Magic
+entity.wizardry:frost_sigil.name=Magic
+entity.wizardry:lightning_sigil.name=Magic
+entity.wizardry:lightning_arrow.name=Magic
+entity.wizardry:firebolt.name=Magic
+entity.wizardry:ice_charge.name=Magic
+entity.wizardry:force_arrow.name=Magic
+entity.wizardry:dart.name=Magic
+entity.wizardry:lightning_disc.name=Magic
+entity.wizardry:thunderbolt.name=Magic
+entity.wizardry:decay.name=Magic
+entity.wizardry:ice_lance.name=Magic
+entity.wizardry:smoke_bomb.name=Magic
+entity.wizardry:ice_spike.name=Magic
 
-entity.wizardry.black_hole.name=Black Hole
-entity.wizardry.shield.name=Shield
-entity.wizardry.meteor.name=Meteor
-entity.wizardry.blizzard.name=Blizzard
-entity.wizardry.bubble.name=Bubble
-entity.wizardry.tornado.name=Tornado
-entity.wizardry.lightning_hammer.name=Lightning Hammer
-entity.wizardry.arrow_rain.name=Arrow Rain
-entity.wizardry.healing_aura.name=Healing Aura
-entity.wizardry.forcefield.name=Forcefield
-entity.wizardry.ring_of_fire.name=Ring of Fire
-entity.wizardry.earthquake.name=Earthquake
-entity.wizardry.falling_grass.name=Falling Grass
-entity.wizardry.hailstorm.name=Hailstorm
-entity.wizardry.lightning_pulse.name=Lightning Pulse
+entity.wizardry:black_hole.name=Black Hole
+entity.wizardry:shield.name=Shield
+entity.wizardry:meteor.name=Meteor
+entity.wizardry:blizzard.name=Blizzard
+entity.wizardry:bubble.name=Bubble
+entity.wizardry:tornado.name=Tornado
+entity.wizardry:lightning_hammer.name=Lightning Hammer
+entity.wizardry:arrow_rain.name=Arrow Rain
+entity.wizardry:healing_aura.name=Healing Aura
+entity.wizardry:forcefield.name=Forcefield
+entity.wizardry:ring_of_fire.name=Ring of Fire
+entity.wizardry:earthquake.name=Earthquake
+entity.wizardry:falling_grass.name=Falling Grass
+entity.wizardry:hailstorm.name=Hailstorm
+entity.wizardry:lightning_pulse.name=Lightning Pulse
 
 item_group.wizardry=Wizardry
 item_group.wizardryspells=Spells
diff --git a/src/main/resources/assets/wizardry/lang/en_US.lang b/src/main/resources/assets/wizardry/lang/en_US.lang
index 3f87afb7..80af0543 100644
--- a/src/main/resources/assets/wizardry/lang/en_US.lang
+++ b/src/main/resources/assets/wizardry/lang/en_US.lang
@@ -148,66 +148,66 @@ item.wizardry:spectral_chestplate.name=Spectral Chestplate
 item.wizardry:spectral_leggings.name=Spectral Leggings
 item.wizardry:spectral_boots.name=Spectral Boots
 
-entity.wizardry.summonedcreature.nameplate=%1$s's %2$s
-entity.wizardry.summonedcreature.nameplate_fallback=Someone's %1$s
+entity.wizardry:summonedcreature.nameplate=%1$s's %2$s
+entity.wizardry:summonedcreature.nameplate_fallback=Someone's %1$s
 
-entity.wizardry.zombie_minion.name=Zombie
-entity.wizardry.skeleton_minion.name=Skeleton
-entity.wizardry.spider_minion.name=Spider
-entity.wizardry.blaze_minion.name=Blaze
-entity.wizardry.ice_wraith.name=Ice Wraith
-entity.wizardry.lightning_wraith.name=Lightning Wraith
-entity.wizardry.shadow_wraith.name=Shadow Wraith
-entity.wizardry.spirit_wolf.name=Spirit Wolf
-entity.wizardry.spirit_horse.name=Spirit Horse
-entity.wizardry.ice_giant.name=Ice Giant
-entity.wizardry.phoenix.name=Phoenix
-entity.wizardry.wizard.name=Wizard
-entity.wizardry.magic_slime.name=Magical Slime
-entity.wizardry.silverfish_minion.name=Silverfish
-entity.wizardry.storm_elemental.name=Storm Elemental
-entity.wizardry.evil_wizard.name=Wizard
-entity.wizardry.decoy.name=Decoy
+entity.wizardry:zombie_minion.name=Zombie
+entity.wizardry:skeleton_minion.name=Skeleton
+entity.wizardry:spider_minion.name=Spider
+entity.wizardry:blaze_minion.name=Blaze
+entity.wizardry:ice_wraith.name=Ice Wraith
+entity.wizardry:lightning_wraith.name=Lightning Wraith
+entity.wizardry:shadow_wraith.name=Shadow Wraith
+entity.wizardry:spirit_wolf.name=Spirit Wolf
+entity.wizardry:spirit_horse.name=Spirit Horse
+entity.wizardry:ice_giant.name=Ice Giant
+entity.wizardry:phoenix.name=Phoenix
+entity.wizardry:wizard.name=Wizard
+entity.wizardry:magic_slime.name=Magical Slime
+entity.wizardry:silverfish_minion.name=Silverfish
+entity.wizardry:storm_elemental.name=Storm Elemental
+entity.wizardry:evil_wizard.name=Wizard
+entity.wizardry:decoy.name=Decoy
 
-entity.wizardry.magic_missile.name=Magic
-entity.wizardry.arc.name=Magic
-entity.wizardry.spark_bomb.name=Magic
-entity.wizardry.ice_shard.name=Magic
-entity.wizardry.firebomb.name=Magic
-entity.wizardry.poison_bomb.name=Magic
-entity.wizardry.force_orb.name=Magic
-entity.wizardry.spark.name=Magic
-entity.wizardry.darkness_orb.name=Magic
-entity.wizardry.fire_sigil.name=Magic
-entity.wizardry.frost_sigil.name=Magic
-entity.wizardry.lightning_sigil.name=Magic
-entity.wizardry.lightning_arrow.name=Magic
-entity.wizardry.firebolt.name=Magic
-entity.wizardry.ice_charge.name=Magic
-entity.wizardry.force_arrow.name=Magic
-entity.wizardry.dart.name=Magic
-entity.wizardry.lightning_disc.name=Magic
-entity.wizardry.thunderbolt.name=Magic
-entity.wizardry.decay.name=Magic
-entity.wizardry.ice_lance.name=Magic
-entity.wizardry.smoke_bomb.name=Magic
-entity.wizardry.ice_spike.name=Magic
+entity.wizardry:magic_missile.name=Magic
+entity.wizardry:arc.name=Magic
+entity.wizardry:spark_bomb.name=Magic
+entity.wizardry:ice_shard.name=Magic
+entity.wizardry:firebomb.name=Magic
+entity.wizardry:poison_bomb.name=Magic
+entity.wizardry:force_orb.name=Magic
+entity.wizardry:spark.name=Magic
+entity.wizardry:darkness_orb.name=Magic
+entity.wizardry:fire_sigil.name=Magic
+entity.wizardry:frost_sigil.name=Magic
+entity.wizardry:lightning_sigil.name=Magic
+entity.wizardry:lightning_arrow.name=Magic
+entity.wizardry:firebolt.name=Magic
+entity.wizardry:ice_charge.name=Magic
+entity.wizardry:force_arrow.name=Magic
+entity.wizardry:dart.name=Magic
+entity.wizardry:lightning_disc.name=Magic
+entity.wizardry:thunderbolt.name=Magic
+entity.wizardry:decay.name=Magic
+entity.wizardry:ice_lance.name=Magic
+entity.wizardry:smoke_bomb.name=Magic
+entity.wizardry:ice_spike.name=Magic
 
-entity.wizardry.black_hole.name=Black Hole
-entity.wizardry.shield.name=Shield
-entity.wizardry.meteor.name=Meteor
-entity.wizardry.blizzard.name=Blizzard
-entity.wizardry.bubble.name=Bubble
-entity.wizardry.tornado.name=Tornado
-entity.wizardry.lightning_hammer.name=Lightning Hammer
-entity.wizardry.arrow_rain.name=Arrow Rain
-entity.wizardry.healing_aura.name=Healing Aura
-entity.wizardry.forcefield.name=Forcefield
-entity.wizardry.ring_of_fire.name=Ring of Fire
-entity.wizardry.earthquake.name=Earthquake
-entity.wizardry.falling_grass.name=Falling Grass
-entity.wizardry.hailstorm.name=Hailstorm
-entity.wizardry.lightning_pulse.name=Lightning Pulse
+entity.wizardry:black_hole.name=Black Hole
+entity.wizardry:shield.name=Shield
+entity.wizardry:meteor.name=Meteor
+entity.wizardry:blizzard.name=Blizzard
+entity.wizardry:bubble.name=Bubble
+entity.wizardry:tornado.name=Tornado
+entity.wizardry:lightning_hammer.name=Lightning Hammer
+entity.wizardry:arrow_rain.name=Arrow Rain
+entity.wizardry:healing_aura.name=Healing Aura
+entity.wizardry:forcefield.name=Forcefield
+entity.wizardry:ring_of_fire.name=Ring of Fire
+entity.wizardry:earthquake.name=Earthquake
+entity.wizardry:falling_grass.name=Falling Grass
+entity.wizardry:hailstorm.name=Hailstorm
+entity.wizardry:lightning_pulse.name=Lightning Pulse
 
 itemGroup.wizardry=Wizardry
 itemGroup.wizardryspells=Spells
diff --git a/src/main/resources/assets/wizardry/lang/es_ES.lang b/src/main/resources/assets/wizardry/lang/es_ES.lang
index 7608a50f..5a01e421 100644
--- a/src/main/resources/assets/wizardry/lang/es_ES.lang
+++ b/src/main/resources/assets/wizardry/lang/es_ES.lang
@@ -148,65 +148,65 @@ item.wizardry:spectral_chestplate.name=Pechera Espectral
 item.wizardry:spectral_leggings.name=Grebas Espectrales
 item.wizardry:spectral_boots.name=Botas Espectrales
 
-entity.wizardry.summonedcreature.nameplate=%2$s de %1$s
+entity.wizardry:summonedcreature.nameplate=%2$s de %1$s
 
-entity.wizardry.zombie_minion.name=Zombi
-entity.wizardry.skeleton_minion.name=Esqueleto
-entity.wizardry.spider_minion.name=Arana
-entity.wizardry.blaze_minion.name=Blaze
-entity.wizardry.ice_wraith.name=Espectro de Hielo
-entity.wizardry.lightning_wraith.name=Espectro de Relampago
-entity.wizardry.shadow_wraith.name=Espectro de las Sombras
-entity.wizardry.spirit_wolf.name=Lobo Espiritual
-entity.wizardry.spirit_horse.name=Caballo Espiritual
-entity.wizardry.ice_giant.name=Gigante de Hielo
-entity.wizardry.phoenix.name=Fenix
-entity.wizardry.wizard.name=Mago
-entity.wizardry.magic_slime.name=Slime Magico
-entity.wizardry.silverfish_minion.name=Lepisma
-entity.wizardry.storm_elemental.name=Elemental de Tormenta
-entity.wizardry.evil_wizard.name=Mago Malvado
-entity.wizardry.decoy.name=Senuelo
+entity.wizardry:zombie_minion.name=Zombi
+entity.wizardry:skeleton_minion.name=Esqueleto
+entity.wizardry:spider_minion.name=Arana
+entity.wizardry:blaze_minion.name=Blaze
+entity.wizardry:ice_wraith.name=Espectro de Hielo
+entity.wizardry:lightning_wraith.name=Espectro de Relampago
+entity.wizardry:shadow_wraith.name=Espectro de las Sombras
+entity.wizardry:spirit_wolf.name=Lobo Espiritual
+entity.wizardry:spirit_horse.name=Caballo Espiritual
+entity.wizardry:ice_giant.name=Gigante de Hielo
+entity.wizardry:phoenix.name=Fenix
+entity.wizardry:wizard.name=Mago
+entity.wizardry:magic_slime.name=Slime Magico
+entity.wizardry:silverfish_minion.name=Lepisma
+entity.wizardry:storm_elemental.name=Elemental de Tormenta
+entity.wizardry:evil_wizard.name=Mago Malvado
+entity.wizardry:decoy.name=Senuelo
 
-entity.wizardry.magic_missile.name=Magia
-entity.wizardry.arc.name=Magia
-entity.wizardry.spark_bomb.name=Magia
-entity.wizardry.ice_shard.name=Magia
-entity.wizardry.firebomb.name=Magic
-entity.wizardry.poison_bomb.name=Magia
-entity.wizardry.force_orb.name=Magia
-entity.wizardry.spark.name=Magia
-entity.wizardry.darkness_orb.name=Magia
-entity.wizardry.fire_sigil.name=Magia
-entity.wizardry.frost_sigil.name=Magia
-entity.wizardry.lightning_sigil.name=Magia
-entity.wizardry.lightning_arrow.name=Magia
-entity.wizardry.firebolt.name=Magia
-entity.wizardry.ice_charge.name=Magia
-entity.wizardry.force_arrow.name=Magia
-entity.wizardry.dart.name=Magia
-entity.wizardry.lightning_disc.name=Magia
-entity.wizardry.thunderbolt.name=Magia
-entity.wizardry.decay.name=Magia
-entity.wizardry.ice_lance.name=Magia
-entity.wizardry.smoke_bomb.name=Magia
-entity.wizardry.ice_spike.name=Magia
+entity.wizardry:magic_missile.name=Magia
+entity.wizardry:arc.name=Magia
+entity.wizardry:spark_bomb.name=Magia
+entity.wizardry:ice_shard.name=Magia
+entity.wizardry:firebomb.name=Magic
+entity.wizardry:poison_bomb.name=Magia
+entity.wizardry:force_orb.name=Magia
+entity.wizardry:spark.name=Magia
+entity.wizardry:darkness_orb.name=Magia
+entity.wizardry:fire_sigil.name=Magia
+entity.wizardry:frost_sigil.name=Magia
+entity.wizardry:lightning_sigil.name=Magia
+entity.wizardry:lightning_arrow.name=Magia
+entity.wizardry:firebolt.name=Magia
+entity.wizardry:ice_charge.name=Magia
+entity.wizardry:force_arrow.name=Magia
+entity.wizardry:dart.name=Magia
+entity.wizardry:lightning_disc.name=Magia
+entity.wizardry:thunderbolt.name=Magia
+entity.wizardry:decay.name=Magia
+entity.wizardry:ice_lance.name=Magia
+entity.wizardry:smoke_bomb.name=Magia
+entity.wizardry:ice_spike.name=Magia
 
-entity.wizardry.black_hole.name=Agujero Negro
-entity.wizardry.shield.name=Escudo
-entity.wizardry.meteor.name=Meteoro
-entity.wizardry.blizzard.name=Ventisca
-entity.wizardry.bubble.name=Burbuja
-entity.wizardry.tornado.name=Tornado
-entity.wizardry.lightning_hammer.name=Martillo Relampago
-entity.wizardry.arrow_rain.name=Lluvia de Flechas
-entity.wizardry.healing_aura.name=Aura Curador
-entity.wizardry.forcefield.name=Campo de Fuerza
-entity.wizardry.ring_of_fire.name=Anillo de Fuego
-entity.wizardry.earthquake.name=Terremoto
-entity.wizardry.falling_grass.name=Hierba Descendiente
-entity.wizardry.hailstorm.name=Tormenta de Granizo
-entity.wizardry.lightning_pulse.name=Pulso de Relampago
+entity.wizardry:black_hole.name=Agujero Negro
+entity.wizardry:shield.name=Escudo
+entity.wizardry:meteor.name=Meteoro
+entity.wizardry:blizzard.name=Ventisca
+entity.wizardry:bubble.name=Burbuja
+entity.wizardry:tornado.name=Tornado
+entity.wizardry:lightning_hammer.name=Martillo Relampago
+entity.wizardry:arrow_rain.name=Lluvia de Flechas
+entity.wizardry:healing_aura.name=Aura Curador
+entity.wizardry:forcefield.name=Campo de Fuerza
+entity.wizardry:ring_of_fire.name=Anillo de Fuego
+entity.wizardry:earthquake.name=Terremoto
+entity.wizardry:falling_grass.name=Hierba Descendiente
+entity.wizardry:hailstorm.name=Tormenta de Granizo
+entity.wizardry:lightning_pulse.name=Pulso de Relampago
 
 item_group.wizardry=Wizardry
 item_group.wizardryspells=Hechizos de Wizardry
diff --git a/src/main/resources/assets/wizardry/lang/es_MX.lang b/src/main/resources/assets/wizardry/lang/es_MX.lang
index 7608a50f..5a01e421 100644
--- a/src/main/resources/assets/wizardry/lang/es_MX.lang
+++ b/src/main/resources/assets/wizardry/lang/es_MX.lang
@@ -148,65 +148,65 @@ item.wizardry:spectral_chestplate.name=Pechera Espectral
 item.wizardry:spectral_leggings.name=Grebas Espectrales
 item.wizardry:spectral_boots.name=Botas Espectrales
 
-entity.wizardry.summonedcreature.nameplate=%2$s de %1$s
+entity.wizardry:summonedcreature.nameplate=%2$s de %1$s
 
-entity.wizardry.zombie_minion.name=Zombi
-entity.wizardry.skeleton_minion.name=Esqueleto
-entity.wizardry.spider_minion.name=Arana
-entity.wizardry.blaze_minion.name=Blaze
-entity.wizardry.ice_wraith.name=Espectro de Hielo
-entity.wizardry.lightning_wraith.name=Espectro de Relampago
-entity.wizardry.shadow_wraith.name=Espectro de las Sombras
-entity.wizardry.spirit_wolf.name=Lobo Espiritual
-entity.wizardry.spirit_horse.name=Caballo Espiritual
-entity.wizardry.ice_giant.name=Gigante de Hielo
-entity.wizardry.phoenix.name=Fenix
-entity.wizardry.wizard.name=Mago
-entity.wizardry.magic_slime.name=Slime Magico
-entity.wizardry.silverfish_minion.name=Lepisma
-entity.wizardry.storm_elemental.name=Elemental de Tormenta
-entity.wizardry.evil_wizard.name=Mago Malvado
-entity.wizardry.decoy.name=Senuelo
+entity.wizardry:zombie_minion.name=Zombi
+entity.wizardry:skeleton_minion.name=Esqueleto
+entity.wizardry:spider_minion.name=Arana
+entity.wizardry:blaze_minion.name=Blaze
+entity.wizardry:ice_wraith.name=Espectro de Hielo
+entity.wizardry:lightning_wraith.name=Espectro de Relampago
+entity.wizardry:shadow_wraith.name=Espectro de las Sombras
+entity.wizardry:spirit_wolf.name=Lobo Espiritual
+entity.wizardry:spirit_horse.name=Caballo Espiritual
+entity.wizardry:ice_giant.name=Gigante de Hielo
+entity.wizardry:phoenix.name=Fenix
+entity.wizardry:wizard.name=Mago
+entity.wizardry:magic_slime.name=Slime Magico
+entity.wizardry:silverfish_minion.name=Lepisma
+entity.wizardry:storm_elemental.name=Elemental de Tormenta
+entity.wizardry:evil_wizard.name=Mago Malvado
+entity.wizardry:decoy.name=Senuelo
 
-entity.wizardry.magic_missile.name=Magia
-entity.wizardry.arc.name=Magia
-entity.wizardry.spark_bomb.name=Magia
-entity.wizardry.ice_shard.name=Magia
-entity.wizardry.firebomb.name=Magic
-entity.wizardry.poison_bomb.name=Magia
-entity.wizardry.force_orb.name=Magia
-entity.wizardry.spark.name=Magia
-entity.wizardry.darkness_orb.name=Magia
-entity.wizardry.fire_sigil.name=Magia
-entity.wizardry.frost_sigil.name=Magia
-entity.wizardry.lightning_sigil.name=Magia
-entity.wizardry.lightning_arrow.name=Magia
-entity.wizardry.firebolt.name=Magia
-entity.wizardry.ice_charge.name=Magia
-entity.wizardry.force_arrow.name=Magia
-entity.wizardry.dart.name=Magia
-entity.wizardry.lightning_disc.name=Magia
-entity.wizardry.thunderbolt.name=Magia
-entity.wizardry.decay.name=Magia
-entity.wizardry.ice_lance.name=Magia
-entity.wizardry.smoke_bomb.name=Magia
-entity.wizardry.ice_spike.name=Magia
+entity.wizardry:magic_missile.name=Magia
+entity.wizardry:arc.name=Magia
+entity.wizardry:spark_bomb.name=Magia
+entity.wizardry:ice_shard.name=Magia
+entity.wizardry:firebomb.name=Magic
+entity.wizardry:poison_bomb.name=Magia
+entity.wizardry:force_orb.name=Magia
+entity.wizardry:spark.name=Magia
+entity.wizardry:darkness_orb.name=Magia
+entity.wizardry:fire_sigil.name=Magia
+entity.wizardry:frost_sigil.name=Magia
+entity.wizardry:lightning_sigil.name=Magia
+entity.wizardry:lightning_arrow.name=Magia
+entity.wizardry:firebolt.name=Magia
+entity.wizardry:ice_charge.name=Magia
+entity.wizardry:force_arrow.name=Magia
+entity.wizardry:dart.name=Magia
+entity.wizardry:lightning_disc.name=Magia
+entity.wizardry:thunderbolt.name=Magia
+entity.wizardry:decay.name=Magia
+entity.wizardry:ice_lance.name=Magia
+entity.wizardry:smoke_bomb.name=Magia
+entity.wizardry:ice_spike.name=Magia
 
-entity.wizardry.black_hole.name=Agujero Negro
-entity.wizardry.shield.name=Escudo
-entity.wizardry.meteor.name=Meteoro
-entity.wizardry.blizzard.name=Ventisca
-entity.wizardry.bubble.name=Burbuja
-entity.wizardry.tornado.name=Tornado
-entity.wizardry.lightning_hammer.name=Martillo Relampago
-entity.wizardry.arrow_rain.name=Lluvia de Flechas
-entity.wizardry.healing_aura.name=Aura Curador
-entity.wizardry.forcefield.name=Campo de Fuerza
-entity.wizardry.ring_of_fire.name=Anillo de Fuego
-entity.wizardry.earthquake.name=Terremoto
-entity.wizardry.falling_grass.name=Hierba Descendiente
-entity.wizardry.hailstorm.name=Tormenta de Granizo
-entity.wizardry.lightning_pulse.name=Pulso de Relampago
+entity.wizardry:black_hole.name=Agujero Negro
+entity.wizardry:shield.name=Escudo
+entity.wizardry:meteor.name=Meteoro
+entity.wizardry:blizzard.name=Ventisca
+entity.wizardry:bubble.name=Burbuja
+entity.wizardry:tornado.name=Tornado
+entity.wizardry:lightning_hammer.name=Martillo Relampago
+entity.wizardry:arrow_rain.name=Lluvia de Flechas
+entity.wizardry:healing_aura.name=Aura Curador
+entity.wizardry:forcefield.name=Campo de Fuerza
+entity.wizardry:ring_of_fire.name=Anillo de Fuego
+entity.wizardry:earthquake.name=Terremoto
+entity.wizardry:falling_grass.name=Hierba Descendiente
+entity.wizardry:hailstorm.name=Tormenta de Granizo
+entity.wizardry:lightning_pulse.name=Pulso de Relampago
 
 item_group.wizardry=Wizardry
 item_group.wizardryspells=Hechizos de Wizardry
diff --git a/src/main/resources/assets/wizardry/lang/ru_RU.lang b/src/main/resources/assets/wizardry/lang/ru_RU.lang
index 3bd59b0c..fd9b9b1e 100644
--- a/src/main/resources/assets/wizardry/lang/ru_RU.lang
+++ b/src/main/resources/assets/wizardry/lang/ru_RU.lang
@@ -132,53 +132,53 @@ item.wizardry:wizard_boots_healing.name=Ботинки Целителя
 
 item.wizardry:spawn_wizard.name=Спаун Волшебника
 
-entity.wizardry.zombie_minion.name=Зомби
-entity.wizardry.skeleton_minion.name=Скелет
-entity.wizardry.spider_minion.name=Паук
-entity.wizardry.blaze_minion.name=Блейз
-entity.wizardry.ice_wraith.name=Ледяной Призрак
-entity.wizardry.lightning_wraith.name=Штормовой Призрак
-entity.wizardry.shadow_wraith.name=Теневой Призрак
-entity.wizardry.spirit_wolf.name=Призрачный Волк
-entity.wizardry.spirit_horse.name=Призрачная Лошадь
-entity.wizardry.ice_giant.name=Ледяной Гигант
-entity.wizardry.phoenix.name=Феникс
-entity.wizardry.wizard.name=Волшебник
-entity.wizardry.magic_slime.name=Магический Слизень
-entity.wizardry.silverfish_minion.name=Чешуйница
+entity.wizardry:zombie_minion.name=Зомби
+entity.wizardry:skeleton_minion.name=Скелет
+entity.wizardry:spider_minion.name=Паук
+entity.wizardry:blaze_minion.name=Блейз
+entity.wizardry:ice_wraith.name=Ледяной Призрак
+entity.wizardry:lightning_wraith.name=Штормовой Призрак
+entity.wizardry:shadow_wraith.name=Теневой Призрак
+entity.wizardry:spirit_wolf.name=Призрачный Волк
+entity.wizardry:spirit_horse.name=Призрачная Лошадь
+entity.wizardry:ice_giant.name=Ледяной Гигант
+entity.wizardry:phoenix.name=Феникс
+entity.wizardry:wizard.name=Волшебник
+entity.wizardry:magic_slime.name=Магический Слизень
+entity.wizardry:silverfish_minion.name=Чешуйница
 
-entity.wizardry.magic_missile.name=Магия
-entity.wizardry.arc.name=Магия
-entity.wizardry.spark_bomb.name=Магия
-entity.wizardry.ice_shard.name=Магия
-entity.wizardry.firebomb.name=Магия
-entity.wizardry.poison_bomb.name=Магия
-entity.wizardry.force_orb.name=Магия
-entity.wizardry.spark.name=Магия
-entity.wizardry.darkness_orb.name=Магия
-entity.wizardry.fire_sigil.name=Магия
-entity.wizardry.frost_sigil.name=Магия
-entity.wizardry.lightning_sigil.name=Магия
-entity.wizardry.lightning_arrow.name=Магия
-entity.wizardry.firebolt.name=Магия
-entity.wizardry.ice_charge.name=Магия
-entity.wizardry.force_arrow.name=Магия
-entity.wizardry.dart.name=Магия
-entity.wizardry.lightning_disc.name=Магия
-entity.wizardry.thunderbolt.name=Магия
-entity.wizardry.decay.name=Магия
+entity.wizardry:magic_missile.name=Магия
+entity.wizardry:arc.name=Магия
+entity.wizardry:spark_bomb.name=Магия
+entity.wizardry:ice_shard.name=Магия
+entity.wizardry:firebomb.name=Магия
+entity.wizardry:poison_bomb.name=Магия
+entity.wizardry:force_orb.name=Магия
+entity.wizardry:spark.name=Магия
+entity.wizardry:darkness_orb.name=Магия
+entity.wizardry:fire_sigil.name=Магия
+entity.wizardry:frost_sigil.name=Магия
+entity.wizardry:lightning_sigil.name=Магия
+entity.wizardry:lightning_arrow.name=Магия
+entity.wizardry:firebolt.name=Магия
+entity.wizardry:ice_charge.name=Магия
+entity.wizardry:force_arrow.name=Магия
+entity.wizardry:dart.name=Магия
+entity.wizardry:lightning_disc.name=Магия
+entity.wizardry:thunderbolt.name=Магия
+entity.wizardry:decay.name=Магия
 
-entity.wizardry.black_hole.name=Чёрная Дыра
-entity.wizardry.shield.name=Щит
-entity.wizardry.meteor.name=Метеор
-entity.wizardry.blizzard.name=Метель
-entity.wizardry.bubble.name=Пузыри
-entity.wizardry.tornado.name=Торнадо
-entity.wizardry.lightning_hammer.name=Молот Шторма
-entity.wizardry.arrow_rain.name=Дождь Стрел
-entity.wizardry.healing_aura.name=Аура Лечения
-entity.wizardry.forcefield.name=Силовое Поле
-entity.wizardry.ring_of_fire.name=Кольцо Огня
+entity.wizardry:black_hole.name=Чёрная Дыра
+entity.wizardry:shield.name=Щит
+entity.wizardry:meteor.name=Метеор
+entity.wizardry:blizzard.name=Метель
+entity.wizardry:bubble.name=Пузыри
+entity.wizardry:tornado.name=Торнадо
+entity.wizardry:lightning_hammer.name=Молот Шторма
+entity.wizardry:arrow_rain.name=Дождь Стрел
+entity.wizardry:healing_aura.name=Аура Лечения
+entity.wizardry:forcefield.name=Силовое Поле
+entity.wizardry:ring_of_fire.name=Кольцо Огня
 
 item_group.wizardry=Волшебство
 item_group.wizardryspells=Волшебные Заклинания