diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
index f6148a3b0d..2691f4991d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2019, Infinitay <https://github.com/Infinitay>
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +67,7 @@ public class Vorkath
 
 	/**
 	 * Updates the existing Vorkath object depending on the new phase it is currently on
+	 *
 	 * @param newPhase the new phase Vorkath is current on
 	 */
 	public void updatePhase(Phase newPhase)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
index edb86434be..8e1b20daae 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2019, Infinitay <https://github.com/Infinitay>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package net.runelite.client.plugins.vorkath;
 
 import com.google.common.collect.ImmutableMap;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
index c3d18e7450..3b94cefe7b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2019, Infinitay <https://github.com/Infinitay>
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
index 629c07d03e..681981508e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2018, https://runelitepl.us
+ * Copyright (c) 2019, Infinitay <https://github.com/Infinitay>
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,20 +97,6 @@ public class VorkathPlugin extends Plugin
 		SPAWN = ImageUtil.getResourceStreamFromClass(VorkathPlugin.class, "ice.png");
 	}
 
-	@Override
-	protected void startUp()
-	{
-		overlayManager.add(overlay);
-		overlayManager.add(SpawnOverlay);
-	}
-
-	@Override
-	protected void shutDown()
-	{
-		overlayManager.remove(overlay);
-		overlayManager.remove(SpawnOverlay);
-	}
-
 	@Subscribe
 	public void onNpcSpawned(NpcSpawned event)
 	{
@@ -118,10 +106,12 @@ public class VorkathPlugin extends Plugin
 			{
 				vorkath = new Vorkath(event.getNpc());
 				lastProjectileCycle = -1;
+				overlayManager.add(overlay);
 			}
 			else if (isZombifiedSpawn(event.getNpc().getId()))
 			{
 				zombifiedSpawn = event.getNpc();
+				overlayManager.add(SpawnOverlay);
 			}
 		}
 	}
@@ -135,10 +125,12 @@ public class VorkathPlugin extends Plugin
 			{
 				vorkath = null;
 				lastProjectileCycle = -1;
+				overlayManager.remove(overlay);
 			}
 			else if (isZombifiedSpawn(event.getNpc().getId()))
 			{
 				zombifiedSpawn = null;
+				overlayManager.remove(SpawnOverlay);
 			}
 		}
 	}