diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index a8a1ad514a..64c481e76e 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache-client</artifactId>
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index 95e8efbb7a..ac51e66b60 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 	
 	<name>Cache Updater</name>
diff --git a/cache/pom.xml b/cache/pom.xml
index 8ba9aaf1e2..7d8dcdc50c 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache</artifactId>
diff --git a/http-api/pom.xml b/http-api/pom.xml
index 9cfe444424..15c03eac36 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<name>Web API</name>
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 2178d7b2ca..7b44773033 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<name>Web Service</name>
diff --git a/http-service/src/main/java/net/runelite/http/service/xtea/XteaService.java b/http-service/src/main/java/net/runelite/http/service/xtea/XteaService.java
index 92ec5a6dd8..61650b4e51 100644
--- a/http-service/src/main/java/net/runelite/http/service/xtea/XteaService.java
+++ b/http-service/src/main/java/net/runelite/http/service/xtea/XteaService.java
@@ -184,9 +184,9 @@ public class XteaService
 		try (Connection con = sql2o.open())
 		{
 			return con.createQuery(
-				"select t1.region, t1.time, t2.rev, t2.key1, t2.key2, t2.key3, t2.key4 from " +
-					"(select region,max(time) as time from xtea group by region) t1 " +
-					"join xtea t2 on t1.region = t2.region and t1.time = t2.time")
+				"select t1.region, t2.time, t2.rev, t2.key1, t2.key2, t2.key3, t2.key4 from " +
+					"(select region,max(id) as id from xtea group by region) t1 " +
+					"join xtea t2 on t1.id = t2.id")
 				.executeAndFetch(XteaEntry.class);
 		}
 	}
diff --git a/pom.xml b/pom.xml
index 37b81657e6..1bebdcb939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.5.25-SNAPSHOT</version>
+	<version>1.5.26-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -115,8 +115,8 @@
 		<module>cache</module>
 		<module>cache-client</module>
 		<module>cache-updater</module>
-		<module>extended-mixin-processor</module>
-		<module>extended-mixins</module>
+		<!--		<module>extended-mixin-processor</module>
+				<module>extended-mixins</module>-->
 		<module>runelite-api</module>
 		<module>runelite-client</module>
 		<module>runelite-mixins</module>
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index 7921cd6527..7a47b77618 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol-api</artifactId>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 56bf7a91e5..995b2d62ad 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol</artifactId>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 628b777879..37c849d760 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
index 813c354a01..517d093058 100644
--- a/runelite-api/src/main/java/net/runelite/api/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -6618,6 +6618,7 @@ public final class ItemID
 	public static final int NO_EGGS = 10563;
 	public static final int GRANITE_BODY = 10564;
 	public static final int FIRE_CAPE_10566 = 10566;
+	public static final int HEALER_ICON_10567 = 10567;
 	public static final int KERIS = 10581;
 	public static final int KERISP = 10582;
 	public static final int KERISP_10583 = 10583;
@@ -9483,6 +9484,7 @@ public final class ItemID
 	public static final int KINDLING_20799 = 20799;
 	public static final int EMPTY_GOURD_VIAL = 20800;
 	public static final int WATERFILLED_GOURD_VIAL = 20801;
+	public static final int HEALER_ICON_20802 = 20802;
 	public static final int SNOW_GLOBE = 20832;
 	public static final int SACK_OF_PRESENTS = 20834;
 	public static final int GIANT_PRESENT = 20836;
@@ -10305,6 +10307,14 @@ public final class ItemID
 	public static final int ANCIENT_MEDALLION = 22299;
 	public static final int ANCIENT_EFFIGY = 22302;
 	public static final int ANCIENT_RELIC = 22305;
+	public static final int HEALER_ICON_22308 = 22308;
+	public static final int HEALER_ICON_22309 = 22309;
+	public static final int HEALER_ICON_22310 = 22310;
+	public static final int HEALER_ICON_22311 = 22311;
+	public static final int COLLECTOR_ICON_22312 = 22312;
+	public static final int COLLECTOR_ICON_22313 = 22313;
+	public static final int COLLECTOR_ICON_22314 = 22314;
+	public static final int COLLECTOR_ICON_22315 = 22315;
 	public static final int PROP_SWORD = 22316;
 	public static final int PET_CORPOREAL_CRITTER = 22318;
 	public static final int TZREKZUK = 22319;
@@ -10321,6 +10331,19 @@ public final class ItemID
 	public static final int STARTER_SWORD = 22331;
 	public static final int STARTER_BOW = 22333;
 	public static final int STARTER_STAFF = 22335;
+	public static final int COLLECTOR_ICON_22337 = 22337;
+	public static final int COLLECTOR_ICON_22338 = 22338;
+	public static final int COLLECTOR_ICON_22339 = 22339;
+	public static final int DEFENDER_ICON_22340 = 22340;
+	public static final int DEFENDER_ICON_22341 = 22341;
+	public static final int DEFENDER_ICON_22342 = 22342;
+	public static final int DEFENDER_ICON_22343 = 22343;
+	public static final int DEFENDER_ICON_22344 = 22344;
+	public static final int DEFENDER_ICON_22345 = 22345;
+	public static final int ATTACKER_ICON_22346 = 22346;
+	public static final int ATTACKER_ICON_22347 = 22347;
+	public static final int ATTACKER_ICON_22348 = 22348;
+	public static final int ATTACKER_ICON_22349 = 22349;
 	public static final int EGGSHELL_PLATEBODY = 22351;
 	public static final int EGGSHELL_PLATELEGS = 22353;
 	public static final int HOLY_HANDEGG = 22355;
@@ -10487,6 +10510,16 @@ public final class ItemID
 	public static final int TREE_TOP = 22715;
 	public static final int TREE_SKIRT = 22717;
 	public static final int CANDY_CANE = 22719;
+	public static final int ATTACKER_ICON_22721 = 22721;
+	public static final int ATTACKER_ICON_22722 = 22722;
+	public static final int ATTACKER_ICON_22723 = 22723;
+	public static final int COLLECTOR_ICON_22724 = 22724;
+	public static final int DEFENDER_ICON_22725 = 22725;
+	public static final int DEFENDER_ICON_22726 = 22726;
+	public static final int DEFENDER_ICON_22727 = 22727;
+	public static final int DEFENDER_ICON_22728 = 22728;
+	public static final int ATTACKER_ICON_22729 = 22729;
+	public static final int ATTACKER_ICON_22730 = 22730;
 	public static final int DRAGON_HASTA = 22731;
 	public static final int DRAGON_HASTAP = 22734;
 	public static final int DRAGON_HASTAP_22737 = 22737;
@@ -10791,5 +10824,33 @@ public final class ItemID
 	public static final int TORMENTED_BRACELET_OR = 23444;
 	public static final int GIANT_EASTER_EGG = 23446;
 	public static final int BUNNYMAN_MASK = 23448;
+	public static final int ENCHANTED_LYREI = 23458;
+	public static final int ATTACKER_ICON_23460 = 23460;
+	public static final int ATTACKER_ICON_23461 = 23461;
+	public static final int ATTACKER_ICON_23462 = 23462;
+	public static final int ATTACKER_ICON_23463 = 23463;
+	public static final int ATTACKER_ICON_23464 = 23464;
+	public static final int ATTACKER_ICON_23465 = 23465;
+	public static final int DEFENDER_ICON_23466 = 23466;
+	public static final int DEFENDER_ICON_23467 = 23467;
+	public static final int DEFENDER_ICON_23468 = 23468;
+	public static final int DEFENDER_ICON_23469 = 23469;
+	public static final int DEFENDER_ICON_23470 = 23470;
+	public static final int COLLECTOR_ICON_23471 = 23471;
+	public static final int COLLECTOR_ICON_23472 = 23472;
+	public static final int COLLECTOR_ICON_23473 = 23473;
+	public static final int COLLECTOR_ICON_23474 = 23474;
+	public static final int COLLECTOR_ICON_23475 = 23475;
+	public static final int COLLECTOR_ICON_23476 = 23476;
+	public static final int COLLECTOR_ICON_23477 = 23477;
+	public static final int HEALER_ICON_23478 = 23478;
+	public static final int HEALER_ICON_23479 = 23479;
+	public static final int HEALER_ICON_23480 = 23480;
+	public static final int HEALER_ICON_23481 = 23481;
+	public static final int HEALER_ICON_23482 = 23482;
+	public static final int HEALER_ICON_23483 = 23483;
+	public static final int HEALER_ICON_23484 = 23484;
+	public static final int HEALER_ICON_23485 = 23485;
+	public static final int HEALER_ICON_23486 = 23486;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
index 1bc9028389..9007300837 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
@@ -3834,7 +3834,6 @@ public final class NullItemID
 	public static final int NULL_10509 = 10509;
 	public static final int NULL_10511 = 10511;
 	public static final int NULL_10565 = 10565;
-	public static final int NULL_10567 = 10567;
 	public static final int NULL_10568 = 10568;
 	public static final int NULL_10569 = 10569;
 	public static final int NULL_10570 = 10570;
@@ -11132,7 +11131,6 @@ public final class NullItemID
 	public static final int NULL_20793 = 20793;
 	public static final int NULL_20795 = 20795;
 	public static final int NULL_20797 = 20797;
-	public static final int NULL_20802 = 20802;
 	public static final int NULL_20803 = 20803;
 	public static final int NULL_20804 = 20804;
 	public static final int NULL_20805 = 20805;
@@ -11816,32 +11814,11 @@ public final class NullItemID
 	public static final int NULL_22304 = 22304;
 	public static final int NULL_22306 = 22306;
 	public static final int NULL_22307 = 22307;
-	public static final int NULL_22308 = 22308;
-	public static final int NULL_22309 = 22309;
-	public static final int NULL_22310 = 22310;
-	public static final int NULL_22311 = 22311;
-	public static final int NULL_22312 = 22312;
-	public static final int NULL_22313 = 22313;
-	public static final int NULL_22314 = 22314;
-	public static final int NULL_22315 = 22315;
 	public static final int NULL_22317 = 22317;
 	public static final int NULL_22329 = 22329;
 	public static final int NULL_22332 = 22332;
 	public static final int NULL_22334 = 22334;
 	public static final int NULL_22336 = 22336;
-	public static final int NULL_22337 = 22337;
-	public static final int NULL_22338 = 22338;
-	public static final int NULL_22339 = 22339;
-	public static final int NULL_22340 = 22340;
-	public static final int NULL_22341 = 22341;
-	public static final int NULL_22342 = 22342;
-	public static final int NULL_22343 = 22343;
-	public static final int NULL_22344 = 22344;
-	public static final int NULL_22345 = 22345;
-	public static final int NULL_22346 = 22346;
-	public static final int NULL_22347 = 22347;
-	public static final int NULL_22348 = 22348;
-	public static final int NULL_22349 = 22349;
 	public static final int NULL_22350 = 22350;
 	public static final int NULL_22352 = 22352;
 	public static final int NULL_22354 = 22354;
@@ -12047,16 +12024,6 @@ public final class NullItemID
 	public static final int NULL_22716 = 22716;
 	public static final int NULL_22718 = 22718;
 	public static final int NULL_22720 = 22720;
-	public static final int NULL_22721 = 22721;
-	public static final int NULL_22722 = 22722;
-	public static final int NULL_22723 = 22723;
-	public static final int NULL_22724 = 22724;
-	public static final int NULL_22725 = 22725;
-	public static final int NULL_22726 = 22726;
-	public static final int NULL_22727 = 22727;
-	public static final int NULL_22728 = 22728;
-	public static final int NULL_22729 = 22729;
-	public static final int NULL_22730 = 22730;
 	public static final int NULL_22732 = 22732;
 	public static final int NULL_22733 = 22733;
 	public static final int NULL_22735 = 22735;
@@ -12456,5 +12423,6 @@ public final class NullItemID
 	public static final int NULL_23455 = 23455;
 	public static final int NULL_23456 = 23456;
 	public static final int NULL_23457 = 23457;
+	public static final int NULL_23459 = 23459;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
index a5750481c0..12774bf1b9 100644
--- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
@@ -110,6 +110,19 @@ public final class ScriptID
 	 */
 	public static final int KEPT_LOST_ITEM_EXAMINE = 1603;
 
+	/**
+	 * Checks the state of the given stash unit.
+	 * <ul>
+	 * <li>int (loc) The stash unit object id</li>
+	 * <li>int Bitpacked stash unit states</li>
+	 * <li>int Bitpacked stash unit states 2</li>
+	 * <li>int Bitpacked stash unit states 3</li>
+	 * </ul>
+	 * <p>
+	 * Returns a pair of booleans indicating if the stash unit is built and if it is filled
+	 */
+	public static final int WATSON_STASH_UNIT_CHECK = 1479;
+
 	/**
 	 * Queries the completion state of a quest by its struct id
 	 * <ul>
diff --git a/runelite-api/src/main/java/net/runelite/api/WallObject.java b/runelite-api/src/main/java/net/runelite/api/WallObject.java
index 9a7156b654..ddc4a734cd 100644
--- a/runelite-api/src/main/java/net/runelite/api/WallObject.java
+++ b/runelite-api/src/main/java/net/runelite/api/WallObject.java
@@ -25,28 +25,33 @@
 package net.runelite.api;
 
 /**
- * Represents the wall of a tile, which is an un-passable boundary.
+ * Represents one or two walls on a tile
  */
 public interface WallObject extends TileObject
 {
 	/**
-	 * Gets the first orientation of the wall.
-	 *
-	 * @return the first orientation, 0-2048 where 0 is north
+	 * A bitfield with the orientation of a wall
+	 * 1 = East
+	 * 2 = North
+	 * 4 = West
+	 * 8 = South
 	 */
 	int getOrientationA();
 
 	/**
-	 * Gets the second orientation value of the wall.
-	 *
-	 * @return the second orientation, 0-2048 where 0 is north
+	 * A bitfield containing the orientation of the second wall on this tile,
+	 * or 0 if there is no second wall.
+	 * @see #getOrientationA
 	 */
 	int getOrientationB();
 
 	/**
-	 * Gets the boundary configuration of the wall.
-	 *
-	 * @return the boundary configuration
+	 * A bitfield containing various flags:
+	 * <pre>{@code
+	 * object type id = bits & 0x20
+	 * orientation (0-3) = bits >>> 6 & 3
+	 * supports items = bits >>> 8 & 1
+	 * }</pre>
 	 */
 	int getConfig();
 
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
index c160e0996f..4a5829211c 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -140,6 +140,11 @@ public class WidgetID
 	public static final int KEPT_ON_DEATH_GROUP_ID = 4;
 	public static final int GUIDE_PRICE_GROUP_ID = 464;
 	public static final int SEED_VAULT_INVENTORY_GROUP_ID = 630;
+	public static final int BEGINNER_CLUE_MAP_CHAMPIONS_GUILD = 346;
+	public static final int BEGINNER_CLUE_MAP_VARROCK_EAST_MINE = 347;
+	public static final int BEGINNER_CLUE_MAP_DRAYNOR = 348;
+	public static final int BEGINNER_CLUE_MAP_NORTH_OF_FALADOR = 351;
+	public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356;
 
 	static class WorldMap
 	{
@@ -546,20 +551,20 @@ public class WidgetID
 	static class Combat
 	{
 		static final int WEAPON_NAME = 1;
-		static final int LEVEL = 2;
-		static final int STYLE_ONE = 3;
-		static final int STYLE_TWO = 7;
-		static final int STYLE_THREE = 11;
-		static final int STYLE_FOUR = 15;
-		static final int SPELLS = 19;
-		static final int DEFENSIVE_SPELL_BOX = 20;
-		static final int DEFENSIVE_SPELL_ICON = 22;
-		static final int DEFENSIVE_SPELL_SHIELD = 23;
-		static final int DEFENSIVE_SPELL_TEXT = 24;
-		static final int SPELL_BOX = 25;
-		static final int SPELL_ICON = 27;
-		static final int SPELL_TEXT = 28;
-		static final int AUTO_RETALIATE = 29;
+		static final int LEVEL = 3;
+		static final int STYLE_ONE = 4;
+		static final int STYLE_TWO = 8;
+		static final int STYLE_THREE = 12;
+		static final int STYLE_FOUR = 16;
+		static final int SPELLS = 20;
+		static final int DEFENSIVE_SPELL_BOX = 21;
+		static final int DEFENSIVE_SPELL_ICON = 23;
+		static final int DEFENSIVE_SPELL_SHIELD = 24;
+		static final int DEFENSIVE_SPELL_TEXT = 25;
+		static final int SPELL_BOX = 26;
+		static final int SPELL_ICON = 28;
+		static final int SPELL_TEXT = 29;
+		static final int AUTO_RETALIATE = 30;
 		static final int SPECIAL_ATTACK_BAR = 34;
 		static final int TOOLTIP = 41;
 	}
@@ -1041,7 +1046,7 @@ public class WidgetID
 		static final int CUSTOM_TEXT_CONTAINER = 33;
 	}
 
-	public static class TradeScreen 
+	public static class TradeScreen
 	{
 		public static final int SECOND_GROUP_ID = 334;
 		public static final int SECOND_TRADING_WITH = 30;
@@ -1051,7 +1056,7 @@ public class WidgetID
 		public static final int SECOND_ACCEPT_TEXT = 25;
 	}
 
-	public static class DuelConfig 
+	public static class DuelConfig
 	{
 		public static final int CONFIG_GROUP_IP = 482;
 		public static final int TITLE = 35;
@@ -1061,7 +1066,7 @@ public class WidgetID
 		public static final int OPPONENT_HP = 21;
 	}
 
-	public static class DuelResult 
+	public static class DuelResult
 	{
 		public static final int RESULT_GROUP_ID = 372;
 		public static final int TITLE = 16;
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index aa7438c45e..c86b7fc365 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>client</artifactId>
@@ -215,11 +215,11 @@
 			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>net.runelite</groupId>
-			<artifactId>extended-mixins</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+		<!--		<dependency>
+					<groupId>net.runelite</groupId>
+					<artifactId>extended-mixins</artifactId>
+					<version>${project.version}</version>
+				</dependency>-->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
index b0bb628fed..28420abcb5 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
@@ -1,274 +1,273 @@
-/*
- * Copyright (c) 2018, Tomas Slusny <slusnucky@gmail.com>
- * Copyright (c) 2018, Seth <Sethtroll3@gmail.com>
- * 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.game;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import java.util.Collection;
-import java.util.Collections;
-
-import static net.runelite.api.ItemID.*;
-
-/**
- * Converts untradeable items to it's tradeable counterparts
- */
-public enum ItemMapping
-{
-	// Barrows equipment
-	ITEM_AHRIMS_HOOD(AHRIMS_HOOD, AHRIMS_HOOD_25, AHRIMS_HOOD_50, AHRIMS_HOOD_75, AHRIMS_HOOD_100),
-	ITEM_AHRIMS_ROBETOP(AHRIMS_ROBETOP, AHRIMS_ROBETOP_25, AHRIMS_ROBETOP_50, AHRIMS_ROBETOP_75, AHRIMS_ROBETOP_100),
-	ITEM_AHRIMS_ROBEBOTTOM(AHRIMS_ROBESKIRT, AHRIMS_ROBESKIRT_25, AHRIMS_ROBESKIRT_50, AHRIMS_ROBESKIRT_75, AHRIMS_ROBESKIRT_100),
-	ITEM_AHRIMS_STAFF(AHRIMS_STAFF, AHRIMS_STAFF_25, AHRIMS_STAFF_50, AHRIMS_STAFF_75, AHRIMS_STAFF_100),
-	ITEM_KARILS_COIF(KARILS_COIF, KARILS_COIF_25, KARILS_COIF_50, KARILS_COIF_75, KARILS_COIF_100),
-	ITEM_KARILS_LEATHERTOP(KARILS_LEATHERTOP, KARILS_LEATHERTOP_25, KARILS_LEATHERTOP_50, KARILS_LEATHERTOP_75, KARILS_LEATHERTOP_100),
-	ITEM_KARILS_LEATHERSKIRT(KARILS_LEATHERSKIRT, KARILS_LEATHERSKIRT_25, KARILS_LEATHERSKIRT_50, KARILS_LEATHERSKIRT_75, KARILS_LEATHERSKIRT_100),
-	ITEM_KARILS_CROSSBOW(KARILS_CROSSBOW, KARILS_CROSSBOW_25, KARILS_CROSSBOW_50, KARILS_CROSSBOW_75, KARILS_CROSSBOW_100),
-	ITEM_DHAROKS_HELM(DHAROKS_HELM, DHAROKS_HELM_25, DHAROKS_HELM_50, DHAROKS_HELM_75, DHAROKS_HELM_100),
-	ITEM_DHAROKS_PLATEBODY(DHAROKS_PLATEBODY, DHAROKS_PLATEBODY_25, DHAROKS_PLATEBODY_50, DHAROKS_PLATEBODY_75, DHAROKS_PLATEBODY_100),
-	ITEM_DHAROKS_PLATELEGS(DHAROKS_PLATELEGS, DHAROKS_PLATELEGS_25, DHAROKS_PLATELEGS_50, DHAROKS_PLATELEGS_75, DHAROKS_PLATELEGS_100),
-	ITEM_DHARKS_GREATEAXE(DHAROKS_GREATAXE, DHAROKS_GREATAXE_25, DHAROKS_GREATAXE_50, DHAROKS_GREATAXE_75, DHAROKS_GREATAXE_100),
-	ITEM_GUTHANS_HELM(GUTHANS_HELM, GUTHANS_HELM_25, GUTHANS_HELM_50, GUTHANS_HELM_75, GUTHANS_HELM_100),
-	ITEM_GUTHANS_PLATEBODY(GUTHANS_PLATEBODY, GUTHANS_PLATEBODY_25, GUTHANS_PLATEBODY_50, GUTHANS_PLATEBODY_75, GUTHANS_PLATEBODY_100),
-	ITEM_GUTHANS_CHAINSKIRT(GUTHANS_CHAINSKIRT, GUTHANS_CHAINSKIRT_25, GUTHANS_CHAINSKIRT_50, GUTHANS_CHAINSKIRT_75, GUTHANS_CHAINSKIRT_100),
-	ITEM_GUTHANS_WARSPEAR(GUTHANS_WARSPEAR, GUTHANS_WARSPEAR_25, GUTHANS_WARSPEAR_50, GUTHANS_WARSPEAR_75, GUTHANS_WARSPEAR_100),
-	ITEM_TORAGS_HELM(TORAGS_HELM, TORAGS_HELM_25, TORAGS_HELM_50, TORAGS_HELM_75, TORAGS_HELM_100),
-	ITEM_TORAGS_PLATEBODY(TORAGS_PLATEBODY, TORAGS_PLATEBODY_25, TORAGS_PLATEBODY_50, TORAGS_PLATEBODY_75, TORAGS_PLATEBODY_100),
-	ITEM_TORAGS_PLATELEGS(TORAGS_PLATELEGS, TORAGS_PLATELEGS_25, TORAGS_PLATELEGS_50, TORAGS_PLATELEGS_75, TORAGS_PLATELEGS_100),
-	ITEM_TORAGS_HAMMERS(TORAGS_HAMMERS, TORAGS_HAMMERS_25, TORAGS_HAMMERS_50, TORAGS_HAMMERS_75, TORAGS_HAMMERS_100),
-	ITEM_VERACS_HELM(VERACS_HELM, VERACS_HELM_25, VERACS_HELM_50, VERACS_HELM_75, VERACS_HELM_100),
-	ITEM_VERACS_BRASSARD(VERACS_BRASSARD, VERACS_BRASSARD_25, VERACS_BRASSARD_50, VERACS_BRASSARD_75, VERACS_BRASSARD_100),
-	ITEM_VERACS_PLATESKIRT(VERACS_PLATESKIRT, VERACS_PLATESKIRT_25, VERACS_PLATESKIRT_50, VERACS_PLATESKIRT_75, VERACS_PLATESKIRT_100),
-	ITEM_VERACS_FLAIL(VERACS_FLAIL, VERACS_FLAIL_25, VERACS_FLAIL_50, VERACS_FLAIL_75, VERACS_FLAIL_100),
-
-	// Dragon equipment ornament kits
-	ITEM_DRAGON_SCIMITAR(DRAGON_SCIMITAR, DRAGON_SCIMITAR_OR),
-	ITEM_DRAGON_SCIMITAR_ORNAMENT_KIT(DRAGON_SCIMITAR_ORNAMENT_KIT, DRAGON_SCIMITAR_OR),
-	ITEM_DRAGON_DEFENDER(DRAGON_DEFENDER_ORNAMENT_KIT, DRAGON_DEFENDER_T),
-	ITEM_DRAGON_PICKAXE(DRAGON_PICKAXE, DRAGON_PICKAXE_12797),
-	ITEM_DRAGON_KITESHIELD(DRAGON_KITESHIELD, DRAGON_KITESHIELD_G),
-	ITEM_DRAGON_KITESHIELD_ORNAMENT_KIT(DRAGON_KITESHIELD_ORNAMENT_KIT, DRAGON_KITESHIELD_G),
-	ITEM_DRAGON_FULL_HELM(DRAGON_FULL_HELM, DRAGON_FULL_HELM_G),
-	ITEM_DRAGON_FULL_HELM_ORNAMENT_KIT(DRAGON_FULL_HELM_ORNAMENT_KIT, DRAGON_FULL_HELM_G),
-	ITEM_DRAGON_CHAINBODY(DRAGON_CHAINBODY_3140, DRAGON_CHAINBODY_G),
-	ITEM_DRAGON_CHAINBODY_ORNAMENT_KIT(DRAGON_CHAINBODY_ORNAMENT_KIT, DRAGON_CHAINBODY_G),
-	ITEM_DRAGON_PLATEBODY(DRAGON_PLATEBODY, DRAGON_PLATEBODY_G),
-	ITEM_DRAGON_PLATEBODY_ORNAMENT_KIT(DRAGON_PLATEBODY_ORNAMENT_KIT, DRAGON_PLATEBODY_G),
-	ITEM_DRAGON_PLATESKIRT(DRAGON_PLATESKIRT, DRAGON_PLATESKIRT_G),
-	ITEM_DRAGON_SKIRT_ORNAMENT_KIT(DRAGON_LEGSSKIRT_ORNAMENT_KIT, DRAGON_PLATESKIRT_G),
-	ITEM_DRAGON_PLATELEGS(DRAGON_PLATELEGS, DRAGON_PLATELEGS_G),
-	ITEM_DRAGON_LEGS_ORNAMENT_KIT(DRAGON_LEGSSKIRT_ORNAMENT_KIT, DRAGON_PLATELEGS_G),
-	ITEM_DRAGON_SQ_SHIELD(DRAGON_SQ_SHIELD, DRAGON_SQ_SHIELD_G),
-	ITEM_DRAGON_SQ_SHIELD_ORNAMENT_KIT(DRAGON_SQ_SHIELD_ORNAMENT_KIT, DRAGON_SQ_SHIELD_G),
-	ITEM_DRAGON_BOOTS(DRAGON_BOOTS, DRAGON_BOOTS_G),
-	ITEM_DRAGON_BOOTS_ORNAMENT_KIT(DRAGON_BOOTS_ORNAMENT_KIT, DRAGON_BOOTS_G),
-
-	// Godsword ornament kits
-	ITEM_ARMADYL_GODSWORD(ARMADYL_GODSWORD, ARMADYL_GODSWORD_OR),
-	ITEM_ARMADYL_GODSWORD_ORNAMENT_KIT(ARMADYL_GODSWORD_ORNAMENT_KIT, ARMADYL_GODSWORD_OR),
-	ITEM_BANDOS_GODSWORD(BANDOS_GODSWORD, BANDOS_GODSWORD_OR),
-	ITEM_BANDOS_GODSWORD_ORNAMENT_KIT(BANDOS_GODSWORD_ORNAMENT_KIT, BANDOS_GODSWORD_OR),
-	ITEM_ZAMORAK_GODSWORD(ZAMORAK_GODSWORD, ZAMORAK_GODSWORD_OR),
-	ITEM_ZAMORAK_GODSWORD_ORNAMENT_KIT(ZAMORAK_GODSWORD_ORNAMENT_KIT, ZAMORAK_GODSWORD_OR),
-	ITEM_SARADOMIN_GODSWORD(SARADOMIN_GODSWORD, SARADOMIN_GODSWORD_OR),
-	ITEM_SARADOMIN_GODSWORD_ORNAMENT_KIT(SARADOMIN_GODSWORD_ORNAMENT_KIT, SARADOMIN_GODSWORD_OR),
-
-	// Jewellery ornament kits
-	ITEM_AMULET_OF_TORTURE(AMULET_OF_TORTURE, AMULET_OF_TORTURE_OR),
-	ITEM_TORTURE_ORNAMENT_KIT(TORTURE_ORNAMENT_KIT, AMULET_OF_TORTURE_OR),
-	ITEM_NECKLACE_OF_ANGUISH(NECKLACE_OF_ANGUISH, NECKLACE_OF_ANGUISH_OR),
-	ITEM_ANGUISH_ORNAMENT_KIT(ANGUISH_ORNAMENT_KIT, NECKLACE_OF_ANGUISH_OR),
-	ITEM_OCCULT_NECKLACE(OCCULT_NECKLACE, OCCULT_NECKLACE_OR),
-	ITEM_OCCULT_ORNAMENT_KIT(OCCULT_ORNAMENT_KIT, OCCULT_NECKLACE_OR),
-	ITE_AMULET_OF_FURY(AMULET_OF_FURY, AMULET_OF_FURY_OR),
-	ITE_FURY_ORNAMENT_KIT(FURY_ORNAMENT_KIT, AMULET_OF_FURY_OR),
-	ITEM_TORMENTED_BRACELET(TORMENTED_BRACELET, TORMENTED_BRACELET_OR),
-	ITEM_TORMENTED_ORNAMENT_KIT(TORMENTED_ORNAMENT_KIT, TORMENTED_BRACELET_OR),
-
-	// Ensouled heads
-	ITEM_ENSOULED_GOBLIN_HEAD(ENSOULED_GOBLIN_HEAD_13448, ENSOULED_GOBLIN_HEAD),
-	ITEM_ENSOULED_MONKEY_HEAD(ENSOULED_MONKEY_HEAD_13451, ENSOULED_MONKEY_HEAD),
-	ITEM_ENSOULED_IMP_HEAD(ENSOULED_IMP_HEAD_13454, ENSOULED_IMP_HEAD),
-	ITEM_ENSOULED_MINOTAUR_HEAD(ENSOULED_MINOTAUR_HEAD_13457, ENSOULED_MINOTAUR_HEAD),
-	ITEM_ENSOULED_SCORPION_HEAD(ENSOULED_SCORPION_HEAD_13460, ENSOULED_SCORPION_HEAD),
-	ITEM_ENSOULED_BEAR_HEAD(ENSOULED_BEAR_HEAD_13463, ENSOULED_BEAR_HEAD),
-	ITEM_ENSOULED_UNICORN_HEAD(ENSOULED_UNICORN_HEAD_13466, ENSOULED_UNICORN_HEAD),
-	ITEM_ENSOULED_DOG_HEAD(ENSOULED_DOG_HEAD_13469, ENSOULED_DOG_HEAD),
-	ITEM_ENSOULED_CHAOS_DRUID_HEAD(ENSOULED_CHAOS_DRUID_HEAD_13472, ENSOULED_CHAOS_DRUID_HEAD),
-	ITEM_ENSOULED_GIANT_HEAD(ENSOULED_GIANT_HEAD_13475, ENSOULED_GIANT_HEAD),
-	ITEM_ENSOULED_OGRE_HEAD(ENSOULED_OGRE_HEAD_13478, ENSOULED_OGRE_HEAD),
-	ITEM_ENSOULED_ELF_HEAD(ENSOULED_ELF_HEAD_13481, ENSOULED_ELF_HEAD),
-	ITEM_ENSOULED_TROLL_HEAD(ENSOULED_TROLL_HEAD_13484, ENSOULED_TROLL_HEAD),
-	ITEM_ENSOULED_HORROR_HEAD(ENSOULED_HORROR_HEAD_13487, ENSOULED_HORROR_HEAD),
-	ITEM_ENSOULED_KALPHITE_HEAD(ENSOULED_KALPHITE_HEAD_13490, ENSOULED_KALPHITE_HEAD),
-	ITEM_ENSOULED_DAGANNOTH_HEAD(ENSOULED_DAGANNOTH_HEAD_13493, ENSOULED_DAGANNOTH_HEAD),
-	ITEM_ENSOULED_BLOODVELD_HEAD(ENSOULED_BLOODVELD_HEAD_13496, ENSOULED_BLOODVELD_HEAD),
-	ITEM_ENSOULED_TZHAAR_HEAD(ENSOULED_TZHAAR_HEAD_13499, ENSOULED_TZHAAR_HEAD),
-	ITEM_ENSOULED_DEMON_HEAD(ENSOULED_DEMON_HEAD_13502, ENSOULED_DEMON_HEAD),
-	ITEM_ENSOULED_AVIANSIE_HEAD(ENSOULED_AVIANSIE_HEAD_13505, ENSOULED_AVIANSIE_HEAD),
-	ITEM_ENSOULED_ABYSSAL_HEAD(ENSOULED_ABYSSAL_HEAD_13508, ENSOULED_ABYSSAL_HEAD),
-	ITEM_ENSOULED_DRAGON_HEAD(ENSOULED_DRAGON_HEAD_13511, ENSOULED_DRAGON_HEAD),
-
-	// Imbued rings
-	ITEM_BERSERKER_RING(BERSERKER_RING, BERSERKER_RING_I),
-	ITEM_SEERS_RING(SEERS_RING, SEERS_RING_I),
-	ITEM_WARRIOR_RING(WARRIOR_RING, WARRIOR_RING_I),
-	ITEM_ARCHERS_RING(ARCHERS_RING, ARCHERS_RING_I),
-	ITEM_TREASONOUS_RING(TREASONOUS_RING, TREASONOUS_RING_I),
-	ITEM_TYRANNICAL_RING(TYRANNICAL_RING, TYRANNICAL_RING_I),
-	ITEM_RING_OF_THE_GODS(RING_OF_THE_GODS, RING_OF_THE_GODS_I),
-	ITEM_RING_OF_SUFFERING(RING_OF_SUFFERING, RING_OF_SUFFERING_I, RING_OF_SUFFERING_R, RING_OF_SUFFERING_RI),
-	ITEM_GRANITE_RING(GRANITE_RING, GRANITE_RING_I),
-
-	// Bounty hunter
-	ITEM_GRANITE_MAUL(GRANITE_MAUL, GRANITE_MAUL_12848),
-	ITEM_MAGIC_SHORTBOW(MAGIC_SHORTBOW, MAGIC_SHORTBOW_I),
-	ITEM_SARADOMINS_BLESSED_SWORD(SARADOMINS_TEAR, SARADOMINS_BLESSED_SWORD),
-
-	// Jewellery with charges
-	ITEM_RING_OF_WEALTH(RING_OF_WEALTH, RING_OF_WEALTH_I, RING_OF_WEALTH_1, RING_OF_WEALTH_I1, RING_OF_WEALTH_2, RING_OF_WEALTH_I2, RING_OF_WEALTH_3, RING_OF_WEALTH_I3, RING_OF_WEALTH_4, RING_OF_WEALTH_I4, RING_OF_WEALTH_I5),
-	ITEM_AMULET_OF_GLORY(AMULET_OF_GLORY, AMULET_OF_GLORY1, AMULET_OF_GLORY2, AMULET_OF_GLORY3, AMULET_OF_GLORY5),
-	ITEM_AMULET_OF_GLORY_T(AMULET_OF_GLORY_T, AMULET_OF_GLORY_T1, AMULET_OF_GLORY_T2, AMULET_OF_GLORY_T3, AMULET_OF_GLORY_T5),
-	ITEM_SKILLS_NECKLACE(SKILLS_NECKLACE, SKILLS_NECKLACE1, SKILLS_NECKLACE2, SKILLS_NECKLACE3, SKILLS_NECKLACE5),
-	ITEM_RING_OF_DUELING(RING_OF_DUELING8, RING_OF_DUELING1, RING_OF_DUELING2, RING_OF_DUELING3, RING_OF_DUELING4, RING_OF_DUELING5, RING_OF_DUELING6, RING_OF_DUELING7),
-	ITEM_GAMES_NECKLACE(GAMES_NECKLACE8, GAMES_NECKLACE1, GAMES_NECKLACE2, GAMES_NECKLACE3, GAMES_NECKLACE4, GAMES_NECKLACE5, GAMES_NECKLACE6, GAMES_NECKLACE7),
-
-	// Degradable/charged weaponry/armour
-	ITEM_ABYSSAL_WHIP(ABYSSAL_WHIP, VOLCANIC_ABYSSAL_WHIP, FROZEN_ABYSSAL_WHIP),
-	ITEM_KRAKEN_TENTACLE(KRAKEN_TENTACLE, ABYSSAL_TENTACLE),
-	ITEM_TRIDENT_OF_THE_SEAS(UNCHARGED_TRIDENT, TRIDENT_OF_THE_SEAS),
-	ITEM_TRIDENT_OF_THE_SEAS_E(UNCHARGED_TRIDENT_E, TRIDENT_OF_THE_SEAS_E),
-	ITEM_TRIDENT_OF_THE_SWAMP(UNCHARGED_TOXIC_TRIDENT, TRIDENT_OF_THE_SWAMP),
-	ITEM_TRIDENT_OF_THE_SWAMP_E(UNCHARGED_TOXIC_TRIDENT_E, TRIDENT_OF_THE_SWAMP_E),
-	ITEM_TOXIC_BLOWPIPE(TOXIC_BLOWPIPE_EMPTY, TOXIC_BLOWPIPE),
-	ITEM_TOXIC_STAFF_OFF_THE_DEAD(TOXIC_STAFF_UNCHARGED, TOXIC_STAFF_OF_THE_DEAD),
-	ITEM_SERPENTINE_HELM(SERPENTINE_HELM_UNCHARGED, SERPENTINE_HELM, TANZANITE_HELM_UNCHARGED, TANZANITE_HELM, MAGMA_HELM_UNCHARGED, MAGMA_HELM),
-	ITEM_DRAGONFIRE_SHIELD(DRAGONFIRE_SHIELD_11284, DRAGONFIRE_SHIELD),
-	ITEM_DRAGONFIRE_WARD(DRAGONFIRE_WARD_22003, DRAGONFIRE_WARD),
-	ITEM_ANCIENT_WYVERN_SHIELD(ANCIENT_WYVERN_SHIELD_21634, ANCIENT_WYVERN_SHIELD),
-	ITEM_SANGUINESTI_STAFF(SANGUINESTI_STAFF_UNCHARGED, SANGUINESTI_STAFF),
-	ITEM_SCYTHE_OF_VITUR(SCYTHE_OF_VITUR_UNCHARGED, SCYTHE_OF_VITUR),
-	ITEM_TOME_OF_FIRE(TOME_OF_FIRE_EMPTY, TOME_OF_FIRE),
-	ITEM_CRAWS_BOW(CRAWS_BOW_U, CRAWS_BOW),
-	ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE),
-	ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE),
-
-	// Infinity colour kits
-	ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP),
-	ITEM_INFINITY_TOP_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_TOP),
-	ITEM_INFINITY_TOP_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_TOP),
-	ITEM_INFINITY_BOTTOMS(INFINITY_BOTTOMS, INFINITY_BOTTOMS_20575, DARK_INFINITY_BOTTOMS, LIGHT_INFINITY_BOTTOMS),
-	ITEM_INFINITY_BOTTOMS_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_BOTTOMS),
-	ITEM_INFINITY_BOTTOMS_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_BOTTOMS),
-	ITEM_INFINITY_HAT(INFINITY_HAT, DARK_INFINITY_HAT, LIGHT_INFINITY_HAT),
-	ITEM_INFINITY_HAT_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_HAT),
-	ITEM_INFINITY_HAT_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_HAT),
-
-	// Miscellaneous ornament kits
-	ITEM_DARK_BOW(DARK_BOW, DARK_BOW_12765, DARK_BOW_12766, DARK_BOW_12767, DARK_BOW_12768, DARK_BOW_20408),
-	ITEM_ODIUM_WARD(ODIUM_WARD, ODIUM_WARD_12807),
-	ITEM_MALEDICTION_WARD(MALEDICTION_WARD, MALEDICTION_WARD_12806),
-	ITEM_STEAM_BATTLESTAFF(STEAM_BATTLESTAFF, STEAM_BATTLESTAFF_12795),
-	ITEM_LAVA_BATTLESTAFF(LAVA_BATTLESTAFF, LAVA_BATTLESTAFF_21198),
-
-	// Slayer helm/black mask
-	ITEM_BLACK_MASK(
-		BLACK_MASK, BLACK_MASK_I, BLACK_MASK_1, BLACK_MASK_1_I, BLACK_MASK_2, BLACK_MASK_2_I, BLACK_MASK_3, BLACK_MASK_3_I, BLACK_MASK_4, BLACK_MASK_4_I, BLACK_MASK_5,
-		BLACK_MASK_5_I, BLACK_MASK_6, BLACK_MASK_6_I, BLACK_MASK_7, BLACK_MASK_7_I, BLACK_MASK_8, BLACK_MASK_8_I, BLACK_MASK_9, BLACK_MASK_9_I, BLACK_MASK_10_I,
-		SLAYER_HELMET, SLAYER_HELMET_I, BLACK_SLAYER_HELMET, BLACK_SLAYER_HELMET_I, PURPLE_SLAYER_HELMET, PURPLE_SLAYER_HELMET_I, RED_SLAYER_HELMET, RED_SLAYER_HELMET_I,
-		GREEN_SLAYER_HELMET, GREEN_SLAYER_HELMET_I, TURQUOISE_SLAYER_HELMET, TURQUOISE_SLAYER_HELMET_I, HYDRA_SLAYER_HELMET, HYDRA_SLAYER_HELMET_I),
-
-	// Pharaoh's Sceptres
-	ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1),
-	ITEM_PHARAOHS_SCEPTRE_2(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_2),
-	ITEM_PHARAOHS_SCEPTRE_4(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_4),
-	ITEM_PHARAOHS_SCEPTRE_5(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_5),
-	ITEM_PHARAOHS_SCEPTRE_6(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_6),
-	ITEM_PHARAOHS_SCEPTRE_7(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_7),
-	ITEM_PHARAOHS_SCEPTRE_8(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_8),
-
-	// Revertible items
-	ITEM_HYDRA_LEATHER(HYDRA_LEATHER, FEROCIOUS_GLOVES),
-	ITEM_HYDRA_TAIL(HYDRA_TAIL, BONECRUSHER_NECKLACE),
-	ITEM_DRAGONBONE_NECKLACE(DRAGONBONE_NECKLACE, BONECRUSHER_NECKLACE),
-	ITEM_BOTTOMLESS_COMPOST_BUCKET(BOTTOMLESS_COMPOST_BUCKET, BOTTOMLESS_COMPOST_BUCKET_22997);
-
-	private static final Multimap<Integer, Integer> MAPPINGS = HashMultimap.create();
-	private final int tradeableItem;
-	private final int[] untradableItems;
-
-	static
-	{
-		for (final ItemMapping item : values())
-		{
-			for (int itemId : item.untradableItems)
-			{
-				MAPPINGS.put(itemId, item.tradeableItem);
-			}
-		}
-	}
-
-	ItemMapping(int tradeableItem, int... untradableItems)
-	{
-		this.tradeableItem = tradeableItem;
-		this.untradableItems = untradableItems;
-	}
-
-	/**
-	 * Get collection of items that are mapped from single item id.
-	 *
-	 * @param itemId the item id
-	 * @return the collection
-	 */
-	public static Collection<Integer> map(int itemId)
-	{
-		final Collection<Integer> mapping = MAPPINGS.get(itemId);
-
-		if (mapping == null || mapping.isEmpty())
-		{
-			return Collections.singleton(itemId);
-		}
-
-		return mapping;
-	}
-
-	/**
-	 * Map an item from its untradeable version to its tradeable version
-	 *
-	 * @param itemId
-	 * @return
-	 */
-	public static int mapFirst(int itemId)
-	{
-		final Collection<Integer> mapping = MAPPINGS.get(itemId);
-
-		if (mapping == null || mapping.isEmpty())
-		{
-			return itemId;
-		}
-
-		return mapping.iterator().next();
-	}
+/*
+ * Copyright (c) 2018, Tomas Slusny <slusnucky@gmail.com>
+ * Copyright (c) 2018, Seth <Sethtroll3@gmail.com>
+ * 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.game;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import java.util.Collection;
+import java.util.Collections;
+import static net.runelite.api.ItemID.*;
+
+/**
+ * Converts untradeable items to it's tradeable counterparts
+ */
+public enum ItemMapping
+{
+	// Barrows equipment
+	ITEM_AHRIMS_HOOD(AHRIMS_HOOD, AHRIMS_HOOD_25, AHRIMS_HOOD_50, AHRIMS_HOOD_75, AHRIMS_HOOD_100),
+	ITEM_AHRIMS_ROBETOP(AHRIMS_ROBETOP, AHRIMS_ROBETOP_25, AHRIMS_ROBETOP_50, AHRIMS_ROBETOP_75, AHRIMS_ROBETOP_100),
+	ITEM_AHRIMS_ROBEBOTTOM(AHRIMS_ROBESKIRT, AHRIMS_ROBESKIRT_25, AHRIMS_ROBESKIRT_50, AHRIMS_ROBESKIRT_75, AHRIMS_ROBESKIRT_100),
+	ITEM_AHRIMS_STAFF(AHRIMS_STAFF, AHRIMS_STAFF_25, AHRIMS_STAFF_50, AHRIMS_STAFF_75, AHRIMS_STAFF_100),
+	ITEM_KARILS_COIF(KARILS_COIF, KARILS_COIF_25, KARILS_COIF_50, KARILS_COIF_75, KARILS_COIF_100),
+	ITEM_KARILS_LEATHERTOP(KARILS_LEATHERTOP, KARILS_LEATHERTOP_25, KARILS_LEATHERTOP_50, KARILS_LEATHERTOP_75, KARILS_LEATHERTOP_100),
+	ITEM_KARILS_LEATHERSKIRT(KARILS_LEATHERSKIRT, KARILS_LEATHERSKIRT_25, KARILS_LEATHERSKIRT_50, KARILS_LEATHERSKIRT_75, KARILS_LEATHERSKIRT_100),
+	ITEM_KARILS_CROSSBOW(KARILS_CROSSBOW, KARILS_CROSSBOW_25, KARILS_CROSSBOW_50, KARILS_CROSSBOW_75, KARILS_CROSSBOW_100),
+	ITEM_DHAROKS_HELM(DHAROKS_HELM, DHAROKS_HELM_25, DHAROKS_HELM_50, DHAROKS_HELM_75, DHAROKS_HELM_100),
+	ITEM_DHAROKS_PLATEBODY(DHAROKS_PLATEBODY, DHAROKS_PLATEBODY_25, DHAROKS_PLATEBODY_50, DHAROKS_PLATEBODY_75, DHAROKS_PLATEBODY_100),
+	ITEM_DHAROKS_PLATELEGS(DHAROKS_PLATELEGS, DHAROKS_PLATELEGS_25, DHAROKS_PLATELEGS_50, DHAROKS_PLATELEGS_75, DHAROKS_PLATELEGS_100),
+	ITEM_DHARKS_GREATEAXE(DHAROKS_GREATAXE, DHAROKS_GREATAXE_25, DHAROKS_GREATAXE_50, DHAROKS_GREATAXE_75, DHAROKS_GREATAXE_100),
+	ITEM_GUTHANS_HELM(GUTHANS_HELM, GUTHANS_HELM_25, GUTHANS_HELM_50, GUTHANS_HELM_75, GUTHANS_HELM_100),
+	ITEM_GUTHANS_PLATEBODY(GUTHANS_PLATEBODY, GUTHANS_PLATEBODY_25, GUTHANS_PLATEBODY_50, GUTHANS_PLATEBODY_75, GUTHANS_PLATEBODY_100),
+	ITEM_GUTHANS_CHAINSKIRT(GUTHANS_CHAINSKIRT, GUTHANS_CHAINSKIRT_25, GUTHANS_CHAINSKIRT_50, GUTHANS_CHAINSKIRT_75, GUTHANS_CHAINSKIRT_100),
+	ITEM_GUTHANS_WARSPEAR(GUTHANS_WARSPEAR, GUTHANS_WARSPEAR_25, GUTHANS_WARSPEAR_50, GUTHANS_WARSPEAR_75, GUTHANS_WARSPEAR_100),
+	ITEM_TORAGS_HELM(TORAGS_HELM, TORAGS_HELM_25, TORAGS_HELM_50, TORAGS_HELM_75, TORAGS_HELM_100),
+	ITEM_TORAGS_PLATEBODY(TORAGS_PLATEBODY, TORAGS_PLATEBODY_25, TORAGS_PLATEBODY_50, TORAGS_PLATEBODY_75, TORAGS_PLATEBODY_100),
+	ITEM_TORAGS_PLATELEGS(TORAGS_PLATELEGS, TORAGS_PLATELEGS_25, TORAGS_PLATELEGS_50, TORAGS_PLATELEGS_75, TORAGS_PLATELEGS_100),
+	ITEM_TORAGS_HAMMERS(TORAGS_HAMMERS, TORAGS_HAMMERS_25, TORAGS_HAMMERS_50, TORAGS_HAMMERS_75, TORAGS_HAMMERS_100),
+	ITEM_VERACS_HELM(VERACS_HELM, VERACS_HELM_25, VERACS_HELM_50, VERACS_HELM_75, VERACS_HELM_100),
+	ITEM_VERACS_BRASSARD(VERACS_BRASSARD, VERACS_BRASSARD_25, VERACS_BRASSARD_50, VERACS_BRASSARD_75, VERACS_BRASSARD_100),
+	ITEM_VERACS_PLATESKIRT(VERACS_PLATESKIRT, VERACS_PLATESKIRT_25, VERACS_PLATESKIRT_50, VERACS_PLATESKIRT_75, VERACS_PLATESKIRT_100),
+	ITEM_VERACS_FLAIL(VERACS_FLAIL, VERACS_FLAIL_25, VERACS_FLAIL_50, VERACS_FLAIL_75, VERACS_FLAIL_100),
+
+	// Dragon equipment ornament kits
+	ITEM_DRAGON_SCIMITAR(DRAGON_SCIMITAR, DRAGON_SCIMITAR_OR),
+	ITEM_DRAGON_SCIMITAR_ORNAMENT_KIT(DRAGON_SCIMITAR_ORNAMENT_KIT, DRAGON_SCIMITAR_OR),
+	ITEM_DRAGON_DEFENDER(DRAGON_DEFENDER_ORNAMENT_KIT, DRAGON_DEFENDER_T),
+	ITEM_DRAGON_PICKAXE(DRAGON_PICKAXE, DRAGON_PICKAXE_12797),
+	ITEM_DRAGON_KITESHIELD(DRAGON_KITESHIELD, DRAGON_KITESHIELD_G),
+	ITEM_DRAGON_KITESHIELD_ORNAMENT_KIT(DRAGON_KITESHIELD_ORNAMENT_KIT, DRAGON_KITESHIELD_G),
+	ITEM_DRAGON_FULL_HELM(DRAGON_FULL_HELM, DRAGON_FULL_HELM_G),
+	ITEM_DRAGON_FULL_HELM_ORNAMENT_KIT(DRAGON_FULL_HELM_ORNAMENT_KIT, DRAGON_FULL_HELM_G),
+	ITEM_DRAGON_CHAINBODY(DRAGON_CHAINBODY_3140, DRAGON_CHAINBODY_G),
+	ITEM_DRAGON_CHAINBODY_ORNAMENT_KIT(DRAGON_CHAINBODY_ORNAMENT_KIT, DRAGON_CHAINBODY_G),
+	ITEM_DRAGON_PLATEBODY(DRAGON_PLATEBODY, DRAGON_PLATEBODY_G),
+	ITEM_DRAGON_PLATEBODY_ORNAMENT_KIT(DRAGON_PLATEBODY_ORNAMENT_KIT, DRAGON_PLATEBODY_G),
+	ITEM_DRAGON_PLATESKIRT(DRAGON_PLATESKIRT, DRAGON_PLATESKIRT_G),
+	ITEM_DRAGON_SKIRT_ORNAMENT_KIT(DRAGON_LEGSSKIRT_ORNAMENT_KIT, DRAGON_PLATESKIRT_G),
+	ITEM_DRAGON_PLATELEGS(DRAGON_PLATELEGS, DRAGON_PLATELEGS_G),
+	ITEM_DRAGON_LEGS_ORNAMENT_KIT(DRAGON_LEGSSKIRT_ORNAMENT_KIT, DRAGON_PLATELEGS_G),
+	ITEM_DRAGON_SQ_SHIELD(DRAGON_SQ_SHIELD, DRAGON_SQ_SHIELD_G),
+	ITEM_DRAGON_SQ_SHIELD_ORNAMENT_KIT(DRAGON_SQ_SHIELD_ORNAMENT_KIT, DRAGON_SQ_SHIELD_G),
+	ITEM_DRAGON_BOOTS(DRAGON_BOOTS, DRAGON_BOOTS_G),
+	ITEM_DRAGON_BOOTS_ORNAMENT_KIT(DRAGON_BOOTS_ORNAMENT_KIT, DRAGON_BOOTS_G),
+
+	// Godsword ornament kits
+	ITEM_ARMADYL_GODSWORD(ARMADYL_GODSWORD, ARMADYL_GODSWORD_OR),
+	ITEM_ARMADYL_GODSWORD_ORNAMENT_KIT(ARMADYL_GODSWORD_ORNAMENT_KIT, ARMADYL_GODSWORD_OR),
+	ITEM_BANDOS_GODSWORD(BANDOS_GODSWORD, BANDOS_GODSWORD_OR),
+	ITEM_BANDOS_GODSWORD_ORNAMENT_KIT(BANDOS_GODSWORD_ORNAMENT_KIT, BANDOS_GODSWORD_OR),
+	ITEM_ZAMORAK_GODSWORD(ZAMORAK_GODSWORD, ZAMORAK_GODSWORD_OR),
+	ITEM_ZAMORAK_GODSWORD_ORNAMENT_KIT(ZAMORAK_GODSWORD_ORNAMENT_KIT, ZAMORAK_GODSWORD_OR),
+	ITEM_SARADOMIN_GODSWORD(SARADOMIN_GODSWORD, SARADOMIN_GODSWORD_OR),
+	ITEM_SARADOMIN_GODSWORD_ORNAMENT_KIT(SARADOMIN_GODSWORD_ORNAMENT_KIT, SARADOMIN_GODSWORD_OR),
+
+	// Jewellery ornament kits
+	ITEM_AMULET_OF_TORTURE(AMULET_OF_TORTURE, AMULET_OF_TORTURE_OR),
+	ITEM_TORTURE_ORNAMENT_KIT(TORTURE_ORNAMENT_KIT, AMULET_OF_TORTURE_OR),
+	ITEM_NECKLACE_OF_ANGUISH(NECKLACE_OF_ANGUISH, NECKLACE_OF_ANGUISH_OR),
+	ITEM_ANGUISH_ORNAMENT_KIT(ANGUISH_ORNAMENT_KIT, NECKLACE_OF_ANGUISH_OR),
+	ITEM_OCCULT_NECKLACE(OCCULT_NECKLACE, OCCULT_NECKLACE_OR),
+	ITEM_OCCULT_ORNAMENT_KIT(OCCULT_ORNAMENT_KIT, OCCULT_NECKLACE_OR),
+	ITEM_AMULET_OF_FURY(AMULET_OF_FURY, AMULET_OF_FURY_OR),
+	ITEM_FURY_ORNAMENT_KIT(FURY_ORNAMENT_KIT, AMULET_OF_FURY_OR),
+	ITEM_TORMENTED_BRACELET(TORMENTED_BRACELET, TORMENTED_BRACELET_OR),
+	ITEM_TORMENTED_ORNAMENT_KIT(TORMENTED_ORNAMENT_KIT, TORMENTED_BRACELET_OR),
+
+	// Ensouled heads
+	ITEM_ENSOULED_GOBLIN_HEAD(ENSOULED_GOBLIN_HEAD_13448, ENSOULED_GOBLIN_HEAD),
+	ITEM_ENSOULED_MONKEY_HEAD(ENSOULED_MONKEY_HEAD_13451, ENSOULED_MONKEY_HEAD),
+	ITEM_ENSOULED_IMP_HEAD(ENSOULED_IMP_HEAD_13454, ENSOULED_IMP_HEAD),
+	ITEM_ENSOULED_MINOTAUR_HEAD(ENSOULED_MINOTAUR_HEAD_13457, ENSOULED_MINOTAUR_HEAD),
+	ITEM_ENSOULED_SCORPION_HEAD(ENSOULED_SCORPION_HEAD_13460, ENSOULED_SCORPION_HEAD),
+	ITEM_ENSOULED_BEAR_HEAD(ENSOULED_BEAR_HEAD_13463, ENSOULED_BEAR_HEAD),
+	ITEM_ENSOULED_UNICORN_HEAD(ENSOULED_UNICORN_HEAD_13466, ENSOULED_UNICORN_HEAD),
+	ITEM_ENSOULED_DOG_HEAD(ENSOULED_DOG_HEAD_13469, ENSOULED_DOG_HEAD),
+	ITEM_ENSOULED_CHAOS_DRUID_HEAD(ENSOULED_CHAOS_DRUID_HEAD_13472, ENSOULED_CHAOS_DRUID_HEAD),
+	ITEM_ENSOULED_GIANT_HEAD(ENSOULED_GIANT_HEAD_13475, ENSOULED_GIANT_HEAD),
+	ITEM_ENSOULED_OGRE_HEAD(ENSOULED_OGRE_HEAD_13478, ENSOULED_OGRE_HEAD),
+	ITEM_ENSOULED_ELF_HEAD(ENSOULED_ELF_HEAD_13481, ENSOULED_ELF_HEAD),
+	ITEM_ENSOULED_TROLL_HEAD(ENSOULED_TROLL_HEAD_13484, ENSOULED_TROLL_HEAD),
+	ITEM_ENSOULED_HORROR_HEAD(ENSOULED_HORROR_HEAD_13487, ENSOULED_HORROR_HEAD),
+	ITEM_ENSOULED_KALPHITE_HEAD(ENSOULED_KALPHITE_HEAD_13490, ENSOULED_KALPHITE_HEAD),
+	ITEM_ENSOULED_DAGANNOTH_HEAD(ENSOULED_DAGANNOTH_HEAD_13493, ENSOULED_DAGANNOTH_HEAD),
+	ITEM_ENSOULED_BLOODVELD_HEAD(ENSOULED_BLOODVELD_HEAD_13496, ENSOULED_BLOODVELD_HEAD),
+	ITEM_ENSOULED_TZHAAR_HEAD(ENSOULED_TZHAAR_HEAD_13499, ENSOULED_TZHAAR_HEAD),
+	ITEM_ENSOULED_DEMON_HEAD(ENSOULED_DEMON_HEAD_13502, ENSOULED_DEMON_HEAD),
+	ITEM_ENSOULED_AVIANSIE_HEAD(ENSOULED_AVIANSIE_HEAD_13505, ENSOULED_AVIANSIE_HEAD),
+	ITEM_ENSOULED_ABYSSAL_HEAD(ENSOULED_ABYSSAL_HEAD_13508, ENSOULED_ABYSSAL_HEAD),
+	ITEM_ENSOULED_DRAGON_HEAD(ENSOULED_DRAGON_HEAD_13511, ENSOULED_DRAGON_HEAD),
+
+	// Imbued rings
+	ITEM_BERSERKER_RING(BERSERKER_RING, BERSERKER_RING_I),
+	ITEM_SEERS_RING(SEERS_RING, SEERS_RING_I),
+	ITEM_WARRIOR_RING(WARRIOR_RING, WARRIOR_RING_I),
+	ITEM_ARCHERS_RING(ARCHERS_RING, ARCHERS_RING_I),
+	ITEM_TREASONOUS_RING(TREASONOUS_RING, TREASONOUS_RING_I),
+	ITEM_TYRANNICAL_RING(TYRANNICAL_RING, TYRANNICAL_RING_I),
+	ITEM_RING_OF_THE_GODS(RING_OF_THE_GODS, RING_OF_THE_GODS_I),
+	ITEM_RING_OF_SUFFERING(RING_OF_SUFFERING, RING_OF_SUFFERING_I, RING_OF_SUFFERING_R, RING_OF_SUFFERING_RI),
+	ITEM_GRANITE_RING(GRANITE_RING, GRANITE_RING_I),
+
+	// Bounty hunter
+	ITEM_GRANITE_MAUL(GRANITE_MAUL, GRANITE_MAUL_12848),
+	ITEM_MAGIC_SHORTBOW(MAGIC_SHORTBOW, MAGIC_SHORTBOW_I),
+	ITEM_SARADOMINS_BLESSED_SWORD(SARADOMINS_TEAR, SARADOMINS_BLESSED_SWORD),
+
+	// Jewellery with charges
+	ITEM_RING_OF_WEALTH(RING_OF_WEALTH, RING_OF_WEALTH_I, RING_OF_WEALTH_1, RING_OF_WEALTH_I1, RING_OF_WEALTH_2, RING_OF_WEALTH_I2, RING_OF_WEALTH_3, RING_OF_WEALTH_I3, RING_OF_WEALTH_4, RING_OF_WEALTH_I4, RING_OF_WEALTH_I5),
+	ITEM_AMULET_OF_GLORY(AMULET_OF_GLORY, AMULET_OF_GLORY1, AMULET_OF_GLORY2, AMULET_OF_GLORY3, AMULET_OF_GLORY5),
+	ITEM_AMULET_OF_GLORY_T(AMULET_OF_GLORY_T, AMULET_OF_GLORY_T1, AMULET_OF_GLORY_T2, AMULET_OF_GLORY_T3, AMULET_OF_GLORY_T5),
+	ITEM_SKILLS_NECKLACE(SKILLS_NECKLACE, SKILLS_NECKLACE1, SKILLS_NECKLACE2, SKILLS_NECKLACE3, SKILLS_NECKLACE5),
+	ITEM_RING_OF_DUELING(RING_OF_DUELING8, RING_OF_DUELING1, RING_OF_DUELING2, RING_OF_DUELING3, RING_OF_DUELING4, RING_OF_DUELING5, RING_OF_DUELING6, RING_OF_DUELING7),
+	ITEM_GAMES_NECKLACE(GAMES_NECKLACE8, GAMES_NECKLACE1, GAMES_NECKLACE2, GAMES_NECKLACE3, GAMES_NECKLACE4, GAMES_NECKLACE5, GAMES_NECKLACE6, GAMES_NECKLACE7),
+
+	// Degradable/charged weaponry/armour
+	ITEM_ABYSSAL_WHIP(ABYSSAL_WHIP, VOLCANIC_ABYSSAL_WHIP, FROZEN_ABYSSAL_WHIP),
+	ITEM_KRAKEN_TENTACLE(KRAKEN_TENTACLE, ABYSSAL_TENTACLE),
+	ITEM_TRIDENT_OF_THE_SEAS(UNCHARGED_TRIDENT, TRIDENT_OF_THE_SEAS),
+	ITEM_TRIDENT_OF_THE_SEAS_E(UNCHARGED_TRIDENT_E, TRIDENT_OF_THE_SEAS_E),
+	ITEM_TRIDENT_OF_THE_SWAMP(UNCHARGED_TOXIC_TRIDENT, TRIDENT_OF_THE_SWAMP),
+	ITEM_TRIDENT_OF_THE_SWAMP_E(UNCHARGED_TOXIC_TRIDENT_E, TRIDENT_OF_THE_SWAMP_E),
+	ITEM_TOXIC_BLOWPIPE(TOXIC_BLOWPIPE_EMPTY, TOXIC_BLOWPIPE),
+	ITEM_TOXIC_STAFF_OFF_THE_DEAD(TOXIC_STAFF_UNCHARGED, TOXIC_STAFF_OF_THE_DEAD),
+	ITEM_SERPENTINE_HELM(SERPENTINE_HELM_UNCHARGED, SERPENTINE_HELM, TANZANITE_HELM_UNCHARGED, TANZANITE_HELM, MAGMA_HELM_UNCHARGED, MAGMA_HELM),
+	ITEM_DRAGONFIRE_SHIELD(DRAGONFIRE_SHIELD_11284, DRAGONFIRE_SHIELD),
+	ITEM_DRAGONFIRE_WARD(DRAGONFIRE_WARD_22003, DRAGONFIRE_WARD),
+	ITEM_ANCIENT_WYVERN_SHIELD(ANCIENT_WYVERN_SHIELD_21634, ANCIENT_WYVERN_SHIELD),
+	ITEM_SANGUINESTI_STAFF(SANGUINESTI_STAFF_UNCHARGED, SANGUINESTI_STAFF),
+	ITEM_SCYTHE_OF_VITUR(SCYTHE_OF_VITUR_UNCHARGED, SCYTHE_OF_VITUR),
+	ITEM_TOME_OF_FIRE(TOME_OF_FIRE_EMPTY, TOME_OF_FIRE),
+	ITEM_CRAWS_BOW(CRAWS_BOW_U, CRAWS_BOW),
+	ITEM_VIGGORAS_CHAINMACE(VIGGORAS_CHAINMACE_U, VIGGORAS_CHAINMACE),
+	ITEM_THAMMARONS_SCEPTRE(THAMMARONS_SCEPTRE_U, THAMMARONS_SCEPTRE),
+
+	// Infinity colour kits
+	ITEM_INFINITY_TOP(INFINITY_TOP, INFINITY_TOP_10605, INFINITY_TOP_20574, DARK_INFINITY_TOP, LIGHT_INFINITY_TOP),
+	ITEM_INFINITY_TOP_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_TOP),
+	ITEM_INFINITY_TOP_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_TOP),
+	ITEM_INFINITY_BOTTOMS(INFINITY_BOTTOMS, INFINITY_BOTTOMS_20575, DARK_INFINITY_BOTTOMS, LIGHT_INFINITY_BOTTOMS),
+	ITEM_INFINITY_BOTTOMS_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_BOTTOMS),
+	ITEM_INFINITY_BOTTOMS_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_BOTTOMS),
+	ITEM_INFINITY_HAT(INFINITY_HAT, DARK_INFINITY_HAT, LIGHT_INFINITY_HAT),
+	ITEM_INFINITY_HAT_LIGHT_COLOUR_KIT(LIGHT_INFINITY_COLOUR_KIT, LIGHT_INFINITY_HAT),
+	ITEM_INFINITY_HAT_DARK_COLOUR_KIT(DARK_INFINITY_COLOUR_KIT, DARK_INFINITY_HAT),
+
+	// Miscellaneous ornament kits
+	ITEM_DARK_BOW(DARK_BOW, DARK_BOW_12765, DARK_BOW_12766, DARK_BOW_12767, DARK_BOW_12768, DARK_BOW_20408),
+	ITEM_ODIUM_WARD(ODIUM_WARD, ODIUM_WARD_12807),
+	ITEM_MALEDICTION_WARD(MALEDICTION_WARD, MALEDICTION_WARD_12806),
+	ITEM_STEAM_BATTLESTAFF(STEAM_BATTLESTAFF, STEAM_BATTLESTAFF_12795),
+	ITEM_LAVA_BATTLESTAFF(LAVA_BATTLESTAFF, LAVA_BATTLESTAFF_21198),
+
+	// Slayer helm/black mask
+	ITEM_BLACK_MASK(
+		BLACK_MASK, BLACK_MASK_I, BLACK_MASK_1, BLACK_MASK_1_I, BLACK_MASK_2, BLACK_MASK_2_I, BLACK_MASK_3, BLACK_MASK_3_I, BLACK_MASK_4, BLACK_MASK_4_I, BLACK_MASK_5,
+		BLACK_MASK_5_I, BLACK_MASK_6, BLACK_MASK_6_I, BLACK_MASK_7, BLACK_MASK_7_I, BLACK_MASK_8, BLACK_MASK_8_I, BLACK_MASK_9, BLACK_MASK_9_I, BLACK_MASK_10_I,
+		SLAYER_HELMET, SLAYER_HELMET_I, BLACK_SLAYER_HELMET, BLACK_SLAYER_HELMET_I, PURPLE_SLAYER_HELMET, PURPLE_SLAYER_HELMET_I, RED_SLAYER_HELMET, RED_SLAYER_HELMET_I,
+		GREEN_SLAYER_HELMET, GREEN_SLAYER_HELMET_I, TURQUOISE_SLAYER_HELMET, TURQUOISE_SLAYER_HELMET_I, HYDRA_SLAYER_HELMET, HYDRA_SLAYER_HELMET_I),
+
+	// Pharaoh's Sceptres
+	ITEM_PHARAOHS_SCEPTRE_1(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_1),
+	ITEM_PHARAOHS_SCEPTRE_2(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_2),
+	ITEM_PHARAOHS_SCEPTRE_4(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_4),
+	ITEM_PHARAOHS_SCEPTRE_5(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_5),
+	ITEM_PHARAOHS_SCEPTRE_6(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_6),
+	ITEM_PHARAOHS_SCEPTRE_7(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_7),
+	ITEM_PHARAOHS_SCEPTRE_8(PHARAOHS_SCEPTRE, PHARAOHS_SCEPTRE_8),
+
+	// Revertible items
+	ITEM_HYDRA_LEATHER(HYDRA_LEATHER, FEROCIOUS_GLOVES),
+	ITEM_HYDRA_TAIL(HYDRA_TAIL, BONECRUSHER_NECKLACE),
+	ITEM_DRAGONBONE_NECKLACE(DRAGONBONE_NECKLACE, BONECRUSHER_NECKLACE),
+	ITEM_BOTTOMLESS_COMPOST_BUCKET(BOTTOMLESS_COMPOST_BUCKET, BOTTOMLESS_COMPOST_BUCKET_22997);
+
+	private static final Multimap<Integer, Integer> MAPPINGS = HashMultimap.create();
+	private final int tradeableItem;
+	private final int[] untradableItems;
+
+	static
+	{
+		for (final ItemMapping item : values())
+		{
+			for (int itemId : item.untradableItems)
+			{
+				MAPPINGS.put(itemId, item.tradeableItem);
+			}
+		}
+	}
+
+	ItemMapping(int tradeableItem, int... untradableItems)
+	{
+		this.tradeableItem = tradeableItem;
+		this.untradableItems = untradableItems;
+	}
+
+	/**
+	 * Get collection of items that are mapped from single item id.
+	 *
+	 * @param itemId the item id
+	 * @return the collection
+	 */
+	public static Collection<Integer> map(int itemId)
+	{
+		final Collection<Integer> mapping = MAPPINGS.get(itemId);
+
+		if (mapping == null || mapping.isEmpty())
+		{
+			return Collections.singleton(itemId);
+		}
+
+		return mapping;
+	}
+
+	/**
+	 * Map an item from its untradeable version to its tradeable version
+	 *
+	 * @param itemId
+	 * @return
+	 */
+	public static int mapFirst(int itemId)
+	{
+		final Collection<Integer> mapping = MAPPINGS.get(itemId);
+
+		if (mapping == null || mapping.isEmpty())
+		{
+			return itemId;
+		}
+
+		return mapping.iterator().next();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
index abc1747b4a..264e5ae425 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Magic fTail
+ * Copyright (c) 2019, osrs-music-map <osrs-music-map@users.noreply.github.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,4 +64,26 @@ public interface ChatFilterConfig extends Config
 	{
 		return "";
 	}
+
+	@ConfigItem(
+		keyName = "filterFriends",
+		name = "Filter Friends",
+		description = "Filter your friends' messages",
+		position = 4
+	)
+	default boolean filterFriends()
+	{
+		return false;
+	}
+
+	@ConfigItem(
+		keyName = "filterClan",
+		name = "Filter Clan Chat Members",
+		description = "Filter your clan chat members' messages",
+		position = 5
+	)
+	default boolean filterClan()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
index 7f19cd285a..1c1b4c5f75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, Magic fTail
+ * Copyright (c) 2019, osrs-music-map <osrs-music-map@users.noreply.github.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +36,7 @@ import java.util.regex.PatternSyntaxException;
 import javax.inject.Inject;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
+import net.runelite.api.MessageNode;
 import net.runelite.api.Player;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.OverheadTextChanged;
@@ -97,7 +99,10 @@ public class ChatFilterPlugin extends Plugin
 
 		int[] intStack = client.getIntStack();
 		int intStackSize = client.getIntStackSize();
-		ChatMessageType chatMessageType = ChatMessageType.of(intStack[intStackSize - 1]);
+		int messageType = intStack[intStackSize - 2];
+		int messageId = intStack[intStackSize - 1];
+
+		ChatMessageType chatMessageType = ChatMessageType.of(messageType);
 
 		// Only filter public chat and private messages
 		switch (chatMessageType)
@@ -114,6 +119,13 @@ public class ChatFilterPlugin extends Plugin
 				return;
 		}
 
+		MessageNode messageNode = (MessageNode) client.getMessages().get(messageId);
+		String name = messageNode.getName();
+		if (!shouldFilterPlayerMessage(name))
+		{
+			return;
+		}
+
 		String[] stringStack = client.getStringStack();
 		int stringStackSize = client.getStringStackSize();
 
@@ -123,7 +135,7 @@ public class ChatFilterPlugin extends Plugin
 		if (censoredMessage == null)
 		{
 			// Block the message
-			intStack[intStackSize - 2] = 0;
+			intStack[intStackSize - 3] = 0;
 		}
 		else
 		{
@@ -135,7 +147,7 @@ public class ChatFilterPlugin extends Plugin
 	@Subscribe
 	public void onOverheadTextChanged(OverheadTextChanged event)
 	{
-		if (!(event.getActor() instanceof Player))
+		if (!(event.getActor() instanceof Player) || !shouldFilterPlayerMessage(event.getActor().getName()))
 		{
 			return;
 		}
@@ -150,6 +162,14 @@ public class ChatFilterPlugin extends Plugin
 		event.getActor().setOverheadText(message);
 	}
 
+	boolean shouldFilterPlayerMessage(String playerName)
+	{
+		boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName());
+		return !isMessageFromSelf &&
+			(config.filterFriends() || !client.isFriended(playerName, false)) &&
+			(config.filterClan() || !client.isClanMember(playerName));
+	}
+
 	String censorMessage(final String message)
 	{
 		String strippedMessage = jagexPrintableCharMatcher.retainFrom(message)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java
index 5fdd7996be..393008f7fe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatConfig.java
@@ -126,4 +126,15 @@ public interface ClanChatConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "clanTabChat",
+		name = "Clan Tab Chat",
+		description = "Allows clan chat without prepending '/' to messages when on clan tab",
+		position = 8
+	)
+	default boolean clanTabChat()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
index 62cf182f87..858fae3fc4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
@@ -61,6 +61,7 @@ import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.PlayerDespawned;
 import net.runelite.api.events.PlayerSpawned;
+import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.events.VarClientStrChanged;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -498,6 +499,19 @@ public class ClanChatPlugin extends Plugin
 		activityBuffer.clear();
 	}
 
+	@Subscribe
+	public void onScriptCallbackEvent(ScriptCallbackEvent scriptCallbackEvent)
+	{
+		if (!scriptCallbackEvent.getEventName().equalsIgnoreCase("clanchatInput"))
+		{
+			return;
+		}
+
+		final int[] intStack = client.getIntStack();
+		final int size = client.getIntStackSize();
+		intStack[size - 1] = config.clanTabChat() ? 1 : 0;
+	}
+
 	int getClanAmount()
 	{
 		return clanMembers.size();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
index 8ca2ed8a31..2b151112c9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
@@ -66,7 +66,9 @@ import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
+import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.widgets.Widget;
+import net.runelite.api.widgets.WidgetID;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -74,6 +76,7 @@ import net.runelite.client.game.ItemManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.cluescrolls.clues.AnagramClue;
+import net.runelite.client.plugins.cluescrolls.clues.BeginnerMapClue;
 import net.runelite.client.plugins.cluescrolls.clues.CipherClue;
 import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
 import net.runelite.client.plugins.cluescrolls.clues.CoordinateClue;
@@ -386,6 +389,18 @@ public class ClueScrollPlugin extends Plugin
 		updateClue(findClueScroll());
 	}
 
+	@Subscribe
+	public void onWidgetLoaded(WidgetLoaded event)
+	{
+		if (event.getGroupId() < WidgetID.BEGINNER_CLUE_MAP_CHAMPIONS_GUILD
+			|| event.getGroupId() > WidgetID.BEGINNER_CLUE_MAP_WIZARDS_TOWER)
+		{
+			return;
+		}
+
+		updateClue(BeginnerMapClue.forWidgetID(event.getGroupId()));
+	}
+
 	public BufferedImage getClueScrollImage()
 	{
 		return itemManager.getImage(ItemID.CLUE_SCROLL_MASTER);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java
new file mode 100644
index 0000000000..caaeaeeb61
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/BeginnerMapClue.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Hydrox6 <ikada@protonmail.ch>
+ * 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.cluescrolls.clues;
+
+import com.google.common.collect.ImmutableList;
+import lombok.Getter;
+import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.widgets.WidgetID;
+
+@Getter
+public class BeginnerMapClue extends MapClue implements LocationClueScroll
+{
+	private static final ImmutableList<BeginnerMapClue> CLUES = ImmutableList.of(
+		new BeginnerMapClue(WidgetID.BEGINNER_CLUE_MAP_CHAMPIONS_GUILD, new WorldPoint(3166, 3361, 0), "South West of the Champion's Guild"),
+		new BeginnerMapClue(WidgetID.BEGINNER_CLUE_MAP_VARROCK_EAST_MINE, new WorldPoint(3290, 3374, 0), "Outside Varrock East Mine"),
+		new BeginnerMapClue(WidgetID.BEGINNER_CLUE_MAP_DRAYNOR, new WorldPoint(3093, 3226, 0), "South of Draynor Village Bank"),
+		new BeginnerMapClue(WidgetID.BEGINNER_CLUE_MAP_NORTH_OF_FALADOR, new WorldPoint(3043, 3398, 0), "In the standing stones north of Falador"),
+		new BeginnerMapClue(WidgetID.BEGINNER_CLUE_MAP_WIZARDS_TOWER, new WorldPoint(3110, 3152, 0), "On the south side of the Wizard's Tower")
+	);
+
+	private final int widgetGroupID;
+
+	private BeginnerMapClue(int widgetGroupID, WorldPoint location, String description)
+	{
+		super(-1, location, description);
+		this.widgetGroupID = widgetGroupID;
+		setRequiresSpade(true);
+	}
+
+	// Beginner Map Clues all use the same ItemID, but the WidgetID used to display them is unique
+	public static BeginnerMapClue forWidgetID(int widgetGroupID)
+	{
+		for (BeginnerMapClue clue : CLUES)
+		{
+			if (clue.widgetGroupID == widgetGroupID)
+			{
+				return clue;
+			}
+		}
+
+		return null;
+	}
+}
+
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java
index 05748f87ae..861958613b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java
@@ -148,7 +148,7 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati
 		.put(new WorldPoint(3573, 3425, 0), "North of Dessous's tomb from Desert Treasure.")
 		.put(new WorldPoint(3828, 2848, 0), "East of Harmony Island.")
 		.put(new WorldPoint(3225, 2838, 0), "South of Desert Treasure pyramid.")
-		.put(new WorldPoint(1773, 3510, 0), "Between magic trees South of Tithe Farm.")
+		.put(new WorldPoint(1773, 3510, 0), "Ruins north of the Hosidius mine.")
 		.put(new WorldPoint(3822, 3562, 0), "North-east of Dragontooth Island.")
 		.put(new WorldPoint(3603, 3564, 0), "North of the wrecked ship, outside of Port Phasmatys.")
 		.put(new WorldPoint(2936, 2721, 0), "Eastern shore of Crash Island.")
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
index 275cb8aebe..74e1c7be7d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
@@ -32,56 +32,7 @@ import lombok.Getter;
 import net.runelite.api.NPC;
 import static net.runelite.api.NullObjectID.NULL_1293;
 import net.runelite.api.ObjectComposition;
-import static net.runelite.api.ObjectID.BOOKCASE_12539;
-import static net.runelite.api.ObjectID.BOOKCASE_380;
-import static net.runelite.api.ObjectID.BOOKCASE_394;
-import static net.runelite.api.ObjectID.BOOKCASE_9523;
-import static net.runelite.api.ObjectID.BOXES;
-import static net.runelite.api.ObjectID.BOXES_360;
-import static net.runelite.api.ObjectID.BOXES_361;
-import static net.runelite.api.ObjectID.BOXES_3686;
-import static net.runelite.api.ObjectID.BOXES_5111;
-import static net.runelite.api.ObjectID.BOXES_6176;
-import static net.runelite.api.ObjectID.BUCKET_9568;
-import static net.runelite.api.ObjectID.BUSH_2357;
-import static net.runelite.api.ObjectID.CLOSED_CHEST_25592;
-import static net.runelite.api.ObjectID.CLOSED_CHEST_375;
-import static net.runelite.api.ObjectID.CLOSED_CHEST_5108;
-import static net.runelite.api.ObjectID.COFFIN;
-import static net.runelite.api.ObjectID.CRATES_11600;
-import static net.runelite.api.ObjectID.CRATES_24088;
-import static net.runelite.api.ObjectID.CRATE_11485;
-import static net.runelite.api.ObjectID.CRATE_12963;
-import static net.runelite.api.ObjectID.CRATE_14934;
-import static net.runelite.api.ObjectID.CRATE_18204;
-import static net.runelite.api.ObjectID.CRATE_18506;
-import static net.runelite.api.ObjectID.CRATE_18889;
-import static net.runelite.api.ObjectID.CRATE_24344;
-import static net.runelite.api.ObjectID.CRATE_25775;
-import static net.runelite.api.ObjectID.CRATE_27532;
-import static net.runelite.api.ObjectID.CRATE_27533;
-import static net.runelite.api.ObjectID.CRATE_354;
-import static net.runelite.api.ObjectID.CRATE_355;
-import static net.runelite.api.ObjectID.CRATE_356;
-import static net.runelite.api.ObjectID.CRATE_357;
-import static net.runelite.api.ObjectID.CRATE_358;
-import static net.runelite.api.ObjectID.CRATE_366;
-import static net.runelite.api.ObjectID.CRATE_5106;
-import static net.runelite.api.ObjectID.CRATE_5107;
-import static net.runelite.api.ObjectID.CRATE_5113;
-import static net.runelite.api.ObjectID.CRATE_9534;
-import static net.runelite.api.ObjectID.DRAWERS;
-import static net.runelite.api.ObjectID.DRAWERS_25766;
-import static net.runelite.api.ObjectID.DRAWERS_350;
-import static net.runelite.api.ObjectID.DRAWERS_352;
-import static net.runelite.api.ObjectID.DRAWERS_5618;
-import static net.runelite.api.ObjectID.DRAWERS_7194;
-import static net.runelite.api.ObjectID.HAYSTACK;
-import static net.runelite.api.ObjectID.JUNA;
-import static net.runelite.api.ObjectID.MINE_CART_6045;
-import static net.runelite.api.ObjectID.STONES_26633;
-import static net.runelite.api.ObjectID.WARDROBE_5622;
-import static net.runelite.api.ObjectID.WHEELBARROW_9625;
+import static net.runelite.api.ObjectID.*;
 import net.runelite.api.TileObject;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
@@ -347,7 +298,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
 		new CrypticClue("I would make a chemistry joke, but I'm afraid I wouldn't get a reaction.", "Chemist", new WorldPoint(2932, 3212, 0), "Talk to the Chemist in Rimmington"),
 		new CrypticClue("Show this to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Hazelmere is found upstairs on the island located just east of Yanille."),
 		new CrypticClue("Does one really need a fire to stay warm here?", new WorldPoint(3816, 3810, 0), "Dig next to the fire near the Volcanic Mine entrance."),
-		new CrypticClue("Search the open crate found in a small farmhouse in Hosidius. Cabbages grow outside.", CRATE_27533, new WorldPoint(1687, 3628, 0), "The house is north-east of the general store in Hosidius."),
+		new CrypticClue("Search the open crate found in the Hosidius kitchens.", CRATE_27533, new WorldPoint(1683, 3616, 0), "The kitchens are north-west of the town in Hosidius."),
 		new CrypticClue("Dig under Ithoi's cabin.", new WorldPoint(2529, 2838, 0), "Dig under Ithoi's cabin in the Corsair Cove."),
 		new CrypticClue("Search the drawers, upstairs in the bank to the East of Varrock.", DRAWERS_7194, new WorldPoint(3250, 3420, 1), "Search the drawers upstairs in Varrock east bank."),
 		new CrypticClue("Speak to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house to the north of fairy ring CLS. Answer: 6859"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
index 15352c56b2..4d0cec9d41 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
@@ -27,399 +27,19 @@ package net.runelite.client.plugins.cluescrolls.clues;
 import com.google.common.collect.ImmutableSet;
 import java.awt.Color;
 import java.awt.Graphics2D;
+import java.awt.Polygon;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import lombok.Getter;
+import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
-import static net.runelite.api.EquipmentInventorySlot.AMMO;
-import static net.runelite.api.EquipmentInventorySlot.AMULET;
-import static net.runelite.api.EquipmentInventorySlot.BODY;
-import static net.runelite.api.EquipmentInventorySlot.BOOTS;
-import static net.runelite.api.EquipmentInventorySlot.CAPE;
-import static net.runelite.api.EquipmentInventorySlot.GLOVES;
-import static net.runelite.api.EquipmentInventorySlot.HEAD;
 import static net.runelite.api.EquipmentInventorySlot.LEGS;
-import static net.runelite.api.EquipmentInventorySlot.RING;
-import static net.runelite.api.EquipmentInventorySlot.SHIELD;
-import static net.runelite.api.EquipmentInventorySlot.WEAPON;
+import static net.runelite.api.EquipmentInventorySlot.*;
 import net.runelite.api.Item;
 import net.runelite.api.ItemID;
-import static net.runelite.api.ItemID.ABYSSAL_WHIP;
-import static net.runelite.api.ItemID.ADAMANT_2H_SWORD;
-import static net.runelite.api.ItemID.ADAMANT_BOOTS;
-import static net.runelite.api.ItemID.ADAMANT_DAGGER;
-import static net.runelite.api.ItemID.ADAMANT_FULL_HELM;
-import static net.runelite.api.ItemID.ADAMANT_HALBERD;
-import static net.runelite.api.ItemID.ADAMANT_MED_HELM;
-import static net.runelite.api.ItemID.ADAMANT_PLATEBODY;
-import static net.runelite.api.ItemID.ADAMANT_PLATELEGS;
-import static net.runelite.api.ItemID.ADAMANT_PLATESKIRT;
-import static net.runelite.api.ItemID.ADAMANT_SQ_SHIELD;
-import static net.runelite.api.ItemID.ADAMANT_SWORD;
-import static net.runelite.api.ItemID.ADAMANT_WARHAMMER;
-import static net.runelite.api.ItemID.AHRIMS_HOOD_0;
-import static net.runelite.api.ItemID.AHRIMS_HOOD_100;
-import static net.runelite.api.ItemID.AHRIMS_ROBESKIRT_0;
-import static net.runelite.api.ItemID.AHRIMS_ROBESKIRT_100;
-import static net.runelite.api.ItemID.AHRIMS_ROBETOP_0;
-import static net.runelite.api.ItemID.AHRIMS_ROBETOP_100;
-import static net.runelite.api.ItemID.AHRIMS_STAFF_0;
-import static net.runelite.api.ItemID.AHRIMS_STAFF_100;
-import static net.runelite.api.ItemID.AIR_TIARA;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY1;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY2;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY3;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY4;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY5;
-import static net.runelite.api.ItemID.AMULET_OF_GLORY6;
-import static net.runelite.api.ItemID.AMULET_OF_POWER;
-import static net.runelite.api.ItemID.AMULET_OF_STRENGTH;
-import static net.runelite.api.ItemID.AMULET_OF_THE_DAMNED;
-import static net.runelite.api.ItemID.AMULET_OF_THE_DAMNED_FULL;
-import static net.runelite.api.ItemID.ANCIENT_CROZIER;
-import static net.runelite.api.ItemID.ANCIENT_MITRE;
-import static net.runelite.api.ItemID.ANCIENT_STOLE;
-import static net.runelite.api.ItemID.ARCLIGHT;
-import static net.runelite.api.ItemID.ARMADYL_CROZIER;
-import static net.runelite.api.ItemID.ARMADYL_MITRE;
-import static net.runelite.api.ItemID.ARMADYL_STOLE;
-import static net.runelite.api.ItemID.BANDOS_BOOTS;
-import static net.runelite.api.ItemID.BANDOS_CLOAK;
-import static net.runelite.api.ItemID.BANDOS_CROZIER;
-import static net.runelite.api.ItemID.BANDOS_GODSWORD;
-import static net.runelite.api.ItemID.BANDOS_MITRE;
-import static net.runelite.api.ItemID.BANDOS_PLATEBODY;
-import static net.runelite.api.ItemID.BANDOS_STOLE;
-import static net.runelite.api.ItemID.BARROWS_GLOVES;
-import static net.runelite.api.ItemID.BLACK_AXE;
-import static net.runelite.api.ItemID.BLACK_BOATER;
-import static net.runelite.api.ItemID.BLACK_CAPE;
-import static net.runelite.api.ItemID.BLACK_DHIDE_BODY;
-import static net.runelite.api.ItemID.BLACK_DHIDE_CHAPS;
-import static net.runelite.api.ItemID.BLACK_DHIDE_VAMB;
-import static net.runelite.api.ItemID.BLACK_DRAGON_MASK;
-import static net.runelite.api.ItemID.BLACK_PLATEBODY;
-import static net.runelite.api.ItemID.BLACK_SALAMANDER;
-import static net.runelite.api.ItemID.BLACK_SLAYER_HELMET;
-import static net.runelite.api.ItemID.BLACK_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.BLUE_BOATER;
-import static net.runelite.api.ItemID.BLUE_BOOTS;
-import static net.runelite.api.ItemID.BLUE_DHIDE_BODY;
-import static net.runelite.api.ItemID.BLUE_DHIDE_CHAPS;
-import static net.runelite.api.ItemID.BLUE_DHIDE_VAMB;
-import static net.runelite.api.ItemID.BLUE_ROBE_TOP;
-import static net.runelite.api.ItemID.BLUE_WIZARD_HAT;
-import static net.runelite.api.ItemID.BLUE_WIZARD_ROBE;
-import static net.runelite.api.ItemID.BOBS_PURPLE_SHIRT;
-import static net.runelite.api.ItemID.BOBS_RED_SHIRT;
-import static net.runelite.api.ItemID.BODY_TIARA;
-import static net.runelite.api.ItemID.BONE_DAGGER;
-import static net.runelite.api.ItemID.BONE_SPEAR;
-import static net.runelite.api.ItemID.BOOK_OF_BALANCE;
-import static net.runelite.api.ItemID.BOOK_OF_DARKNESS;
-import static net.runelite.api.ItemID.BOOK_OF_LAW;
-import static net.runelite.api.ItemID.BOOK_OF_WAR;
-import static net.runelite.api.ItemID.BRINE_SABRE;
-import static net.runelite.api.ItemID.BRONZE_2H_SWORD;
-import static net.runelite.api.ItemID.BRONZE_AXE;
-import static net.runelite.api.ItemID.BRONZE_CHAINBODY;
-import static net.runelite.api.ItemID.BRONZE_DAGGER;
-import static net.runelite.api.ItemID.BRONZE_FULL_HELM;
-import static net.runelite.api.ItemID.BRONZE_PLATELEGS;
-import static net.runelite.api.ItemID.BRONZE_SPEAR;
-import static net.runelite.api.ItemID.BRONZE_SQ_SHIELD;
-import static net.runelite.api.ItemID.BROWN_APRON;
-import static net.runelite.api.ItemID.BROWN_HEADBAND;
-import static net.runelite.api.ItemID.BRUISE_BLUE_SNELM_3343;
-import static net.runelite.api.ItemID.CAPE_OF_LEGENDS;
-import static net.runelite.api.ItemID.CASTLE_WARS_BRACELET1;
-import static net.runelite.api.ItemID.CASTLE_WARS_BRACELET3;
-import static net.runelite.api.ItemID.CHEFS_HAT;
-import static net.runelite.api.ItemID.CLIMBING_BOOTS;
-import static net.runelite.api.ItemID.COIF;
-import static net.runelite.api.ItemID.COMBAT_BRACELET;
-import static net.runelite.api.ItemID.COMBAT_BRACELET4;
-import static net.runelite.api.ItemID.CREAM_ROBE_TOP;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_110_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_210_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_310_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_410_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_510_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_610_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_710_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_810_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_910_I;
-import static net.runelite.api.ItemID.CRYSTAL_BOW_FULL_I;
-import static net.runelite.api.ItemID.DEATH_TIARA;
-import static net.runelite.api.ItemID.DESERT_SHIRT;
-import static net.runelite.api.ItemID.DHAROKS_GREATAXE_0;
-import static net.runelite.api.ItemID.DHAROKS_GREATAXE_100;
-import static net.runelite.api.ItemID.DHAROKS_HELM_0;
-import static net.runelite.api.ItemID.DHAROKS_HELM_100;
-import static net.runelite.api.ItemID.DHAROKS_PLATEBODY_0;
-import static net.runelite.api.ItemID.DHAROKS_PLATEBODY_100;
-import static net.runelite.api.ItemID.DHAROKS_PLATELEGS_0;
-import static net.runelite.api.ItemID.DHAROKS_PLATELEGS_100;
-import static net.runelite.api.ItemID.DIAMOND_BRACELET;
-import static net.runelite.api.ItemID.DIAMOND_RING;
-import static net.runelite.api.ItemID.DRAGONSTONE_AMULET;
-import static net.runelite.api.ItemID.DRAGONSTONE_RING;
-import static net.runelite.api.ItemID.DRAGON_2H_SWORD;
-import static net.runelite.api.ItemID.DRAGON_AXE;
-import static net.runelite.api.ItemID.DRAGON_BATTLEAXE;
-import static net.runelite.api.ItemID.DRAGON_BOOTS;
-import static net.runelite.api.ItemID.DRAGON_CHAINBODY_3140;
-import static net.runelite.api.ItemID.DRAGON_DEFENDER;
-import static net.runelite.api.ItemID.DRAGON_MED_HELM;
-import static net.runelite.api.ItemID.DRAGON_NECKLACE;
-import static net.runelite.api.ItemID.DRAGON_PICKAXE;
-import static net.runelite.api.ItemID.DRAGON_PICKAXE_12797;
-import static net.runelite.api.ItemID.DRAGON_PLATESKIRT;
-import static net.runelite.api.ItemID.DRAGON_SPEAR;
-import static net.runelite.api.ItemID.DRAGON_SQ_SHIELD;
-import static net.runelite.api.ItemID.ELEMENTAL_SHIELD;
-import static net.runelite.api.ItemID.EMERALD_AMULET;
-import static net.runelite.api.ItemID.EMERALD_RING;
-import static net.runelite.api.ItemID.FIRE_BATTLESTAFF;
-import static net.runelite.api.ItemID.FIRE_CAPE;
-import static net.runelite.api.ItemID.FIRE_MAX_CAPE;
-import static net.runelite.api.ItemID.FLARED_TROUSERS;
-import static net.runelite.api.ItemID.FROZEN_ABYSSAL_WHIP;
-import static net.runelite.api.ItemID.GOLD_NECKLACE;
-import static net.runelite.api.ItemID.GOLD_RING;
-import static net.runelite.api.ItemID.GRANITE_SHIELD;
-import static net.runelite.api.ItemID.GREEN_BOATER;
-import static net.runelite.api.ItemID.GREEN_BOOTS;
-import static net.runelite.api.ItemID.GREEN_DHIDE_BODY;
-import static net.runelite.api.ItemID.GREEN_DHIDE_CHAPS;
-import static net.runelite.api.ItemID.GREEN_HAT;
-import static net.runelite.api.ItemID.GREEN_HEADBAND;
-import static net.runelite.api.ItemID.GREEN_ROBE_BOTTOMS;
-import static net.runelite.api.ItemID.GREEN_ROBE_TOP;
-import static net.runelite.api.ItemID.GREEN_SLAYER_HELMET;
-import static net.runelite.api.ItemID.GREEN_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.GUTHANS_CHAINSKIRT_0;
-import static net.runelite.api.ItemID.GUTHANS_CHAINSKIRT_100;
-import static net.runelite.api.ItemID.GUTHANS_HELM_0;
-import static net.runelite.api.ItemID.GUTHANS_HELM_100;
-import static net.runelite.api.ItemID.GUTHANS_PLATEBODY_0;
-import static net.runelite.api.ItemID.GUTHANS_PLATEBODY_100;
-import static net.runelite.api.ItemID.GUTHANS_WARSPEAR_0;
-import static net.runelite.api.ItemID.GUTHANS_WARSPEAR_100;
-import static net.runelite.api.ItemID.GUTHIX_MITRE;
-import static net.runelite.api.ItemID.GUTHIX_STOLE;
-import static net.runelite.api.ItemID.HAM_BOOTS;
-import static net.runelite.api.ItemID.HAM_ROBE;
-import static net.runelite.api.ItemID.HARDLEATHER_BODY;
-import static net.runelite.api.ItemID.HELM_OF_NEITIZNOT;
-import static net.runelite.api.ItemID.HOLY_BOOK;
-import static net.runelite.api.ItemID.HYDRA_SLAYER_HELMET;
-import static net.runelite.api.ItemID.HYDRA_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.IBANS_STAFF;
-import static net.runelite.api.ItemID.IBANS_STAFF_U;
-import static net.runelite.api.ItemID.INFERNAL_PICKAXE;
-import static net.runelite.api.ItemID.INFERNAL_PICKAXE_UNCHARGED;
-import static net.runelite.api.ItemID.IRON_2H_SWORD;
-import static net.runelite.api.ItemID.IRON_CHAINBODY;
-import static net.runelite.api.ItemID.IRON_FULL_HELM;
-import static net.runelite.api.ItemID.IRON_KITESHIELD;
-import static net.runelite.api.ItemID.IRON_MED_HELM;
-import static net.runelite.api.ItemID.IRON_PICKAXE;
-import static net.runelite.api.ItemID.IRON_PLATEBODY;
-import static net.runelite.api.ItemID.IRON_PLATELEGS;
-import static net.runelite.api.ItemID.IRON_PLATESKIRT;
-import static net.runelite.api.ItemID.IRON_SCIMITAR;
-import static net.runelite.api.ItemID.IRON_WARHAMMER;
-import static net.runelite.api.ItemID.KARILS_COIF_0;
-import static net.runelite.api.ItemID.KARILS_COIF_100;
-import static net.runelite.api.ItemID.KARILS_CROSSBOW_0;
-import static net.runelite.api.ItemID.KARILS_CROSSBOW_100;
-import static net.runelite.api.ItemID.KARILS_LEATHERSKIRT_0;
-import static net.runelite.api.ItemID.KARILS_LEATHERSKIRT_100;
-import static net.runelite.api.ItemID.KARILS_LEATHERTOP_0;
-import static net.runelite.api.ItemID.KARILS_LEATHERTOP_100;
-import static net.runelite.api.ItemID.LAVA_BATTLESTAFF;
-import static net.runelite.api.ItemID.LEATHER_BOOTS;
-import static net.runelite.api.ItemID.LEATHER_CHAPS;
-import static net.runelite.api.ItemID.LEATHER_COWL;
-import static net.runelite.api.ItemID.LEATHER_GLOVES;
-import static net.runelite.api.ItemID.LOCKPICK;
-import static net.runelite.api.ItemID.LONGBOW;
-import static net.runelite.api.ItemID.MAGIC_LONGBOW;
-import static net.runelite.api.ItemID.MAPLE_LONGBOW;
-import static net.runelite.api.ItemID.MAPLE_SHORTBOW;
-import static net.runelite.api.ItemID.MENAPHITE_PURPLE_HAT;
-import static net.runelite.api.ItemID.MENAPHITE_PURPLE_KILT;
-import static net.runelite.api.ItemID.MENAPHITE_PURPLE_ROBE;
-import static net.runelite.api.ItemID.MENAPHITE_PURPLE_TOP;
-import static net.runelite.api.ItemID.MENAPHITE_RED_HAT;
-import static net.runelite.api.ItemID.MENAPHITE_RED_KILT;
-import static net.runelite.api.ItemID.MENAPHITE_RED_ROBE;
-import static net.runelite.api.ItemID.MENAPHITE_RED_TOP;
-import static net.runelite.api.ItemID.MIND_SHIELD;
-import static net.runelite.api.ItemID.MITHRIL_BOOTS;
-import static net.runelite.api.ItemID.MITHRIL_CHAINBODY;
-import static net.runelite.api.ItemID.MITHRIL_FULL_HELM;
-import static net.runelite.api.ItemID.MITHRIL_MED_HELM;
-import static net.runelite.api.ItemID.MITHRIL_PICKAXE;
-import static net.runelite.api.ItemID.MITHRIL_PLATEBODY;
-import static net.runelite.api.ItemID.MITHRIL_PLATELEGS;
-import static net.runelite.api.ItemID.MITHRIL_PLATESKIRT;
-import static net.runelite.api.ItemID.MITHRIL_SCIMITAR;
-import static net.runelite.api.ItemID.MYSTIC_FIRE_STAFF;
-import static net.runelite.api.ItemID.MYSTIC_GLOVES;
-import static net.runelite.api.ItemID.MYSTIC_HAT;
-import static net.runelite.api.ItemID.MYSTIC_ROBE_BOTTOM;
-import static net.runelite.api.ItemID.MYSTIC_ROBE_BOTTOM_DARK;
-import static net.runelite.api.ItemID.MYSTIC_ROBE_TOP;
-import static net.runelite.api.ItemID.MYSTIC_ROBE_TOP_DARK;
-import static net.runelite.api.ItemID.NEW_CRYSTAL_BOW_I;
-import static net.runelite.api.ItemID.OAK_LONGBOW;
-import static net.runelite.api.ItemID.OAK_SHORTBOW;
-import static net.runelite.api.ItemID.OBSIDIAN_CAPE;
-import static net.runelite.api.ItemID.ORANGE_BOATER;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_1;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_2;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_3;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_4;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_5;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_6;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_7;
-import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE_8;
-import static net.runelite.api.ItemID.PINK_BOATER;
-import static net.runelite.api.ItemID.PINK_ROBE_TOP;
-import static net.runelite.api.ItemID.PINK_SKIRT;
-import static net.runelite.api.ItemID.PIRATE_BANDANA;
-import static net.runelite.api.ItemID.PIRATE_BANDANA_7124;
-import static net.runelite.api.ItemID.PIRATE_BANDANA_7130;
-import static net.runelite.api.ItemID.PIRATE_BANDANA_7136;
-import static net.runelite.api.ItemID.PROSELYTE_HAUBERK;
-import static net.runelite.api.ItemID.PURPLE_BOATER;
-import static net.runelite.api.ItemID.PURPLE_GLOVES;
-import static net.runelite.api.ItemID.PURPLE_SLAYER_HELMET;
-import static net.runelite.api.ItemID.PURPLE_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.RED_BOATER;
-import static net.runelite.api.ItemID.RED_CAPE;
-import static net.runelite.api.ItemID.RED_DHIDE_CHAPS;
-import static net.runelite.api.ItemID.RED_HEADBAND;
-import static net.runelite.api.ItemID.RED_SLAYER_HELMET;
-import static net.runelite.api.ItemID.RED_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.RING_OF_DUELING1;
-import static net.runelite.api.ItemID.RING_OF_DUELING2;
-import static net.runelite.api.ItemID.RING_OF_DUELING3;
-import static net.runelite.api.ItemID.RING_OF_DUELING4;
-import static net.runelite.api.ItemID.RING_OF_DUELING5;
-import static net.runelite.api.ItemID.RING_OF_DUELING6;
-import static net.runelite.api.ItemID.RING_OF_DUELING7;
-import static net.runelite.api.ItemID.RING_OF_DUELING8;
-import static net.runelite.api.ItemID.RING_OF_FORGING;
-import static net.runelite.api.ItemID.RING_OF_LIFE;
-import static net.runelite.api.ItemID.RING_OF_VISIBILITY;
-import static net.runelite.api.ItemID.RING_OF_WEALTH;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_1;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_2;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_3;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_4;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_5;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I1;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I2;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I3;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I4;
-import static net.runelite.api.ItemID.RING_OF_WEALTH_I5;
-import static net.runelite.api.ItemID.ROLLING_PIN;
-import static net.runelite.api.ItemID.RUBY_AMULET;
-import static net.runelite.api.ItemID.RUBY_RING;
-import static net.runelite.api.ItemID.RUNE_AXE;
-import static net.runelite.api.ItemID.RUNE_BOOTS;
-import static net.runelite.api.ItemID.RUNE_CROSSBOW;
-import static net.runelite.api.ItemID.RUNE_FULL_HELM;
-import static net.runelite.api.ItemID.RUNE_HALBERD;
-import static net.runelite.api.ItemID.RUNE_HELM_H1;
-import static net.runelite.api.ItemID.RUNE_HELM_H5;
-import static net.runelite.api.ItemID.RUNE_KITESHIELD;
-import static net.runelite.api.ItemID.RUNE_LONGSWORD;
-import static net.runelite.api.ItemID.RUNE_PICKAXE;
-import static net.runelite.api.ItemID.RUNE_PLATEBODY;
-import static net.runelite.api.ItemID.RUNE_PLATELEGS;
-import static net.runelite.api.ItemID.RUNE_PLATESKIRT;
-import static net.runelite.api.ItemID.RUNE_SHIELD_H1;
-import static net.runelite.api.ItemID.RUNE_SHIELD_H2;
-import static net.runelite.api.ItemID.RUNE_SHIELD_H3;
-import static net.runelite.api.ItemID.RUNE_SHIELD_H4;
-import static net.runelite.api.ItemID.RUNE_SHIELD_H5;
-import static net.runelite.api.ItemID.RUNE_SPEAR;
-import static net.runelite.api.ItemID.RUNE_WARHAMMER;
-import static net.runelite.api.ItemID.SAPPHIRE_AMULET;
-import static net.runelite.api.ItemID.SAPPHIRE_NECKLACE;
-import static net.runelite.api.ItemID.SAPPHIRE_RING;
-import static net.runelite.api.ItemID.SARADOMIN_CROZIER;
-import static net.runelite.api.ItemID.SARADOMIN_MITRE;
-import static net.runelite.api.ItemID.SARADOMIN_STOLE;
-import static net.runelite.api.ItemID.SEERCULL;
-import static net.runelite.api.ItemID.SHADOW_SWORD;
-import static net.runelite.api.ItemID.SILVER_SICKLE;
-import static net.runelite.api.ItemID.SLAYER_HELMET;
-import static net.runelite.api.ItemID.SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.SLED_4084;
-import static net.runelite.api.ItemID.SNAKESKIN_BOOTS;
-import static net.runelite.api.ItemID.SNAKESKIN_CHAPS;
-import static net.runelite.api.ItemID.SPINED_CHAPS;
-import static net.runelite.api.ItemID.SPLITBARK_BODY;
-import static net.runelite.api.ItemID.SPLITBARK_LEGS;
-import static net.runelite.api.ItemID.SPOTTED_CAPE;
-import static net.runelite.api.ItemID.SPOTTED_CAPE_10073;
-import static net.runelite.api.ItemID.STAFF;
-import static net.runelite.api.ItemID.STAFF_OF_AIR;
-import static net.runelite.api.ItemID.STAFF_OF_WATER;
-import static net.runelite.api.ItemID.STEEL_AXE;
-import static net.runelite.api.ItemID.STEEL_FULL_HELM;
-import static net.runelite.api.ItemID.STEEL_KITESHIELD;
-import static net.runelite.api.ItemID.STEEL_LONGSWORD;
-import static net.runelite.api.ItemID.STEEL_MACE;
-import static net.runelite.api.ItemID.STEEL_MED_HELM;
-import static net.runelite.api.ItemID.STEEL_PICKAXE;
-import static net.runelite.api.ItemID.STEEL_PLATEBODY;
-import static net.runelite.api.ItemID.STEEL_PLATESKIRT;
-import static net.runelite.api.ItemID.STEEL_SQ_SHIELD;
-import static net.runelite.api.ItemID.STUDDED_BODY;
-import static net.runelite.api.ItemID.STUDDED_CHAPS;
-import static net.runelite.api.ItemID.TEAM1_CAPE;
-import static net.runelite.api.ItemID.TEAM50_CAPE;
-import static net.runelite.api.ItemID.TIARA;
-import static net.runelite.api.ItemID.TOKTZKETXIL;
-import static net.runelite.api.ItemID.TOKTZXILUL;
-import static net.runelite.api.ItemID.TORAGS_HAMMERS_0;
-import static net.runelite.api.ItemID.TORAGS_HAMMERS_100;
-import static net.runelite.api.ItemID.TORAGS_HELM_0;
-import static net.runelite.api.ItemID.TORAGS_HELM_100;
-import static net.runelite.api.ItemID.TORAGS_PLATEBODY_0;
-import static net.runelite.api.ItemID.TORAGS_PLATEBODY_100;
-import static net.runelite.api.ItemID.TORAGS_PLATELEGS_0;
-import static net.runelite.api.ItemID.TORAGS_PLATELEGS_100;
-import static net.runelite.api.ItemID.TURQUOISE_ROBE_BOTTOMS;
-import static net.runelite.api.ItemID.TURQUOISE_SLAYER_HELMET;
-import static net.runelite.api.ItemID.TURQUOISE_SLAYER_HELMET_I;
-import static net.runelite.api.ItemID.UNHOLY_BOOK;
-import static net.runelite.api.ItemID.VERACS_BRASSARD_0;
-import static net.runelite.api.ItemID.VERACS_BRASSARD_100;
-import static net.runelite.api.ItemID.VERACS_FLAIL_0;
-import static net.runelite.api.ItemID.VERACS_FLAIL_100;
-import static net.runelite.api.ItemID.VERACS_HELM_0;
-import static net.runelite.api.ItemID.VERACS_HELM_100;
-import static net.runelite.api.ItemID.VERACS_PLATESKIRT_0;
-import static net.runelite.api.ItemID.VERACS_PLATESKIRT_100;
-import static net.runelite.api.ItemID.VOLCANIC_ABYSSAL_WHIP;
-import static net.runelite.api.ItemID.WHITE_APRON;
-import static net.runelite.api.ItemID.WHITE_BOATER;
-import static net.runelite.api.ItemID.WHITE_HEADBAND;
-import static net.runelite.api.ItemID.ZAMORAK_CROZIER;
-import static net.runelite.api.ItemID.ZAMORAK_FULL_HELM;
-import static net.runelite.api.ItemID.ZAMORAK_GODSWORD;
-import static net.runelite.api.ItemID.ZAMORAK_MITRE;
-import static net.runelite.api.ItemID.ZAMORAK_STOLE;
+import static net.runelite.api.ItemID.*;
+import net.runelite.api.Perspective;
+import net.runelite.api.ScriptID;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
 import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR;
@@ -427,143 +47,13 @@ import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin;
 import net.runelite.client.plugins.cluescrolls.clues.emote.AllRequirementsCollection;
 import net.runelite.client.plugins.cluescrolls.clues.emote.AnyRequirementCollection;
 import net.runelite.client.plugins.cluescrolls.clues.emote.Emote;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.ANGRY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.BECKON;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.BLOW_KISS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.BOW;
 import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.BULL_ROARER;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.CHEER;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.CLAP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.CRY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.DANCE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.FLAP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.GOBLIN_SALUTE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.HEADBANG;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.JIG;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.JUMP_FOR_JOY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.LAUGH;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.NO;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.PANIC;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.PUSH_UP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.RASPBERRY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.SALUTE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.SHRUG;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.SLAP_HEAD;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.SPIN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.STOMP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.THINK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.WAVE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.YAWN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.YES;
+import static net.runelite.client.plugins.cluescrolls.clues.emote.Emote.*;
 import net.runelite.client.plugins.cluescrolls.clues.emote.ItemRequirement;
 import net.runelite.client.plugins.cluescrolls.clues.emote.RangeItemRequirement;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.AGILITY_PYRAMID;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.AL_KHARID_SCORPION_MINE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.AUBURYS_SHOP_IN_VARROCK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.BARBARIAN_OUTPOST_OBSTACLE_COURSE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.BARROWS_CHEST;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.BEHIND_MISS_SCHISM_IN_DRAYNOR_VILLAGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.BOB_AXES_ENTRANCE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.BY_THE_BEAR_CAGE_IN_VARROCK_PALACE_GARDENS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CASTLE_WARS_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CATHERBY_BEEHIVE_FIELD;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CENTRE_OF_CANIFIS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CENTRE_OF_THE_CATACOMBS_OF_KOUREND;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CHAOS_TEMPLE_IN_THE_SOUTHEASTERN_WILDERNESS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CHAPEL_IN_WEST_ARDOUGNE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.CROSSROADS_NORTH_OF_DRAYNOR_VILLAGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.DEATH_ALTAR;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.DIGSITE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.DRAYNOR_MANOR_BY_THE_FOUNTAIN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.DRAYNOR_VILLAGE_MARKET;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.EAST_OF_THE_BARBARIAN_VILLAGE_BRIDGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ENTRANA_CHAPEL;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ENTRANCE_OF_THE_ARCEUUS_LIBRARY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ENTRANCE_OF_THE_CAVERN_UNDER_THE_WHIRLPOOL;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ENTRANCE_OF_THE_CAVE_OF_DAMIS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.FINE_CLOTHES_ENTRANCE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.FISHING_GUILD_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.FOUNTAIN_OF_HEROES;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.GNOME_GLIDER_ON_WHITE_WOLF_MOUNTAIN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.GNOME_STRONGHOLD_BALANCING_ROPE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.GYPSY_TENT_ENTRANCE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.HALFWAY_DOWN_TROLLWEISS_MOUNTAIN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.HICKTONS_ARCHERY_EMPORIUM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.HOSIDIUS_MESS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.INSIDE_THE_DIGSITE_EXAM_CENTRE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.IN_THE_MIDDLE_OF_JIGGIG;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.KING_BLACK_DRAGONS_LAIR;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.LIMESTONE_MINE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.LUMBRIDGE_SWAMP_CAVES;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.MAUSOLEUM_OFF_THE_MORYTANIA_COAST;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.MOUNTAIN_CAMP_GOAT_ENCLOSURE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.MUBARIZS_ROOM_AT_THE_DUEL_ARENA;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.MUDSKIPPER_POINT;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_A_LADDER_IN_THE_WILDERNESS_LAVA_MAZE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_A_RUNITE_ROCK_IN_THE_FREMENNIK_ISLES;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_A_SHED_IN_LUMBRIDGE_SWAMP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_HERQUINS_SHOP_IN_FALADOR;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_THE_ENTRANA_FERRY_IN_PORT_SARIM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_THE_GEM_STALL_IN_ARDOUGNE_MARKET;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_THE_PARROTS_IN_ARDOUGNE_ZOO;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_THE_PIER_IN_ZULANDRA;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NEAR_THE_SAWMILL_OPERATORS_BOOTH;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NORTHEAST_CORNER_OF_THE_KHARAZI_JUNGLE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NORTHERN_WALL_OF_CASTLE_DRAKAN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NORTHWESTERN_CORNER_OF_THE_ENCHANTED_VALLEY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NORTH_OF_EVIL_DAVES_HOUSE_IN_EDGEVILLE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NORTH_OF_MOUNT_KARUULM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.NOTERAZZOS_SHOP_IN_THE_WILDERNESS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OBSERVATORY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OGRE_CAGE_IN_KING_LATHAS_TRAINING_CAMP;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ON_THE_BRIDGE_TO_THE_MISTHALIN_WIZARDS_TOWER;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ON_TOP_OF_TROLLHEIM_MOUNTAIN;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_CATHERBY_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_DRAYNOR_VILLAGE_JAIL;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_HARRYS_FISHING_SHOP_IN_CATHERBY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_KEEP_LE_FAYE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_KRIL_TSUTSAROTHS_ROOM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_MUDKNUCKLES_HUT;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_BAR_BY_THE_FIGHT_ARENA;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_DIGSITE_EXAM_CENTRE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_FALADOR_PARTY_ROOM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_FISHING_GUILD;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_GREAT_PYRAMID_OF_SOPHANEM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_LEGENDS_GUILD_DOOR;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_LEGENDS_GUILD_GATES;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_SEERS_VILLAGE_COURTHOUSE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_SLAYER_TOWER_GARGOYLE_ROOM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_THE_WILDERNESS_AXE_HUT;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_VARROCK_PALACE_COURTYARD;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.OUTSIDE_YANILLE_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.RIMMINGTON_MINE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ROAD_JUNCTION_NORTH_OF_RIMMINGTON;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.ROAD_JUNCTION_SOUTH_OF_SINCLAIR_MANSION;
+import net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit;
 import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SHANTAY_PASS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SHAYZIEN_WAR_TENT;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SHILO_VILLAGE_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUL_ALTAR;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUTHEAST_CORNER_OF_LAVA_DRAGON_ISLE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUTHEAST_CORNER_OF_THE_FISHING_PLATFORM;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUTHEAST_CORNER_OF_THE_MONASTERY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUTH_OF_THE_GRAND_EXCHANGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.SOUTH_OF_THE_SHRINE_IN_TAI_BWO_WANNAI_VILLAGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TAVERLEY_STONE_CIRCLE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TENT_IN_LORD_IORWERTHS_ENCAMPMENT;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TOP_FLOOR_OF_THE_LIGHTHOUSE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TOP_FLOOR_OF_THE_YANILLE_WATCHTOWER;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TZHAAR_GEM_STORE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.TZHAAR_WEAPONS_STORE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.UPSTAIRS_IN_THE_ARDOUGNE_WINDMILL;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.VARROCK_PALACE_LIBRARY;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.VOLCANO_IN_THE_NORTHEASTERN_WILDERNESS;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WARRIORS_GUILD_BANK;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WARRIORS_GUILD_BANK_29047;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WELL_OF_VOYAGE;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WEST_OF_THE_SHAYZIEN_COMBAT_RING;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WEST_SIDE_OF_THE_KARAMJA_BANANA_PLANTATION;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.WHEAT_FIELD_NEAR_THE_LUMBRIDGE_WINDMILL;
-import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit._7TH_CHAMBER_OF_JALSAVRAH;
+import static net.runelite.client.plugins.cluescrolls.clues.emote.STASHUnit.*;
 import net.runelite.client.plugins.cluescrolls.clues.emote.SingleItemRequirement;
 import net.runelite.client.plugins.cluescrolls.clues.emote.SlotLimitationRequirement;
 import net.runelite.client.ui.overlay.OverlayUtil;
@@ -690,6 +180,9 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 		new EmoteClue("Panic at Al Kharid mine.", null, new WorldPoint(3300, 3314, 0), PANIC),
 		new EmoteClue("Spin at Flynn's Mace Shop.", null, new WorldPoint(2950, 3387, 0), SPIN));
 
+	private static final String UNICODE_CHECK_MARK = "\u2713";
+	private static final String UNICODE_BALLOT_X = "\u2717";
+
 	private static SingleItemRequirement item(int itemId)
 	{
 		return new SingleItemRequirement(itemId);
@@ -721,19 +214,18 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 	}
 
 	private final String text;
-	private final Integer stashUnit;
+	private final STASHUnit stashUnit;
 	private final WorldPoint location;
 	private final Emote firstEmote;
 	private final Emote secondEmote;
-	@Nonnull
 	private final ItemRequirement[] itemRequirements;
 
-	private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, @Nonnull ItemRequirement... itemRequirements)
+	private EmoteClue(String text, STASHUnit stashUnit, WorldPoint location, Emote firstEmote, @Nonnull ItemRequirement... itemRequirements)
 	{
 		this(text, stashUnit, location, firstEmote, null, itemRequirements);
 	}
 
-	private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, @Nonnull ItemRequirement... itemRequirements)
+	private EmoteClue(String text, STASHUnit stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, @Nonnull ItemRequirement... itemRequirements)
 	{
 		this.text = text;
 		this.stashUnit = stashUnit;
@@ -763,6 +255,17 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 
 		if (itemRequirements.length > 0)
 		{
+			Client client = plugin.getClient();
+			client.runScript(ScriptID.WATSON_STASH_UNIT_CHECK, stashUnit.getObjectId(), 0, 0, 0);
+			int[] intStack = client.getIntStack();
+			boolean stashUnitBuilt = intStack[0] == 1;
+
+			panelComponent.getChildren().add(LineComponent.builder()
+				.left("STASH Unit:")
+				.right(stashUnitBuilt ? UNICODE_CHECK_MARK : UNICODE_BALLOT_X)
+				.rightColor(stashUnitBuilt ? Color.GREEN : Color.RED)
+				.build());
+
 			panelComponent.getChildren().add(LineComponent.builder().left("Equip:").build());
 
 			Item[] equipment = plugin.getEquippedItems();
@@ -790,9 +293,9 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 				boolean combinedFulfilled = requirement.fulfilledBy(combined);
 
 				panelComponent.getChildren().add(LineComponent.builder()
-					.left(requirement.getCollectiveName(plugin.getClient()))
+					.left(requirement.getCollectiveName(client))
 					.leftColor(TITLED_CONTENT_COLOR)
-					.right(combinedFulfilled ? "\u2713" : "\u2717")
+					.right(combinedFulfilled ? UNICODE_CHECK_MARK : UNICODE_BALLOT_X)
 					.rightColor(equipmentFulfilled ? Color.GREEN : (combinedFulfilled ? Color.ORANGE : Color.RED))
 					.build());
 			}
@@ -802,14 +305,28 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
 	@Override
 	public void makeWorldOverlayHint(Graphics2D graphics, ClueScrollPlugin plugin)
 	{
-		LocalPoint localLocation = LocalPoint.fromWorld(plugin.getClient(), getLocation());
+		LocalPoint localPoint = LocalPoint.fromWorld(plugin.getClient(), getLocation());
 
-		if (localLocation == null)
+		if (localPoint != null)
 		{
-			return;
+			OverlayUtil.renderTileOverlay(plugin.getClient(), graphics, localPoint, plugin.getEmoteImage(), Color.ORANGE);
 		}
 
-		OverlayUtil.renderTileOverlay(plugin.getClient(), graphics, localLocation, plugin.getEmoteImage(), Color.ORANGE);
+		final WorldPoint[] worldPoints = stashUnit.getWorldPoints();
+
+		for (final WorldPoint worldPoint : worldPoints)
+		{
+			final LocalPoint stashUnitLocalPoint = LocalPoint.fromWorld(plugin.getClient(), worldPoint);
+
+			if (stashUnitLocalPoint != null)
+			{
+				final Polygon poly = Perspective.getCanvasTilePoly(plugin.getClient(), stashUnitLocalPoint);
+				if (poly != null)
+				{
+					OverlayUtil.renderPolygon(graphics, poly, Color.RED);
+				}
+			}
+		}
 	}
 
 	public static EmoteClue forText(String text)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
index 8e27090ddb..3294013a24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/MapClue.java
@@ -29,38 +29,7 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.util.Set;
 import lombok.Getter;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_12179;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_2713;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_2716;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_2719;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_3516;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_3518;
-import static net.runelite.api.ItemID.CLUE_SCROLL_EASY_7236;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_12130;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_19782;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_19783;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_19784;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_19785;
-import static net.runelite.api.ItemID.CLUE_SCROLL_ELITE_19786;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_2729;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_3520;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_3522;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_3524;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_3525;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_7239;
-import static net.runelite.api.ItemID.CLUE_SCROLL_HARD_7241;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_2827;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_3596;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_3598;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_3599;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_3601;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_3602;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_7286;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_7288;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_7290;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_7292;
-import static net.runelite.api.ItemID.CLUE_SCROLL_MEDIUM_7294;
+import static net.runelite.api.ItemID.*;
 import net.runelite.api.ObjectComposition;
 import static net.runelite.api.ObjectID.CRATE_18506;
 import static net.runelite.api.ObjectID.CRATE_2620;
@@ -133,7 +102,7 @@ public class MapClue extends ClueScroll implements ObjectClueScroll
 		this(itemId, location, objectId, null);
 	}
 
-	private MapClue(int itemId, WorldPoint location, String description)
+	MapClue(int itemId, WorldPoint location, String description)
 	{
 		this(itemId, location, -1, description);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java
index 6edca56a02..b6d2038cea 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/STASHUnit.java
@@ -24,115 +24,127 @@
  */
 package net.runelite.client.plugins.cluescrolls.clues.emote;
 
+import lombok.Getter;
 import net.runelite.api.NullObjectID;
+import net.runelite.api.coords.WorldPoint;
 
-public final class STASHUnit
+@Getter
+public enum STASHUnit
 {
-	public static final int NEAR_A_SHED_IN_LUMBRIDGE_SWAMP = NullObjectID.NULL_28958;
-	public static final int ON_THE_BRIDGE_TO_THE_MISTHALIN_WIZARDS_TOWER = NullObjectID.NULL_28959;
-	public static final int DRAYNOR_VILLAGE_MARKET = NullObjectID.NULL_28960;
-	public static final int LIMESTONE_MINE = NullObjectID.NULL_28961;
-	public static final int OUTSIDE_THE_LEGENDS_GUILD_GATES = NullObjectID.NULL_28962;
-	public static final int MUDSKIPPER_POINT = NullObjectID.NULL_28963;
-	public static final int NEAR_THE_ENTRANA_FERRY_IN_PORT_SARIM = NullObjectID.NULL_28964;
-	public static final int AL_KHARID_SCORPION_MINE = NullObjectID.NULL_28965;
-	public static final int DRAYNOR_MANOR_BY_THE_FOUNTAIN = NullObjectID.NULL_28966;
-	public static final int WHEAT_FIELD_NEAR_THE_LUMBRIDGE_WINDMILL = NullObjectID.NULL_28967;
-	public static final int CROSSROADS_NORTH_OF_DRAYNOR_VILLAGE = NullObjectID.NULL_28968;
-	public static final int RIMMINGTON_MINE = NullObjectID.NULL_28969;
-	public static final int VARROCK_PALACE_LIBRARY = NullObjectID.NULL_28970;
-	public static final int UPSTAIRS_IN_THE_ARDOUGNE_WINDMILL = NullObjectID.NULL_28971;
-	public static final int OUTSIDE_THE_FALADOR_PARTY_ROOM = NullObjectID.NULL_28972;
-	public static final int TAVERLEY_STONE_CIRCLE = NullObjectID.NULL_28973;
-	public static final int CATHERBY_BEEHIVE_FIELD = NullObjectID.NULL_28974;
-	public static final int NEAR_THE_PARROTS_IN_ARDOUGNE_ZOO = NullObjectID.NULL_28975;
-	public static final int ROAD_JUNCTION_NORTH_OF_RIMMINGTON = NullObjectID.NULL_28976;
-	public static final int OUTSIDE_THE_FISHING_GUILD = NullObjectID.NULL_28977;
-	public static final int OUTSIDE_KEEP_LE_FAYE = NullObjectID.NULL_28978;
-	public static final int ROAD_JUNCTION_SOUTH_OF_SINCLAIR_MANSION = NullObjectID.NULL_28979;
-	public static final int OUTSIDE_THE_DIGSITE_EXAM_CENTRE = NullObjectID.NULL_28980;
-	public static final int NEAR_THE_SAWMILL_OPERATORS_BOOTH = NullObjectID.NULL_28981;
-	public static final int MUBARIZS_ROOM_AT_THE_DUEL_ARENA = NullObjectID.NULL_28982;
-	public static final int OUTSIDE_VARROCK_PALACE_COURTYARD = NullObjectID.NULL_28983;
-	public static final int NEAR_HERQUINS_SHOP_IN_FALADOR = NullObjectID.NULL_28984;
-	public static final int SOUTH_OF_THE_GRAND_EXCHANGE = NullObjectID.NULL_28985;
-	public static final int AUBURYS_SHOP_IN_VARROCK = NullObjectID.NULL_28986;
-	public static final int CENTRE_OF_CANIFIS = NullObjectID.NULL_28987;
-	public static final int MAUSOLEUM_OFF_THE_MORYTANIA_COAST = NullObjectID.NULL_28988;
-	public static final int EAST_OF_THE_BARBARIAN_VILLAGE_BRIDGE = NullObjectID.NULL_28989;
-	public static final int SOUTH_OF_THE_SHRINE_IN_TAI_BWO_WANNAI_VILLAGE = NullObjectID.NULL_28990;
-	public static final int CASTLE_WARS_BANK = NullObjectID.NULL_28991;
-	public static final int BARBARIAN_OUTPOST_OBSTACLE_COURSE = NullObjectID.NULL_28992;
-	public static final int GNOME_STRONGHOLD_BALANCING_ROPE = NullObjectID.NULL_28993;
-	public static final int OUTSIDE_YANILLE_BANK = NullObjectID.NULL_28994;
-	public static final int OBSERVATORY = NullObjectID.NULL_28995;
-	public static final int OGRE_CAGE_IN_KING_LATHAS_TRAINING_CAMP = NullObjectID.NULL_28996;
-	public static final int DIGSITE = NullObjectID.NULL_28997;
-	public static final int HICKTONS_ARCHERY_EMPORIUM = NullObjectID.NULL_28998;
-	public static final int SHANTAY_PASS = NullObjectID.NULL_28999;
-	public static final int LUMBRIDGE_SWAMP_CAVES = NullObjectID.NULL_29000;
-	public static final int OUTSIDE_CATHERBY_BANK = NullObjectID.NULL_29001;
-	public static final int OUTSIDE_THE_SEERS_VILLAGE_COURTHOUSE = NullObjectID.NULL_29002;
-	public static final int OUTSIDE_HARRYS_FISHING_SHOP_IN_CATHERBY = NullObjectID.NULL_29003;
-	public static final int TZHAAR_WEAPONS_STORE = NullObjectID.NULL_29004;
-	public static final int NORTH_OF_EVIL_DAVES_HOUSE_IN_EDGEVILLE = NullObjectID.NULL_29005;
-	public static final int WEST_OF_THE_SHAYZIEN_COMBAT_RING = NullObjectID.NULL_29006;
-	public static final int ENTRANCE_OF_THE_ARCEUUS_LIBRARY = NullObjectID.NULL_29007;
-	public static final int OUTSIDE_DRAYNOR_VILLAGE_JAIL = NullObjectID.NULL_29008;
-	public static final int CHAOS_TEMPLE_IN_THE_SOUTHEASTERN_WILDERNESS = NullObjectID.NULL_29009;
-	public static final int FISHING_GUILD_BANK = NullObjectID.NULL_29010;
-	public static final int TOP_FLOOR_OF_THE_LIGHTHOUSE = NullObjectID.NULL_29011;
-	public static final int OUTSIDE_THE_GREAT_PYRAMID_OF_SOPHANEM = NullObjectID.NULL_29012;
-	public static final int NOTERAZZOS_SHOP_IN_THE_WILDERNESS = NullObjectID.NULL_29013;
-	public static final int WEST_SIDE_OF_THE_KARAMJA_BANANA_PLANTATION = NullObjectID.NULL_29014;
-	public static final int MOUNTAIN_CAMP_GOAT_ENCLOSURE = NullObjectID.NULL_29015;
-	public static final int GNOME_GLIDER_ON_WHITE_WOLF_MOUNTAIN = NullObjectID.NULL_29016;
-	public static final int SHILO_VILLAGE_BANK = NullObjectID.NULL_29017;
-	public static final int INSIDE_THE_DIGSITE_EXAM_CENTRE = NullObjectID.NULL_29018;
-	public static final int NORTHEAST_CORNER_OF_THE_KHARAZI_JUNGLE = NullObjectID.NULL_29019;
-	public static final int VOLCANO_IN_THE_NORTHEASTERN_WILDERNESS = NullObjectID.NULL_29020;
-	public static final int IN_THE_MIDDLE_OF_JIGGIG = NullObjectID.NULL_29021;
-	public static final int AGILITY_PYRAMID = NullObjectID.NULL_29022;
-	public static final int HOSIDIUS_MESS = NullObjectID.NULL_29023;
-	public static final int CHAPEL_IN_WEST_ARDOUGNE = NullObjectID.NULL_29024;
-	public static final int NEAR_A_RUNITE_ROCK_IN_THE_FREMENNIK_ISLES = NullObjectID.NULL_29025;
-	public static final int NEAR_A_LADDER_IN_THE_WILDERNESS_LAVA_MAZE = NullObjectID.NULL_29026;
-	public static final int ENTRANCE_OF_THE_CAVE_OF_DAMIS = NullObjectID.NULL_29027;
-	public static final int WARRIORS_GUILD_BANK = NullObjectID.NULL_29028;
-	public static final int SOUTHEAST_CORNER_OF_THE_MONASTERY = NullObjectID.NULL_29029;
-	public static final int SOUTHEAST_CORNER_OF_THE_FISHING_PLATFORM = NullObjectID.NULL_29030;
-	public static final int OUTSIDE_THE_SLAYER_TOWER_GARGOYLE_ROOM = NullObjectID.NULL_29031;
-	public static final int ON_TOP_OF_TROLLHEIM_MOUNTAIN = NullObjectID.NULL_29032;
-	public static final int FOUNTAIN_OF_HEROES = NullObjectID.NULL_29033;
-	public static final int ENTRANCE_OF_THE_CAVERN_UNDER_THE_WHIRLPOOL = NullObjectID.NULL_29034;
-	public static final int HALFWAY_DOWN_TROLLWEISS_MOUNTAIN = NullObjectID.NULL_29035;
-	public static final int SHAYZIEN_WAR_TENT = NullObjectID.NULL_29036;
-	public static final int OUTSIDE_THE_LEGENDS_GUILD_DOOR = NullObjectID.NULL_29037;
-	public static final int NEAR_THE_GEM_STALL_IN_ARDOUGNE_MARKET = NullObjectID.NULL_29038;
-	public static final int OUTSIDE_THE_BAR_BY_THE_FIGHT_ARENA = NullObjectID.NULL_29039;
-	public static final int SOUTHEAST_CORNER_OF_LAVA_DRAGON_ISLE = NullObjectID.NULL_29040;
-	public static final int NEAR_THE_PIER_IN_ZULANDRA = NullObjectID.NULL_29041;
-	public static final int BARROWS_CHEST = NullObjectID.NULL_29042;
-	public static final int WELL_OF_VOYAGE = NullObjectID.NULL_29043;
-	public static final int NORTHERN_WALL_OF_CASTLE_DRAKAN = NullObjectID.NULL_29044;
-	public static final int _7TH_CHAMBER_OF_JALSAVRAH = NullObjectID.NULL_29045;
-	public static final int SOUL_ALTAR = NullObjectID.NULL_29046;
-	public static final int WARRIORS_GUILD_BANK_29047 = NullObjectID.NULL_29047;
-	public static final int ENTRANA_CHAPEL = NullObjectID.NULL_29048;
-	public static final int TZHAAR_GEM_STORE = NullObjectID.NULL_29049;
-	public static final int TENT_IN_LORD_IORWERTHS_ENCAMPMENT = NullObjectID.NULL_29050;
-	public static final int OUTSIDE_MUDKNUCKLES_HUT = NullObjectID.NULL_29051;
-	public static final int CENTRE_OF_THE_CATACOMBS_OF_KOUREND = NullObjectID.NULL_29052;
-	public static final int KING_BLACK_DRAGONS_LAIR = NullObjectID.NULL_29053;
-	public static final int OUTSIDE_KRIL_TSUTSAROTHS_ROOM = NullObjectID.NULL_29054;
-	public static final int BY_THE_BEAR_CAGE_IN_VARROCK_PALACE_GARDENS = NullObjectID.NULL_29055;
-	public static final int OUTSIDE_THE_WILDERNESS_AXE_HUT = NullObjectID.NULL_29056;
-	public static final int TOP_FLOOR_OF_THE_YANILLE_WATCHTOWER = NullObjectID.NULL_29057;
-	public static final int DEATH_ALTAR = NullObjectID.NULL_29058;
-	public static final int BEHIND_MISS_SCHISM_IN_DRAYNOR_VILLAGE = NullObjectID.NULL_29059;
-	public static final int NORTHWESTERN_CORNER_OF_THE_ENCHANTED_VALLEY = NullObjectID.NULL_29060;
-	public static final int NORTH_OF_MOUNT_KARUULM = NullObjectID.NULL_34647;
-	public static final int GYPSY_TENT_ENTRANCE = NullObjectID.NULL_34736;
-	public static final int FINE_CLOTHES_ENTRANCE = NullObjectID.NULL_34737;
-	public static final int BOB_AXES_ENTRANCE = NullObjectID.NULL_34738;
+	NEAR_A_SHED_IN_LUMBRIDGE_SWAMP(NullObjectID.NULL_28958, new WorldPoint(3201, 3171, 0)),
+	ON_THE_BRIDGE_TO_THE_MISTHALIN_WIZARDS_TOWER(NullObjectID.NULL_28959, new WorldPoint(3115, 3194, 1)),
+	DRAYNOR_VILLAGE_MARKET(NullObjectID.NULL_28960, new WorldPoint(3083, 3254, 0)),
+	LIMESTONE_MINE(NullObjectID.NULL_28961, new WorldPoint(3373, 3498, 0)),
+	OUTSIDE_THE_LEGENDS_GUILD_GATES(NullObjectID.NULL_28962, new WorldPoint(2735, 3350, 0)),
+	MUDSKIPPER_POINT(NullObjectID.NULL_28963, new WorldPoint(2988, 3111, 0)),
+	NEAR_THE_ENTRANA_FERRY_IN_PORT_SARIM(NullObjectID.NULL_28964, new WorldPoint(3050, 3237, 1)),
+	AL_KHARID_SCORPION_MINE(NullObjectID.NULL_28965, new WorldPoint(3303, 3289, 0)),
+	DRAYNOR_MANOR_BY_THE_FOUNTAIN(NullObjectID.NULL_28966, new WorldPoint(3089, 3331, 0)),
+	WHEAT_FIELD_NEAR_THE_LUMBRIDGE_WINDMILL(NullObjectID.NULL_28967, new WorldPoint(3163, 3297, 0)),
+	CROSSROADS_NORTH_OF_DRAYNOR_VILLAGE(NullObjectID.NULL_28968, new WorldPoint(3111, 3289, 0)),
+	RIMMINGTON_MINE(NullObjectID.NULL_28969, new WorldPoint(2976, 3239, 0)),
+	VARROCK_PALACE_LIBRARY(NullObjectID.NULL_28970, new WorldPoint(3214, 3490, 0)),
+	UPSTAIRS_IN_THE_ARDOUGNE_WINDMILL(NullObjectID.NULL_28971, new WorldPoint(2635, 3386, 2)),
+	OUTSIDE_THE_FALADOR_PARTY_ROOM(NullObjectID.NULL_28972, new WorldPoint(3043, 3371, 0)),
+	TAVERLEY_STONE_CIRCLE(NullObjectID.NULL_28973, new WorldPoint(2924, 3477, 0)),
+	CATHERBY_BEEHIVE_FIELD(NullObjectID.NULL_28974, new WorldPoint(2764, 3438, 0)),
+	NEAR_THE_PARROTS_IN_ARDOUGNE_ZOO(NullObjectID.NULL_28975, new WorldPoint(2608, 3284, 0)),
+	ROAD_JUNCTION_NORTH_OF_RIMMINGTON(NullObjectID.NULL_28976, new WorldPoint(2981, 3278, 0)),
+	OUTSIDE_THE_FISHING_GUILD(NullObjectID.NULL_28977, new WorldPoint(2608, 3393, 0)),
+	OUTSIDE_KEEP_LE_FAYE(NullObjectID.NULL_28978, new WorldPoint(2756, 3399, 0)),
+	ROAD_JUNCTION_SOUTH_OF_SINCLAIR_MANSION(NullObjectID.NULL_28979, new WorldPoint(2735, 3534, 0)),
+	OUTSIDE_THE_DIGSITE_EXAM_CENTRE(NullObjectID.NULL_28980, new WorldPoint(3353, 3343, 0)),
+	NEAR_THE_SAWMILL_OPERATORS_BOOTH(NullObjectID.NULL_28981, new WorldPoint(3298, 3490, 0)),
+	MUBARIZS_ROOM_AT_THE_DUEL_ARENA(NullObjectID.NULL_28982, new WorldPoint(3316, 3242, 0)),
+	OUTSIDE_VARROCK_PALACE_COURTYARD(NullObjectID.NULL_28983, new WorldPoint(3211, 3456, 0)),
+	NEAR_HERQUINS_SHOP_IN_FALADOR(NullObjectID.NULL_28984, new WorldPoint(2941, 3339, 0)),
+	SOUTH_OF_THE_GRAND_EXCHANGE(NullObjectID.NULL_28985, new WorldPoint(3159, 3464, 0)),
+	AUBURYS_SHOP_IN_VARROCK(NullObjectID.NULL_28986, new WorldPoint(3252, 3404, 0)),
+	CENTRE_OF_CANIFIS(NullObjectID.NULL_28987, new WorldPoint(3491, 3489, 0)),
+	MAUSOLEUM_OFF_THE_MORYTANIA_COAST(NullObjectID.NULL_28988, new WorldPoint(3500, 3575, 0)),
+	EAST_OF_THE_BARBARIAN_VILLAGE_BRIDGE(NullObjectID.NULL_28989, new WorldPoint(3110, 3422, 0)),
+	SOUTH_OF_THE_SHRINE_IN_TAI_BWO_WANNAI_VILLAGE(NullObjectID.NULL_28990, new WorldPoint(2802, 3081, 0)),
+	CASTLE_WARS_BANK(NullObjectID.NULL_28991, new WorldPoint(2444, 3093, 0)),
+	BARBARIAN_OUTPOST_OBSTACLE_COURSE(NullObjectID.NULL_28992, new WorldPoint(2541, 3550, 0)),
+	GNOME_STRONGHOLD_BALANCING_ROPE(NullObjectID.NULL_28993, new WorldPoint(2473, 3418, 2)),
+	OUTSIDE_YANILLE_BANK(NullObjectID.NULL_28994, new WorldPoint(2603, 3091, 0)),
+	OBSERVATORY(NullObjectID.NULL_28995, new WorldPoint(2439, 3166, 0)),
+	OGRE_CAGE_IN_KING_LATHAS_TRAINING_CAMP(NullObjectID.NULL_28996, new WorldPoint(2533, 3377, 0)),
+	DIGSITE(NullObjectID.NULL_28997, new WorldPoint(3370, 3420, 0)),
+	HICKTONS_ARCHERY_EMPORIUM(NullObjectID.NULL_28998, new WorldPoint(2825, 3441, 0)),
+	SHANTAY_PASS(NullObjectID.NULL_28999, new WorldPoint(3308, 3125, 0)),
+	LUMBRIDGE_SWAMP_CAVES(NullObjectID.NULL_29000, new WorldPoint(3222, 9584, 0), new WorldPoint(3167, 9570, 0)),
+	OUTSIDE_CATHERBY_BANK(NullObjectID.NULL_29001, new WorldPoint(2807, 3437, 0)),
+	OUTSIDE_THE_SEERS_VILLAGE_COURTHOUSE(NullObjectID.NULL_29002, new WorldPoint(2731, 3475, 0)),
+	OUTSIDE_HARRYS_FISHING_SHOP_IN_CATHERBY(NullObjectID.NULL_29003, new WorldPoint(2837, 3436, 0)),
+	TZHAAR_WEAPONS_STORE(NullObjectID.NULL_29004, new WorldPoint(2479, 5146, 0)),
+	NORTH_OF_EVIL_DAVES_HOUSE_IN_EDGEVILLE(NullObjectID.NULL_29005, new WorldPoint(3077, 3503, 0)),
+	WEST_OF_THE_SHAYZIEN_COMBAT_RING(NullObjectID.NULL_29006, new WorldPoint(1534, 3591, 0)),
+	ENTRANCE_OF_THE_ARCEUUS_LIBRARY(NullObjectID.NULL_29007, new WorldPoint(1642, 3809, 0)),
+	OUTSIDE_DRAYNOR_VILLAGE_JAIL(NullObjectID.NULL_29008, new WorldPoint(3130, 3250, 0)),
+	CHAOS_TEMPLE_IN_THE_SOUTHEASTERN_WILDERNESS(NullObjectID.NULL_29009, new WorldPoint(3245, 3609, 0)),
+	FISHING_GUILD_BANK(NullObjectID.NULL_29010, new WorldPoint(2593, 3409, 0)),
+	TOP_FLOOR_OF_THE_LIGHTHOUSE(NullObjectID.NULL_29011, new WorldPoint(2512, 3640, 2)),
+	OUTSIDE_THE_GREAT_PYRAMID_OF_SOPHANEM(NullObjectID.NULL_29012, new WorldPoint(3291, 2780, 0)),
+	NOTERAZZOS_SHOP_IN_THE_WILDERNESS(NullObjectID.NULL_29013, new WorldPoint(3027, 3699, 0)),
+	WEST_SIDE_OF_THE_KARAMJA_BANANA_PLANTATION(NullObjectID.NULL_29014, new WorldPoint(2909, 3169, 0)),
+	MOUNTAIN_CAMP_GOAT_ENCLOSURE(NullObjectID.NULL_29015, new WorldPoint(2810, 3677, 0)),
+	GNOME_GLIDER_ON_WHITE_WOLF_MOUNTAIN(NullObjectID.NULL_29016, new WorldPoint(2849, 3496, 0)),
+	SHILO_VILLAGE_BANK(NullObjectID.NULL_29017, new WorldPoint(2853, 2952, 0)),
+	INSIDE_THE_DIGSITE_EXAM_CENTRE(NullObjectID.NULL_29018, new WorldPoint(3356, 3333, 0)),
+	NORTHEAST_CORNER_OF_THE_KHARAZI_JUNGLE(NullObjectID.NULL_29019, new WorldPoint(2952, 2932, 0)),
+	VOLCANO_IN_THE_NORTHEASTERN_WILDERNESS(NullObjectID.NULL_29020, new WorldPoint(3368, 3930, 0)),
+	IN_THE_MIDDLE_OF_JIGGIG(NullObjectID.NULL_29021, new WorldPoint(2478, 3048, 0)),
+	AGILITY_PYRAMID(NullObjectID.NULL_29022, new WorldPoint(3357, 2830, 0)),
+	HOSIDIUS_MESS(NullObjectID.NULL_29023, new WorldPoint(1648, 3631, 0)),
+	CHAPEL_IN_WEST_ARDOUGNE(NullObjectID.NULL_29024, new WorldPoint(2527, 3294, 0)),
+	NEAR_A_RUNITE_ROCK_IN_THE_FREMENNIK_ISLES(NullObjectID.NULL_29025, new WorldPoint(2374, 3847, 0)),
+	NEAR_A_LADDER_IN_THE_WILDERNESS_LAVA_MAZE(NullObjectID.NULL_29026, new WorldPoint(3069, 3862, 0)),
+	ENTRANCE_OF_THE_CAVE_OF_DAMIS(NullObjectID.NULL_29027, new WorldPoint(2629, 5070, 0)),
+	WARRIORS_GUILD_BANK(NullObjectID.NULL_29028, new WorldPoint(2844, 3537, 0)),
+	SOUTHEAST_CORNER_OF_THE_MONASTERY(NullObjectID.NULL_29029, new WorldPoint(3056, 3482, 0)),
+	SOUTHEAST_CORNER_OF_THE_FISHING_PLATFORM(NullObjectID.NULL_29030, new WorldPoint(2787, 3277, 1)),
+	OUTSIDE_THE_SLAYER_TOWER_GARGOYLE_ROOM(NullObjectID.NULL_29031, new WorldPoint(3423, 3534, 2)),
+	ON_TOP_OF_TROLLHEIM_MOUNTAIN(NullObjectID.NULL_29032, new WorldPoint(2886, 3676, 0)),
+	FOUNTAIN_OF_HEROES(NullObjectID.NULL_29033, new WorldPoint(2916, 9891, 0)),
+	ENTRANCE_OF_THE_CAVERN_UNDER_THE_WHIRLPOOL(NullObjectID.NULL_29034, new WorldPoint(1764, 5367, 1), new WorldPoint(1636, 5367, 1)),
+	HALFWAY_DOWN_TROLLWEISS_MOUNTAIN(NullObjectID.NULL_29035, new WorldPoint(2782, 3787, 0)),
+	SHAYZIEN_WAR_TENT(NullObjectID.NULL_29036, new WorldPoint(1550, 3541, 0)),
+	OUTSIDE_THE_LEGENDS_GUILD_DOOR(NullObjectID.NULL_29037, new WorldPoint(2727, 3371, 0)),
+	NEAR_THE_GEM_STALL_IN_ARDOUGNE_MARKET(NullObjectID.NULL_29038, new WorldPoint(2672, 3302, 0)),
+	OUTSIDE_THE_BAR_BY_THE_FIGHT_ARENA(NullObjectID.NULL_29039, new WorldPoint(2571, 3150, 0)),
+	SOUTHEAST_CORNER_OF_LAVA_DRAGON_ISLE(NullObjectID.NULL_29040, new WorldPoint(3228, 3830, 0)),
+	NEAR_THE_PIER_IN_ZULANDRA(NullObjectID.NULL_29041, new WorldPoint(2203, 3059, 0)),
+	BARROWS_CHEST(NullObjectID.NULL_29042, new WorldPoint(3547, 9690, 0)),
+	WELL_OF_VOYAGE(NullObjectID.NULL_29043, new WorldPoint(2006, 4709, 1)),
+	NORTHERN_WALL_OF_CASTLE_DRAKAN(NullObjectID.NULL_29044, new WorldPoint(3559, 3385, 1)),
+	_7TH_CHAMBER_OF_JALSAVRAH(NullObjectID.NULL_29045, new WorldPoint(1951, 4431, 0)),
+	SOUL_ALTAR(NullObjectID.NULL_29046, new WorldPoint(1810, 3855, 0)),
+	WARRIORS_GUILD_BANK_29047(NullObjectID.NULL_29047, new WorldPoint(2845, 3545, 0)),
+	ENTRANA_CHAPEL(NullObjectID.NULL_29048, new WorldPoint(2851, 3355, 0)),
+	TZHAAR_GEM_STORE(NullObjectID.NULL_29049, new WorldPoint(2466, 5150, 0)),
+	TENT_IN_LORD_IORWERTHS_ENCAMPMENT(NullObjectID.NULL_29050, new WorldPoint(2198, 3257, 0)),
+	OUTSIDE_MUDKNUCKLES_HUT(NullObjectID.NULL_29051, new WorldPoint(2959, 3502, 0)),
+	CENTRE_OF_THE_CATACOMBS_OF_KOUREND(NullObjectID.NULL_29052, new WorldPoint(1661, 10045, 0)),
+	KING_BLACK_DRAGONS_LAIR(NullObjectID.NULL_29053, new WorldPoint(2286, 4680, 0)),
+	OUTSIDE_KRIL_TSUTSAROTHS_ROOM(NullObjectID.NULL_29054, new WorldPoint(2931, 5337, 2)),
+	BY_THE_BEAR_CAGE_IN_VARROCK_PALACE_GARDENS(NullObjectID.NULL_29055, new WorldPoint(3232, 3494, 0)),
+	OUTSIDE_THE_WILDERNESS_AXE_HUT(NullObjectID.NULL_29056, new WorldPoint(3186, 3958, 0)),
+	TOP_FLOOR_OF_THE_YANILLE_WATCHTOWER(NullObjectID.NULL_29057, new WorldPoint(2930, 4718, 2)),
+	DEATH_ALTAR(NullObjectID.NULL_29058, new WorldPoint(2210, 4842, 0)),
+	BEHIND_MISS_SCHISM_IN_DRAYNOR_VILLAGE(NullObjectID.NULL_29059, new WorldPoint(3095, 3254, 0)),
+	NORTHWESTERN_CORNER_OF_THE_ENCHANTED_VALLEY(NullObjectID.NULL_29060, new WorldPoint(3022, 4517, 0)),
+	NORTH_OF_MOUNT_KARUULM(NullObjectID.NULL_34647, new WorldPoint(1308, 3840, 0)),
+	GYPSY_TENT_ENTRANCE(NullObjectID.NULL_34736, new WorldPoint(3206, 3422, 0)),
+	FINE_CLOTHES_ENTRANCE(NullObjectID.NULL_34737, new WorldPoint(3209, 3416, 0)),
+	BOB_AXES_ENTRANCE(NullObjectID.NULL_34738, new WorldPoint(3233, 3200, 0));
+
+	private final int objectId;
+	private final WorldPoint[] worldPoints;
+
+	STASHUnit(int objectId, WorldPoint... worldPoints)
+	{
+		this.objectId = objectId;
+		this.worldPoints = worldPoints;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
index 93ee8e6412..a08497663d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
@@ -31,7 +31,11 @@ import java.time.Instant;
 import javax.inject.Inject;
 import lombok.AccessLevel;
 import lombok.Getter;
+import static net.runelite.api.AnimationID.COOKING_WINE;
 import net.runelite.api.ChatMessageType;
+import net.runelite.api.Client;
+import net.runelite.api.Player;
+import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.GameTick;
 import net.runelite.client.config.ConfigManager;
@@ -50,7 +54,8 @@ import net.runelite.client.ui.overlay.OverlayManager;
 @PluginDependency(XpTrackerPlugin.class)
 public class CookingPlugin extends Plugin
 {
-	private static final String WINE_MESSAGE = "You squeeze the grapes into the jug";
+	@Inject
+	private Client client;
 
 	@Inject
 	private CookingConfig config;
@@ -124,6 +129,27 @@ public class CookingPlugin extends Plugin
 		}
 	}
 
+	@Subscribe
+	public void onAnimationChanged(AnimationChanged animationChanged)
+	{
+		Player localPlayer = client.getLocalPlayer();
+
+		if (localPlayer != animationChanged.getActor())
+		{
+			return;
+		}
+
+		if (localPlayer.getAnimation() == COOKING_WINE && config.fermentTimer())
+		{
+			if (fermentTimerSession == null)
+			{
+				fermentTimerSession = new FermentTimerSession();
+			}
+
+			fermentTimerSession.updateLastWineMakingAction();
+		}
+	}
+
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
@@ -134,22 +160,11 @@ public class CookingPlugin extends Plugin
 
 		final String message = event.getMessage();
 
-		if (message.startsWith(WINE_MESSAGE) && config.fermentTimer())
-		{
-			if (fermentTimerSession == null)
-			{
-				fermentTimerSession = new FermentTimerSession();
-			}
-
-			fermentTimerSession.updateLastWineMakingAction();
-		}
-
 		if (message.startsWith("You successfully cook")
 			|| message.startsWith("You successfully bake")
 			|| message.startsWith("You manage to cook")
 			|| message.startsWith("You roast a")
-			|| message.startsWith("You cook")
-			|| message.startsWith(WINE_MESSAGE))
+			|| message.startsWith("You cook"))
 		{
 			if (cookingSession == null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index eda3a64dce..fe36cce8f7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -1008,7 +1008,10 @@ public class MenuEntrySwapperPlugin extends Plugin
 		{
 			swap(client, "pay-toll(10gp)", option, target, true);
 		}
-
+		else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors"))
+		{
+			swap(client, "quick-pay(100)", option, target, true);
+		}
 		else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
 		{
 			swap(client, "travel", option, target, true);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
new file mode 100644
index 0000000000..61a40bd10e
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2019, Anthony Chen <https://github.com/achencoms>
+ * 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.musiclist;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import net.runelite.api.Client;
+import net.runelite.api.GameState;
+import net.runelite.api.ScriptID;
+import net.runelite.api.SoundEffectID;
+import net.runelite.api.SpriteID;
+import net.runelite.api.VarClientInt;
+import net.runelite.api.events.GameStateChanged;
+import net.runelite.api.events.VarClientIntChanged;
+import net.runelite.api.events.WidgetLoaded;
+import net.runelite.api.widgets.JavaScriptCallback;
+import net.runelite.api.widgets.Widget;
+import net.runelite.api.widgets.WidgetID;
+import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.api.widgets.WidgetPositionMode;
+import net.runelite.api.widgets.WidgetType;
+import net.runelite.client.callback.ClientThread;
+import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.game.chatbox.ChatboxPanelManager;
+import net.runelite.client.game.chatbox.ChatboxTextInput;
+import net.runelite.client.plugins.Plugin;
+import net.runelite.client.plugins.PluginDescriptor;
+
+@PluginDescriptor(
+	name = "Music List",
+	description = "Adds search and filter for the music list"
+)
+public class MusicListPlugin extends Plugin
+{
+	@Inject
+	private Client client;
+
+	@Inject
+	private ClientThread clientThread;
+
+	@Inject
+	private ChatboxPanelManager chatboxPanelManager;
+
+	private ChatboxTextInput searchInput;
+
+	private Widget musicSearchButton;
+	private Widget musicFilterButton;
+
+	private Collection<Widget> tracks;
+
+	private MusicState currentMusicFilter;
+
+	@Override
+	protected void startUp()
+	{
+		clientThread.invoke(this::addMusicButtons);
+	}
+
+	@Override
+	protected void shutDown()
+	{
+		Widget header = client.getWidget(WidgetInfo.MUSIC_WINDOW);
+		if (header != null)
+		{
+			header.deleteAllChildren();
+		}
+
+		tracks = null;
+	}
+
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged gameStateChanged)
+	{
+		if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN)
+		{
+			currentMusicFilter = MusicState.ALL;
+			tracks = null;
+		}
+	}
+
+	@Subscribe
+	public void onWidgetLoaded(WidgetLoaded widgetLoaded)
+	{
+		if (widgetLoaded.getGroupId() == WidgetID.MUSIC_GROUP_ID)
+		{
+			addMusicButtons();
+		}
+	}
+
+	private void addMusicButtons()
+	{
+		Widget header = client.getWidget(WidgetInfo.MUSIC_WINDOW);
+
+		if (header == null)
+		{
+			return;
+		}
+
+		//Creation of the search and toggle status buttons
+		musicSearchButton = header.createChild(-1, WidgetType.GRAPHIC);
+		musicSearchButton.setSpriteId(SpriteID.GE_SEARCH);
+		musicSearchButton.setOriginalWidth(18);
+		musicSearchButton.setOriginalHeight(17);
+		musicSearchButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
+		musicSearchButton.setOriginalX(5);
+		musicSearchButton.setOriginalY(32);
+		musicSearchButton.setHasListener(true);
+		musicSearchButton.setAction(1, "Open");
+		musicSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
+		musicSearchButton.setName("Search");
+		musicSearchButton.revalidate();
+
+		musicFilterButton = header.createChild(-1, WidgetType.GRAPHIC);
+		musicFilterButton.setSpriteId(SpriteID.MINIMAP_ORB_HITPOINTS);
+		musicFilterButton.setOriginalWidth(15);
+		musicFilterButton.setOriginalHeight(15);
+		musicFilterButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
+		musicFilterButton.setOriginalX(25);
+		musicFilterButton.setOriginalY(34);
+		musicFilterButton.setHasListener(true);
+		musicFilterButton.setAction(1, "Toggle");
+		musicFilterButton.setOnOpListener((JavaScriptCallback) e -> toggleStatus());
+		musicFilterButton.setName("All");
+		musicFilterButton.revalidate();
+	}
+
+	@Subscribe
+	public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged)
+	{
+		if (isChatboxOpen() && !isOnMusicTab())
+		{
+			chatboxPanelManager.close();
+		}
+	}
+
+	private boolean isOnMusicTab()
+	{
+		return client.getVar(VarClientInt.INVENTORY_TAB) == 13;
+	}
+
+	private boolean isChatboxOpen()
+	{
+		return searchInput != null && chatboxPanelManager.getCurrentInput() == searchInput;
+	}
+
+	private String getChatboxInput()
+	{
+		return isChatboxOpen() ? searchInput.getValue() : "";
+	}
+
+	private void toggleStatus()
+	{
+		MusicState[] states = MusicState.values();
+		currentMusicFilter = states[(currentMusicFilter.ordinal() + 1) % states.length];
+		musicFilterButton.setSpriteId(currentMusicFilter.getSpriteID());
+		musicFilterButton.setName(currentMusicFilter.getName());
+		updateFilter(getChatboxInput());
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+	}
+
+	private void openSearch()
+	{
+		updateFilter("");
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+		musicSearchButton.setAction(1, "Close");
+		musicSearchButton.setOnOpListener((JavaScriptCallback) e -> closeSearch());
+		searchInput = chatboxPanelManager.openTextInput("Search music list")
+			.onChanged(s -> clientThread.invokeLater(() -> updateFilter(s.trim())))
+			.onClose(() ->
+			{
+				clientThread.invokeLater(() -> updateFilter(""));
+				musicSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
+				musicSearchButton.setAction(1, "Open");
+			})
+			.build();
+	}
+
+	private void closeSearch()
+	{
+		updateFilter("");
+		chatboxPanelManager.close();
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+	}
+
+	private void updateFilter(String input)
+	{
+		final Widget container = client.getWidget(WidgetInfo.MUSIC_WINDOW);
+		final Widget musicList = client.getWidget(WidgetInfo.MUSIC_TRACK_LIST);
+
+		if (container == null || musicList == null)
+		{
+			return;
+		}
+
+		String filter = input.toLowerCase();
+		updateList(musicList, filter);
+	}
+
+	private void updateList(Widget musicList, String filter)
+	{
+		if (tracks == null)
+		{
+			tracks = Arrays.stream(musicList.getDynamicChildren())
+				.sorted(Comparator.comparing(Widget::getRelativeY))
+				.collect(Collectors.toList());
+		}
+
+		tracks.forEach(w -> w.setHidden(true));
+
+		Collection<Widget> relevantTracks = tracks.stream()
+			.filter(w -> w.getText().toLowerCase().contains(filter))
+			.filter(w -> currentMusicFilter == MusicState.ALL || w.getTextColor() == currentMusicFilter.getColor())
+			.collect(Collectors.toList());
+
+		// Original music track list has a little offset
+		int y = 3;
+
+		for (Widget track : relevantTracks)
+		{
+			track.setHidden(false);
+			track.setOriginalY(y);
+			track.revalidate();
+
+			y += track.getHeight();
+		}
+
+		y += 3;
+
+		int newHeight = 0;
+
+		if (musicList.getScrollHeight() > 0)
+		{
+			newHeight = (musicList.getScrollY() * y) / musicList.getScrollHeight();
+		}
+
+		musicList.setScrollHeight(y);
+		musicList.revalidateScroll();
+
+		client.runScript(
+			ScriptID.UPDATE_SCROLLBAR,
+			WidgetInfo.MUSIC_TRACK_SCROLLBAR.getId(),
+			WidgetInfo.MUSIC_TRACK_LIST.getId(),
+			newHeight
+		);
+	}
+
+	@AllArgsConstructor
+	@Getter
+	private enum MusicState
+	{
+		NOT_FOUND(0xff0000, "Locked", SpriteID.MINIMAP_ORB_HITPOINTS),
+		FOUND(0xdc10d, "Unlocked", SpriteID.MINIMAP_ORB_HITPOINTS_POISON),
+		ALL(0, "All", SpriteID.MINIMAP_ORB_PRAYER);
+
+		private final int color;
+		private final String name;
+		private final int spriteID;
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
index 20871956d9..0a18b8d2c9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
@@ -1,398 +1,419 @@
-/*
- * Copyright (c) 2019 Spudjb <https://github.com/spudjb>
- * 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.questlist;
-
-import com.google.common.collect.ImmutableList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.inject.Inject;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.ScriptID;
-import net.runelite.api.SoundEffectID;
-import net.runelite.api.SpriteID;
-import net.runelite.api.VarClientInt;
-import net.runelite.api.Varbits;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.ScriptCallbackEvent;
-import net.runelite.api.events.VarClientIntChanged;
-import net.runelite.api.events.VarbitChanged;
-import net.runelite.api.widgets.JavaScriptCallback;
-import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.api.widgets.WidgetPositionMode;
-import net.runelite.api.widgets.WidgetType;
-import net.runelite.client.callback.ClientThread;
-import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.game.chatbox.ChatboxPanelManager;
-import net.runelite.client.game.chatbox.ChatboxTextInput;
-import net.runelite.client.plugins.Plugin;
-import net.runelite.client.plugins.PluginDescriptor;
-import net.runelite.client.util.Text;
-
-@PluginDescriptor(
-	name = "Quest List",
-	description = "Adds searching and filtering to the quest list"
-)
-public class QuestListPlugin extends Plugin
-{
-	private static final int ENTRY_PADDING = 8;
-	private static final List<String> QUEST_HEADERS = ImmutableList.of("Free Quests", "Members' Quests", "Miniquests");
-
-	private static final String MENU_OPEN = "Open";
-	private static final String MENU_CLOSE = "Close";
-
-	private static final String MENU_TOGGLE = "Toggle";
-
-	private static final String MENU_SEARCH = "Search";
-	private static final String MENU_SHOW = "Show";
-
-	@Inject
-	private Client client;
-
-	@Inject
-	private ChatboxPanelManager chatboxPanelManager;
-
-	@Inject
-	private ClientThread clientThread;
-
-	private ChatboxTextInput searchInput;
-	private Widget questSearchButton;
-	private Widget questHideButton;
-
-	private EnumMap<QuestContainer, Collection<QuestWidget>> questSet;
-
-	private QuestState currentFilterState;
-
-	@Subscribe
-	public void onGameStateChanged(GameStateChanged e)
-	{
-		if (e.getGameState() == GameState.LOGGING_IN)
-		{
-			currentFilterState = QuestState.ALL;
-		}
-	}
-
-	@Subscribe
-	public void onScriptCallbackEvent(ScriptCallbackEvent event)
-	{
-		if (!event.getEventName().equals("questProgressUpdated"))
-		{
-			return;
-		}
-
-		Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX);
-		if (header != null)
-		{
-			questSearchButton = header.createChild(-1, WidgetType.GRAPHIC);
-			questSearchButton.setSpriteId(SpriteID.GE_SEARCH);
-			questSearchButton.setOriginalWidth(18);
-			questSearchButton.setOriginalHeight(17);
-			questSearchButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
-			questSearchButton.setOriginalX(5);
-			questSearchButton.setOriginalY(0);
-			questSearchButton.setHasListener(true);
-			questSearchButton.setAction(1, MENU_OPEN);
-			questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
-			questSearchButton.setName(MENU_SEARCH);
-			questSearchButton.revalidate();
-
-			questHideButton = header.createChild(-1, WidgetType.GRAPHIC);
-			redrawHideButton();
-
-			questHideButton.setOriginalWidth(13);
-			questHideButton.setOriginalHeight(13);
-			questHideButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
-			questHideButton.setOriginalX(24);
-			questHideButton.setOriginalY(2);
-			questHideButton.setHasListener(true);
-			questHideButton.setOnOpListener((JavaScriptCallback) e -> toggleHidden());
-			questHideButton.setAction(1, MENU_TOGGLE);
-			questHideButton.revalidate();
-
-			questSet = new EnumMap<>(QuestContainer.class);
-
-			updateFilter();
-		}
-	}
-
-	@Subscribe
-	public void onVarbitChanged(VarbitChanged varbitChanged)
-	{
-		if (isChatboxOpen() && !isOnQuestTab())
-		{
-			chatboxPanelManager.close();
-		}
-	}
-
-	@Subscribe
-	public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged)
-	{
-		if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex())
-		{
-			if (isChatboxOpen() && !isOnQuestTab())
-			{
-				chatboxPanelManager.close();
-			}
-		}
-	}
-
-	private void toggleHidden()
-	{
-		QuestState[] questStates = QuestState.values();
-		int nextState = (currentFilterState.ordinal() + 1) % questStates.length;
-		currentFilterState = questStates[nextState];
-
-		redrawHideButton();
-
-		updateFilter();
-		client.playSoundEffect(SoundEffectID.UI_BOOP);
-	}
-
-	private void redrawHideButton()
-	{
-		questHideButton.setSpriteId(currentFilterState.getSpriteId());
-		questHideButton.setName(MENU_SHOW + " " + currentFilterState.getName());
-	}
-
-	private boolean isOnQuestTab()
-	{
-		return client.getVar(Varbits.QUEST_TAB) == 0 && client.getVar(VarClientInt.INVENTORY_TAB) == 2;
-	}
-
-	private boolean isChatboxOpen()
-	{
-		return searchInput != null && chatboxPanelManager.getCurrentInput() == searchInput;
-	}
-
-	private void closeSearch()
-	{
-		updateFilter("");
-		chatboxPanelManager.close();
-		client.playSoundEffect(SoundEffectID.UI_BOOP);
-	}
-
-	private void openSearch()
-	{
-		updateFilter("");
-		client.playSoundEffect(SoundEffectID.UI_BOOP);
-		questSearchButton.setAction(1, MENU_CLOSE);
-		questSearchButton.setOnOpListener((JavaScriptCallback) e -> closeSearch());
-		searchInput = chatboxPanelManager.openTextInput("Search quest list")
-			.onChanged(s -> clientThread.invokeLater(() -> updateFilter(s)))
-			.onClose(() ->
-			{
-				clientThread.invokeLater(() -> updateFilter(""));
-				questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
-				questSearchButton.setAction(1, MENU_OPEN);
-			})
-			.build();
-	}
-
-	private void updateFilter()
-	{
-		String filter = "";
-		if (isChatboxOpen())
-		{
-			filter = searchInput.getValue();
-		}
-
-		updateFilter(filter);
-	}
-
-	private void updateFilter(String filter)
-	{
-		filter = filter.toLowerCase();
-		final Widget container = client.getWidget(WidgetInfo.QUESTLIST_CONTAINER);
-
-		final Widget freeList = client.getWidget(QuestContainer.FREE_QUESTS.widgetInfo);
-		final Widget memberList = client.getWidget(QuestContainer.MEMBER_QUESTS.widgetInfo);
-		final Widget miniList = client.getWidget(QuestContainer.MINI_QUESTS.widgetInfo);
-
-		if (container == null || freeList == null || memberList == null || miniList == null)
-		{
-			return;
-		}
-
-		updateList(QuestContainer.FREE_QUESTS, filter);
-		updateList(QuestContainer.MEMBER_QUESTS, filter);
-		updateList(QuestContainer.MINI_QUESTS, filter);
-
-		memberList.setOriginalY(freeList.getOriginalY() + freeList.getOriginalHeight() + ENTRY_PADDING);
-		miniList.setOriginalY(memberList.getOriginalY() + memberList.getOriginalHeight() + ENTRY_PADDING);
-
-		// originalHeight is changed within updateList so revalidate all lists
-		freeList.revalidate();
-		memberList.revalidate();
-		miniList.revalidate();
-
-		int y = miniList.getRelativeY() + miniList.getHeight() + 10;
-
-		int newHeight;
-		if (container.getScrollHeight() > 0)
-		{
-			newHeight = (container.getScrollY() * y) / container.getScrollHeight();
-		}
-		else
-		{
-			newHeight = 0;
-		}
-
-		container.setScrollHeight(y);
-		container.revalidateScroll();
-
-		clientThread.invokeLater(() ->
-			client.runScript(
-				ScriptID.UPDATE_SCROLLBAR,
-				WidgetInfo.QUESTLIST_SCROLLBAR.getId(),
-				WidgetInfo.QUESTLIST_CONTAINER.getId(),
-				newHeight
-			));
-	}
-
-	private void updateList(QuestContainer questContainer, String filter)
-	{
-		Widget list = client.getWidget(questContainer.widgetInfo);
-		if (list == null)
-		{
-			return;
-		}
-
-		Collection<QuestWidget> quests = questSet.get(questContainer);
-
-		if (quests != null)
-		{
-			// Check to make sure the list hasn't been rebuild since we were last her
-			// Do this by making sure the list's dynamic children are the same as when we last saw them
-			if (quests.stream().noneMatch(w ->
-			{
-				Widget codeWidget = w.getQuest();
-				if (codeWidget == null)
-				{
-					return false;
-				}
-				return list.getChild(codeWidget.getIndex()) == codeWidget;
-			}))
-			{
-				quests = null;
-			}
-		}
-
-		if (quests == null)
-		{
-			// Find all of the widgets that we care about, sorting by their Y value
-			quests = Arrays.stream(list.getDynamicChildren())
-				.sorted(Comparator.comparing(Widget::getRelativeY))
-				.filter(w -> !QUEST_HEADERS.contains(w.getText()))
-				.map(w -> new QuestWidget(w, Text.removeTags(w.getText()).toLowerCase()))
-				.collect(Collectors.toList());
-			questSet.put(questContainer, quests);
-		}
-
-		// offset because of header
-		int y = 20;
-		for (QuestWidget questInfo : quests)
-		{
-			Widget quest = questInfo.getQuest();
-			QuestState questState = QuestState.getByColor(quest.getTextColor());
-
-			boolean hidden;
-			if (!filter.isEmpty())
-			{
-				// If searching, show result regardless of filtered state
-				hidden = !questInfo.getTitle().contains(filter);
-			}
-			else
-			{
-				// Otherwise hide if it doesn't match the filter state
-				hidden = currentFilterState != QuestState.ALL && questState != currentFilterState;
-			}
-
-			quest.setHidden(hidden);
-			quest.setOriginalY(y);
-			quest.revalidate();
-
-			if (!hidden)
-			{
-				y += quest.getHeight();
-			}
-		}
-
-		list.setOriginalHeight(y);
-	}
-
-	@AllArgsConstructor
-	@Getter
-	private enum QuestContainer
-	{
-		FREE_QUESTS(WidgetInfo.QUESTLIST_FREE_CONTAINER),
-		MEMBER_QUESTS(WidgetInfo.QUESTLIST_MEMBERS_CONTAINER),
-		MINI_QUESTS(WidgetInfo.QUESTLIST_MINIQUEST_CONTAINER);
-
-		private final WidgetInfo widgetInfo;
-	}
-
-	@AllArgsConstructor
-	@Getter
-	private enum QuestState
-	{
-		NOT_STARTED(0xff0000, "Not started", SpriteID.MINIMAP_ORB_HITPOINTS),
-		IN_PROGRESS(0xffff00, "In progress", SpriteID.MINIMAP_ORB_HITPOINTS_DISEASE),
-		COMPLETE(0xdc10d, "Completed", SpriteID.MINIMAP_ORB_HITPOINTS_POISON),
-		ALL(0, "All", SpriteID.MINIMAP_ORB_PRAYER);
-
-		private final int color;
-		private final String name;
-		private final int spriteId;
-
-		static QuestState getByColor(int color)
-		{
-			for (QuestState value : values())
-			{
-				if (value.getColor() == color)
-				{
-					return value;
-				}
-			}
-
-			return null;
-		}
-	}
-
-	@Data
-	@AllArgsConstructor
-	private static class QuestWidget
-	{
-		private Widget quest;
-		private String title;
-	}
-}
+/*
+ * Copyright (c) 2019 Spudjb <https://github.com/spudjb>
+ * 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.questlist;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import net.runelite.api.Client;
+import net.runelite.api.GameState;
+import net.runelite.api.ScriptID;
+import net.runelite.api.SoundEffectID;
+import net.runelite.api.SpriteID;
+import net.runelite.api.VarClientInt;
+import net.runelite.api.Varbits;
+import net.runelite.api.events.GameStateChanged;
+import net.runelite.api.events.ScriptCallbackEvent;
+import net.runelite.api.events.VarClientIntChanged;
+import net.runelite.api.events.VarbitChanged;
+import net.runelite.api.widgets.JavaScriptCallback;
+import net.runelite.api.widgets.Widget;
+import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.api.widgets.WidgetPositionMode;
+import net.runelite.api.widgets.WidgetType;
+import net.runelite.client.callback.ClientThread;
+import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.game.chatbox.ChatboxPanelManager;
+import net.runelite.client.game.chatbox.ChatboxTextInput;
+import net.runelite.client.plugins.Plugin;
+import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.util.Text;
+
+@PluginDescriptor(
+	name = "Quest List",
+	description = "Adds searching and filtering to the quest list"
+)
+public class QuestListPlugin extends Plugin
+{
+	private static final int ENTRY_PADDING = 8;
+	private static final List<String> QUEST_HEADERS = ImmutableList.of("Free Quests", "Members' Quests", "Miniquests");
+
+	private static final String MENU_OPEN = "Open";
+	private static final String MENU_CLOSE = "Close";
+
+	private static final String MENU_TOGGLE = "Toggle";
+
+	private static final String MENU_SEARCH = "Search";
+	private static final String MENU_SHOW = "Show";
+
+	@Inject
+	private Client client;
+
+	@Inject
+	private ChatboxPanelManager chatboxPanelManager;
+
+	@Inject
+	private ClientThread clientThread;
+
+	private ChatboxTextInput searchInput;
+	private Widget questSearchButton;
+	private Widget questHideButton;
+
+	private EnumMap<QuestContainer, Collection<QuestWidget>> questSet;
+
+	private QuestState currentFilterState;
+
+	@Override
+	protected void startUp()
+	{
+		clientThread.invoke(this::addQuestButtons);
+	}
+
+	@Override
+	protected void shutDown()
+	{
+		Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX);
+		if (header != null)
+		{
+			header.deleteAllChildren();
+		}
+	}
+
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged e)
+	{
+		if (e.getGameState() == GameState.LOGGING_IN)
+		{
+			currentFilterState = QuestState.ALL;
+		}
+	}
+
+	@Subscribe
+	public void onScriptCallbackEvent(ScriptCallbackEvent event)
+	{
+		if (!event.getEventName().equals("questProgressUpdated"))
+		{
+			return;
+		}
+
+		addQuestButtons();
+	}
+
+	private void addQuestButtons()
+	{
+		Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX);
+		if (header != null)
+		{
+			questSearchButton = header.createChild(-1, WidgetType.GRAPHIC);
+			questSearchButton.setSpriteId(SpriteID.GE_SEARCH);
+			questSearchButton.setOriginalWidth(18);
+			questSearchButton.setOriginalHeight(17);
+			questSearchButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
+			questSearchButton.setOriginalX(5);
+			questSearchButton.setOriginalY(0);
+			questSearchButton.setHasListener(true);
+			questSearchButton.setAction(1, MENU_OPEN);
+			questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
+			questSearchButton.setName(MENU_SEARCH);
+			questSearchButton.revalidate();
+
+			questHideButton = header.createChild(-1, WidgetType.GRAPHIC);
+			redrawHideButton();
+
+			questHideButton.setOriginalWidth(13);
+			questHideButton.setOriginalHeight(13);
+			questHideButton.setXPositionMode(WidgetPositionMode.ABSOLUTE_RIGHT);
+			questHideButton.setOriginalX(24);
+			questHideButton.setOriginalY(2);
+			questHideButton.setHasListener(true);
+			questHideButton.setOnOpListener((JavaScriptCallback) e -> toggleHidden());
+			questHideButton.setAction(1, MENU_TOGGLE);
+			questHideButton.revalidate();
+
+			questSet = new EnumMap<>(QuestContainer.class);
+
+			updateFilter();
+		}
+	}
+
+	@Subscribe
+	public void onVarbitChanged(VarbitChanged varbitChanged)
+	{
+		if (isChatboxOpen() && !isOnQuestTab())
+		{
+			chatboxPanelManager.close();
+		}
+	}
+
+	@Subscribe
+	public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged)
+	{
+		if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex())
+		{
+			if (isChatboxOpen() && !isOnQuestTab())
+			{
+				chatboxPanelManager.close();
+			}
+		}
+	}
+
+	private void toggleHidden()
+	{
+		QuestState[] questStates = QuestState.values();
+		int nextState = (currentFilterState.ordinal() + 1) % questStates.length;
+		currentFilterState = questStates[nextState];
+
+		redrawHideButton();
+
+		updateFilter();
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+	}
+
+	private void redrawHideButton()
+	{
+		questHideButton.setSpriteId(currentFilterState.getSpriteId());
+		questHideButton.setName(MENU_SHOW + " " + currentFilterState.getName());
+	}
+
+	private boolean isOnQuestTab()
+	{
+		return client.getVar(Varbits.QUEST_TAB) == 0 && client.getVar(VarClientInt.INVENTORY_TAB) == 2;
+	}
+
+	private boolean isChatboxOpen()
+	{
+		return searchInput != null && chatboxPanelManager.getCurrentInput() == searchInput;
+	}
+
+	private void closeSearch()
+	{
+		updateFilter("");
+		chatboxPanelManager.close();
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+	}
+
+	private void openSearch()
+	{
+		updateFilter("");
+		client.playSoundEffect(SoundEffectID.UI_BOOP);
+		questSearchButton.setAction(1, MENU_CLOSE);
+		questSearchButton.setOnOpListener((JavaScriptCallback) e -> closeSearch());
+		searchInput = chatboxPanelManager.openTextInput("Search quest list")
+			.onChanged(s -> clientThread.invokeLater(() -> updateFilter(s)))
+			.onClose(() ->
+			{
+				clientThread.invokeLater(() -> updateFilter(""));
+				questSearchButton.setOnOpListener((JavaScriptCallback) e -> openSearch());
+				questSearchButton.setAction(1, MENU_OPEN);
+			})
+			.build();
+	}
+
+	private void updateFilter()
+	{
+		String filter = "";
+		if (isChatboxOpen())
+		{
+			filter = searchInput.getValue();
+		}
+
+		updateFilter(filter);
+	}
+
+	private void updateFilter(String filter)
+	{
+		filter = filter.toLowerCase();
+		final Widget container = client.getWidget(WidgetInfo.QUESTLIST_CONTAINER);
+
+		final Widget freeList = client.getWidget(QuestContainer.FREE_QUESTS.widgetInfo);
+		final Widget memberList = client.getWidget(QuestContainer.MEMBER_QUESTS.widgetInfo);
+		final Widget miniList = client.getWidget(QuestContainer.MINI_QUESTS.widgetInfo);
+
+		if (container == null || freeList == null || memberList == null || miniList == null)
+		{
+			return;
+		}
+
+		updateList(QuestContainer.FREE_QUESTS, filter);
+		updateList(QuestContainer.MEMBER_QUESTS, filter);
+		updateList(QuestContainer.MINI_QUESTS, filter);
+
+		memberList.setOriginalY(freeList.getOriginalY() + freeList.getOriginalHeight() + ENTRY_PADDING);
+		miniList.setOriginalY(memberList.getOriginalY() + memberList.getOriginalHeight() + ENTRY_PADDING);
+
+		// originalHeight is changed within updateList so revalidate all lists
+		freeList.revalidate();
+		memberList.revalidate();
+		miniList.revalidate();
+
+		int y = miniList.getRelativeY() + miniList.getHeight() + 10;
+
+		int newHeight;
+		if (container.getScrollHeight() > 0)
+		{
+			newHeight = (container.getScrollY() * y) / container.getScrollHeight();
+		}
+		else
+		{
+			newHeight = 0;
+		}
+
+		container.setScrollHeight(y);
+		container.revalidateScroll();
+
+		clientThread.invokeLater(() ->
+			client.runScript(
+				ScriptID.UPDATE_SCROLLBAR,
+				WidgetInfo.QUESTLIST_SCROLLBAR.getId(),
+				WidgetInfo.QUESTLIST_CONTAINER.getId(),
+				newHeight
+			));
+	}
+
+	private void updateList(QuestContainer questContainer, String filter)
+	{
+		Widget list = client.getWidget(questContainer.widgetInfo);
+		if (list == null)
+		{
+			return;
+		}
+
+		Collection<QuestWidget> quests = questSet.get(questContainer);
+
+		if (quests != null)
+		{
+			// Check to make sure the list hasn't been rebuild since we were last her
+			// Do this by making sure the list's dynamic children are the same as when we last saw them
+			if (quests.stream().noneMatch(w ->
+			{
+				Widget codeWidget = w.getQuest();
+				if (codeWidget == null)
+				{
+					return false;
+				}
+				return list.getChild(codeWidget.getIndex()) == codeWidget;
+			}))
+			{
+				quests = null;
+			}
+		}
+
+		if (quests == null)
+		{
+			// Find all of the widgets that we care about, sorting by their Y value
+			quests = Arrays.stream(list.getDynamicChildren())
+				.sorted(Comparator.comparing(Widget::getRelativeY))
+				.filter(w -> !QUEST_HEADERS.contains(w.getText()))
+				.map(w -> new QuestWidget(w, Text.removeTags(w.getText()).toLowerCase()))
+				.collect(Collectors.toList());
+			questSet.put(questContainer, quests);
+		}
+
+		// offset because of header
+		int y = 20;
+		for (QuestWidget questInfo : quests)
+		{
+			Widget quest = questInfo.getQuest();
+			QuestState questState = QuestState.getByColor(quest.getTextColor());
+
+			boolean hidden;
+			if (!filter.isEmpty())
+			{
+				// If searching, show result regardless of filtered state
+				hidden = !questInfo.getTitle().contains(filter);
+			}
+			else
+			{
+				// Otherwise hide if it doesn't match the filter state
+				hidden = currentFilterState != QuestState.ALL && questState != currentFilterState;
+			}
+
+			quest.setHidden(hidden);
+			quest.setOriginalY(y);
+			quest.revalidate();
+
+			if (!hidden)
+			{
+				y += quest.getHeight();
+			}
+		}
+
+		list.setOriginalHeight(y);
+	}
+
+	@AllArgsConstructor
+	@Getter
+	private enum QuestContainer
+	{
+		FREE_QUESTS(WidgetInfo.QUESTLIST_FREE_CONTAINER),
+		MEMBER_QUESTS(WidgetInfo.QUESTLIST_MEMBERS_CONTAINER),
+		MINI_QUESTS(WidgetInfo.QUESTLIST_MINIQUEST_CONTAINER);
+
+		private final WidgetInfo widgetInfo;
+	}
+
+	@AllArgsConstructor
+	@Getter
+	private enum QuestState
+	{
+		NOT_STARTED(0xff0000, "Not started", SpriteID.MINIMAP_ORB_HITPOINTS),
+		IN_PROGRESS(0xffff00, "In progress", SpriteID.MINIMAP_ORB_HITPOINTS_DISEASE),
+		COMPLETE(0xdc10d, "Completed", SpriteID.MINIMAP_ORB_HITPOINTS_POISON),
+		ALL(0, "All", SpriteID.MINIMAP_ORB_PRAYER);
+
+		private final int color;
+		private final String name;
+		private final int spriteId;
+
+		static QuestState getByColor(int color)
+		{
+			for (QuestState value : values())
+			{
+				if (value.getColor() == color)
+				{
+					return value;
+				}
+			}
+
+			return null;
+		}
+	}
+
+	@Data
+	@AllArgsConstructor
+	private static class QuestWidget
+	{
+		private Widget quest;
+		private String title;
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
index 4f1041a67b..59330554c1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java
@@ -36,6 +36,7 @@ import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.NPC;
+import net.runelite.api.NPCComposition;
 import net.runelite.api.Player;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
@@ -51,6 +52,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.client.ws.PartyService;
 import net.runelite.client.ws.WSClient;
+import org.apache.commons.lang3.ArrayUtils;
 
 @PluginDescriptor(
 	name = "Special Attack Counter",
@@ -181,7 +183,16 @@ public class SpecialCounterPlugin extends Plugin
 
 		if (interacting instanceof NPC)
 		{
-			int interactingId = ((NPC) interacting).getId();
+			NPC npc = (NPC) interacting;
+			NPCComposition composition = npc.getComposition();
+			int interactingId = npc.getId();
+
+			if (!ArrayUtils.contains(composition.getActions(), "Attack"))
+			{
+				// Skip over non attackable npcs so that eg. talking to bankers doesn't reset
+				// the counters.
+				return -1;
+			}
 
 			if (!interactedNpcIds.contains(interactingId))
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
index f4e73622b0..19dda9396d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
@@ -1,309 +1,314 @@
-/*
- * Copyright (c) 2018 Abex
- * 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.timetracking.farming;
-
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import java.time.Instant;
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Nullable;
-import net.runelite.api.Client;
-import net.runelite.api.Varbits;
-import net.runelite.api.coords.WorldPoint;
-import net.runelite.api.vars.Autoweed;
-import net.runelite.client.config.ConfigManager;
-import net.runelite.client.game.ItemManager;
-import net.runelite.client.plugins.timetracking.SummaryState;
-import net.runelite.client.plugins.timetracking.Tab;
-import net.runelite.client.plugins.timetracking.TimeTrackingConfig;
-
-@Singleton
-public class FarmingTracker
-{
-	private final Client client;
-	private final ItemManager itemManager;
-	private final ConfigManager configManager;
-	private final TimeTrackingConfig config;
-	private final FarmingWorld farmingWorld;
-
-	private final Map<Tab, SummaryState> summaries = new EnumMap<>(Tab.class);
-
-	/**
-	 * The time at which all patches of a particular type will be ready to be harvested,
-	 * or {@code -1} if we have no data about any patch of the given type.
-	 */
-	private final Map<Tab, Long> completionTimes = new EnumMap<>(Tab.class);
-
-	@Inject
-	private FarmingTracker(Client client, ItemManager itemManager, ConfigManager configManager,
-						TimeTrackingConfig config, FarmingWorld farmingWorld)
-	{
-		this.client = client;
-		this.itemManager = itemManager;
-		this.configManager = configManager;
-		this.config = config;
-		this.farmingWorld = farmingWorld;
-	}
-
-
-	public FarmingTabPanel createTabPanel(Tab tab)
-	{
-		return new FarmingTabPanel(this, itemManager, config, farmingWorld.getTabs().get(tab));
-	}
-
-	/**
-	 * Updates tracker data for the current region. Returns true if any data was changed.
-	 */
-	public boolean updateData(WorldPoint location)
-	{
-		boolean changed = false;
-
-		{
-			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername();
-			String autoweed = Integer.toString(client.getVar(Varbits.AUTOWEED));
-			if (!autoweed.equals(configManager.getConfiguration(group, TimeTrackingConfig.AUTOWEED)))
-			{
-				configManager.setConfiguration(group, TimeTrackingConfig.AUTOWEED, autoweed);
-				changed = true;
-			}
-		}
-
-		FarmingRegion region = farmingWorld.getRegions().get(location.getRegionID());
-		if (region != null && region.isInBounds(location))
-		{
-			// Write config with new varbits
-			// timetracking.<login-username>.<regionID>.<VarbitID>=<varbitValue>:<unix time>
-			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername() + "." + region.getRegionID();
-			long unixNow = Instant.now().getEpochSecond();
-			for (FarmingPatch patch : region.getPatches())
-			{
-				// Write the config value if it doesn't match what is current, or it is more than 5 minutes old
-				Varbits varbit = patch.getVarbit();
-				String key = Integer.toString(varbit.getId());
-				String strVarbit = Integer.toString(client.getVar(varbit));
-				String storedValue = configManager.getConfiguration(group, key);
-
-				if (storedValue != null)
-				{
-					String[] parts = storedValue.split(":");
-					if (parts.length == 2 && parts[0].equals(strVarbit))
-					{
-						long unixTime = 0;
-						try
-						{
-							unixTime = Long.parseLong(parts[1]);
-						}
-						catch (NumberFormatException e)
-						{
-							// ignored
-						}
-						if (unixTime + (5 * 60) > unixNow && unixNow + 30 > unixTime)
-						{
-							continue;
-						}
-					}
-				}
-
-				String value = strVarbit + ":" + unixNow;
-				configManager.setConfiguration(group, key, value);
-				changed = true;
-			}
-		}
-
-		if (changed)
-		{
-			updateCompletionTime();
-		}
-
-		return changed;
-	}
-
-	@Nullable
-	public PatchPrediction predictPatch(FarmingPatch patch)
-	{
-		long unixNow = Instant.now().getEpochSecond();
-
-		boolean autoweed;
-		{
-			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername();
-			autoweed = Integer.toString(Autoweed.ON.ordinal())
-				.equals(configManager.getConfiguration(group, TimeTrackingConfig.AUTOWEED));
-		}
-
-		String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername() + "." + patch.getRegion().getRegionID();
-		String key = Integer.toString(patch.getVarbit().getId());
-		String storedValue = configManager.getConfiguration(group, key);
-
-		if (storedValue == null)
-		{
-			return null;
-		}
-
-		long unixTime = 0;
-		int value = 0;
-		{
-			String[] parts = storedValue.split(":");
-			if (parts.length == 2)
-			{
-				try
-				{
-					value = Integer.parseInt(parts[0]);
-					unixTime = Long.parseLong(parts[1]);
-				}
-				catch (NumberFormatException e)
-				{
-				}
-			}
-		}
-
-		if (unixTime <= 0)
-		{
-			return null;
-		}
-
-		PatchState state = patch.getImplementation().forVarbitValue(value);
-
-		int stage = state.getStage();
-		int stages = state.getStages();
-		int tickrate = state.getTickRate() * 60;
-
-		if (autoweed && state.getProduce() == Produce.WEEDS)
-		{
-			stage = 0;
-			stages = 1;
-			tickrate = 0;
-		}
-
-		long doneEstimate = 0;
-		if (tickrate > 0)
-		{
-			long tickNow = (unixNow + (5 * 60)) / tickrate;
-			long tickTime = (unixTime + (5 * 60)) / tickrate;
-			int delta = (int) (tickNow - tickTime);
-
-			doneEstimate = ((stages - 1 - stage) + tickTime) * tickrate + (5 * 60);
-
-			stage += delta;
-			if (stage >= stages)
-			{
-				stage = stages - 1;
-			}
-		}
-
-		return new PatchPrediction(
-			state.getProduce(),
-			state.getCropState(),
-			doneEstimate,
-			stage,
-			stages
-		);
-	}
-
-	public void loadCompletionTimes()
-	{
-		summaries.clear();
-		completionTimes.clear();
-		updateCompletionTime();
-	}
-
-	public SummaryState getSummary(Tab patchType)
-	{
-		SummaryState summary = summaries.get(patchType);
-		return summary == null ? SummaryState.UNKNOWN : summary;
-	}
-
-	/**
-	 * Gets the overall completion time for the given patch type.
-	 *
-	 * @see #completionTimes
-	 */
-	public long getCompletionTime(Tab patchType)
-	{
-		Long completionTime = completionTimes.get(patchType);
-		return completionTime == null ? -1 : completionTime;
-	}
-
-	/**
-	 * Updates the overall completion time for the given patch type.
-	 *
-	 * @see #completionTimes
-	 */
-	private void updateCompletionTime()
-	{
-		for (Map.Entry<Tab, Set<FarmingPatch>> tab : farmingWorld.getTabs().entrySet())
-		{
-			long maxCompletionTime = 0;
-			boolean allUnknown = true;
-			boolean allEmpty = true;
-
-			for (FarmingPatch patch : tab.getValue())
-			{
-				PatchPrediction prediction = predictPatch(patch);
-				if (prediction == null || prediction.getProduce().getItemID() < 0)
-				{
-					continue; // unknown state
-				}
-
-				allUnknown = false;
-
-				if (prediction.getProduce() != Produce.WEEDS && prediction.getProduce() != Produce.SCARECROW)
-				{
-					allEmpty = false;
-
-					// update max duration if this patch takes longer to grow
-					maxCompletionTime = Math.max(maxCompletionTime, prediction.getDoneEstimate());
-				}
-			}
-
-			final SummaryState state;
-			final long completionTime;
-
-			if (allUnknown)
-			{
-				state = SummaryState.UNKNOWN;
-				completionTime = -1L;
-			}
-			else if (allEmpty)
-			{
-				state = SummaryState.EMPTY;
-				completionTime = -1L;
-			}
-			else if (maxCompletionTime <= Instant.now().getEpochSecond())
-			{
-				state = SummaryState.COMPLETED;
-				completionTime = 0;
-			}
-			else
-			{
-				state = SummaryState.IN_PROGRESS;
-				completionTime = maxCompletionTime;
-			}
-			summaries.put(tab.getKey(), state);
-			completionTimes.put(tab.getKey(), completionTime);
-		}
-	}
-}
+/*
+ * Copyright (c) 2018 Abex
+ * 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.timetracking.farming;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import java.time.Instant;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+import net.runelite.api.Client;
+import net.runelite.api.Varbits;
+import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.vars.Autoweed;
+import net.runelite.client.config.ConfigManager;
+import net.runelite.client.game.ItemManager;
+import net.runelite.client.plugins.timetracking.SummaryState;
+import net.runelite.client.plugins.timetracking.Tab;
+import net.runelite.client.plugins.timetracking.TimeTrackingConfig;
+
+@Singleton
+public class FarmingTracker
+{
+	private final Client client;
+	private final ItemManager itemManager;
+	private final ConfigManager configManager;
+	private final TimeTrackingConfig config;
+	private final FarmingWorld farmingWorld;
+
+	private final Map<Tab, SummaryState> summaries = new EnumMap<>(Tab.class);
+
+	/**
+	 * The time at which all patches of a particular type will be ready to be harvested,
+	 * or {@code -1} if we have no data about any patch of the given type.
+	 */
+	private final Map<Tab, Long> completionTimes = new EnumMap<>(Tab.class);
+
+	@Inject
+	private FarmingTracker(Client client, ItemManager itemManager, ConfigManager configManager,
+						   TimeTrackingConfig config, FarmingWorld farmingWorld)
+	{
+		this.client = client;
+		this.itemManager = itemManager;
+		this.configManager = configManager;
+		this.config = config;
+		this.farmingWorld = farmingWorld;
+	}
+
+
+	public FarmingTabPanel createTabPanel(Tab tab)
+	{
+		return new FarmingTabPanel(this, itemManager, config, farmingWorld.getTabs().get(tab));
+	}
+
+	/**
+	 * Updates tracker data for the current region. Returns true if any data was changed.
+	 */
+	public boolean updateData(WorldPoint location)
+	{
+		boolean changed = false;
+
+		{
+			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername();
+			String autoweed = Integer.toString(client.getVar(Varbits.AUTOWEED));
+			if (!autoweed.equals(configManager.getConfiguration(group, TimeTrackingConfig.AUTOWEED)))
+			{
+				configManager.setConfiguration(group, TimeTrackingConfig.AUTOWEED, autoweed);
+				changed = true;
+			}
+		}
+
+		FarmingRegion region = farmingWorld.getRegions().get(location.getRegionID());
+		if (region != null && region.isInBounds(location))
+		{
+			// Write config with new varbits
+			// timetracking.<login-username>.<regionID>.<VarbitID>=<varbitValue>:<unix time>
+			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername() + "." + region.getRegionID();
+			long unixNow = Instant.now().getEpochSecond();
+			for (FarmingPatch patch : region.getPatches())
+			{
+				// Write the config value if it doesn't match what is current, or it is more than 5 minutes old
+				Varbits varbit = patch.getVarbit();
+				String key = Integer.toString(varbit.getId());
+				String strVarbit = Integer.toString(client.getVar(varbit));
+				String storedValue = configManager.getConfiguration(group, key);
+
+				if (storedValue != null)
+				{
+					String[] parts = storedValue.split(":");
+					if (parts.length == 2 && parts[0].equals(strVarbit))
+					{
+						long unixTime = 0;
+						try
+						{
+							unixTime = Long.parseLong(parts[1]);
+						}
+						catch (NumberFormatException e)
+						{
+							// ignored
+						}
+						if (unixTime + (5 * 60) > unixNow && unixNow + 30 > unixTime)
+						{
+							continue;
+						}
+					}
+				}
+
+				String value = strVarbit + ":" + unixNow;
+				configManager.setConfiguration(group, key, value);
+				changed = true;
+			}
+		}
+
+		if (changed)
+		{
+			updateCompletionTime();
+		}
+
+		return changed;
+	}
+
+	@Nullable
+	public PatchPrediction predictPatch(FarmingPatch patch)
+	{
+		long unixNow = Instant.now().getEpochSecond();
+
+		boolean autoweed;
+		{
+			String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername();
+			autoweed = Integer.toString(Autoweed.ON.ordinal())
+				.equals(configManager.getConfiguration(group, TimeTrackingConfig.AUTOWEED));
+		}
+
+		String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername() + "." + patch.getRegion().getRegionID();
+		String key = Integer.toString(patch.getVarbit().getId());
+		String storedValue = configManager.getConfiguration(group, key);
+
+		if (storedValue == null)
+		{
+			return null;
+		}
+
+		long unixTime = 0;
+		int value = 0;
+		{
+			String[] parts = storedValue.split(":");
+			if (parts.length == 2)
+			{
+				try
+				{
+					value = Integer.parseInt(parts[0]);
+					unixTime = Long.parseLong(parts[1]);
+				}
+				catch (NumberFormatException e)
+				{
+				}
+			}
+		}
+
+		if (unixTime <= 0)
+		{
+			return null;
+		}
+
+		PatchState state = patch.getImplementation().forVarbitValue(value);
+
+		if (state == null)
+		{
+			return null;
+		}
+
+		int stage = state.getStage();
+		int stages = state.getStages();
+		int tickrate = state.getTickRate() * 60;
+
+		if (autoweed && state.getProduce() == Produce.WEEDS)
+		{
+			stage = 0;
+			stages = 1;
+			tickrate = 0;
+		}
+
+		long doneEstimate = 0;
+		if (tickrate > 0)
+		{
+			long tickNow = (unixNow + (5 * 60)) / tickrate;
+			long tickTime = (unixTime + (5 * 60)) / tickrate;
+			int delta = (int) (tickNow - tickTime);
+
+			doneEstimate = ((stages - 1 - stage) + tickTime) * tickrate + (5 * 60);
+
+			stage += delta;
+			if (stage >= stages)
+			{
+				stage = stages - 1;
+			}
+		}
+
+		return new PatchPrediction(
+			state.getProduce(),
+			state.getCropState(),
+			doneEstimate,
+			stage,
+			stages
+		);
+	}
+
+	public void loadCompletionTimes()
+	{
+		summaries.clear();
+		completionTimes.clear();
+		updateCompletionTime();
+	}
+
+	public SummaryState getSummary(Tab patchType)
+	{
+		SummaryState summary = summaries.get(patchType);
+		return summary == null ? SummaryState.UNKNOWN : summary;
+	}
+
+	/**
+	 * Gets the overall completion time for the given patch type.
+	 *
+	 * @see #completionTimes
+	 */
+	public long getCompletionTime(Tab patchType)
+	{
+		Long completionTime = completionTimes.get(patchType);
+		return completionTime == null ? -1 : completionTime;
+	}
+
+	/**
+	 * Updates the overall completion time for the given patch type.
+	 *
+	 * @see #completionTimes
+	 */
+	private void updateCompletionTime()
+	{
+		for (Map.Entry<Tab, Set<FarmingPatch>> tab : farmingWorld.getTabs().entrySet())
+		{
+			long maxCompletionTime = 0;
+			boolean allUnknown = true;
+			boolean allEmpty = true;
+
+			for (FarmingPatch patch : tab.getValue())
+			{
+				PatchPrediction prediction = predictPatch(patch);
+				if (prediction == null || prediction.getProduce().getItemID() < 0)
+				{
+					continue; // unknown state
+				}
+
+				allUnknown = false;
+
+				if (prediction.getProduce() != Produce.WEEDS && prediction.getProduce() != Produce.SCARECROW)
+				{
+					allEmpty = false;
+
+					// update max duration if this patch takes longer to grow
+					maxCompletionTime = Math.max(maxCompletionTime, prediction.getDoneEstimate());
+				}
+			}
+
+			final SummaryState state;
+			final long completionTime;
+
+			if (allUnknown)
+			{
+				state = SummaryState.UNKNOWN;
+				completionTime = -1L;
+			}
+			else if (allEmpty)
+			{
+				state = SummaryState.EMPTY;
+				completionTime = -1L;
+			}
+			else if (maxCompletionTime <= Instant.now().getEpochSecond())
+			{
+				state = SummaryState.COMPLETED;
+				completionTime = 0;
+			}
+			else
+			{
+				state = SummaryState.IN_PROGRESS;
+				completionTime = maxCompletionTime;
+			}
+			summaries.put(tab.getKey(), state);
+			completionTimes.put(tab.getKey(), completionTime);
+		}
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java
index 865c0e5517..d74d9027f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java
@@ -139,28 +139,28 @@ class FarmingWorld
 			new FarmingPatch("", Varbits.FARMING_4772, PatchImplementation.HERB)
 		));
 
-		add(new FarmingRegion("Kourend", 7222,
+		add(new FarmingRegion("Kourend", 6967,
 			new FarmingPatch("North East", Varbits.FARMING_4771, PatchImplementation.ALLOTMENT),
 			new FarmingPatch("South West", Varbits.FARMING_4772, PatchImplementation.ALLOTMENT),
 			new FarmingPatch("", Varbits.FARMING_4773, PatchImplementation.FLOWER),
 			new FarmingPatch("", Varbits.FARMING_4774, PatchImplementation.HERB)
 		));
 		add(new FarmingRegion("Kourend", 6711,
-			new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.SPIRIT_TREE)
+			new FarmingPatch("", Varbits.FARMING_7904, PatchImplementation.SPIRIT_TREE)
 		));
 		add(new FarmingRegion("Kourend", 7223,
-			new FarmingPatch("West 1", Varbits.GRAPES_4953, PatchImplementation.GRAPES),
-			new FarmingPatch("West 2", Varbits.GRAPES_4954, PatchImplementation.GRAPES),
-			new FarmingPatch("West 3", Varbits.GRAPES_4955, PatchImplementation.GRAPES),
-			new FarmingPatch("West 4", Varbits.GRAPES_4956, PatchImplementation.GRAPES),
-			new FarmingPatch("West 5", Varbits.GRAPES_4957, PatchImplementation.GRAPES),
-			new FarmingPatch("West 6", Varbits.GRAPES_4958, PatchImplementation.GRAPES),
-			new FarmingPatch("East 1", Varbits.GRAPES_4959, PatchImplementation.GRAPES),
-			new FarmingPatch("East 2", Varbits.GRAPES_4960, PatchImplementation.GRAPES),
-			new FarmingPatch("East 3", Varbits.GRAPES_4961, PatchImplementation.GRAPES),
-			new FarmingPatch("East 4", Varbits.GRAPES_4962, PatchImplementation.GRAPES),
-			new FarmingPatch("East 5", Varbits.GRAPES_4963, PatchImplementation.GRAPES),
-			new FarmingPatch("East 6", Varbits.GRAPES_4964, PatchImplementation.GRAPES)
+			new FarmingPatch("East 1", Varbits.GRAPES_4953, PatchImplementation.GRAPES),
+			new FarmingPatch("East 2", Varbits.GRAPES_4954, PatchImplementation.GRAPES),
+			new FarmingPatch("East 3", Varbits.GRAPES_4955, PatchImplementation.GRAPES),
+			new FarmingPatch("East 4", Varbits.GRAPES_4956, PatchImplementation.GRAPES),
+			new FarmingPatch("East 5", Varbits.GRAPES_4957, PatchImplementation.GRAPES),
+			new FarmingPatch("East 6", Varbits.GRAPES_4958, PatchImplementation.GRAPES),
+			new FarmingPatch("West 1", Varbits.GRAPES_4959, PatchImplementation.GRAPES),
+			new FarmingPatch("West 2", Varbits.GRAPES_4960, PatchImplementation.GRAPES),
+			new FarmingPatch("West 3", Varbits.GRAPES_4961, PatchImplementation.GRAPES),
+			new FarmingPatch("West 4", Varbits.GRAPES_4962, PatchImplementation.GRAPES),
+			new FarmingPatch("West 5", Varbits.GRAPES_4963, PatchImplementation.GRAPES),
+			new FarmingPatch("West 6", Varbits.GRAPES_4964, PatchImplementation.GRAPES)
 		));
 
 		add(new FarmingRegion("Lletya", 9265,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java
index 8bec7a88a6..1aab9a7320 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/PatchImplementation.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.timetracking.farming;
 
+import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.client.plugins.timetracking.Tab;
@@ -2576,6 +2577,7 @@ public enum PatchImplementation
 			}
 		};
 
+	@Nullable
 	abstract PatchState forVarbitValue(int value);
 
 	private final Tab tab;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
index b8bb51e3f3..5444d43c82 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
@@ -115,7 +115,7 @@ enum TeleportLocationData
 
 	// Misc
 	XERICS_LOOKOUT(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Lookout", new WorldPoint(1576, 3528, 0), "xerics_talisman_teleport_icon.png"),
-	XERICS_GLADE(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Glade", new WorldPoint(1773, 3502, 0), "xerics_talisman_teleport_icon.png"),
+	XERICS_GLADE(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Glade", new WorldPoint(1754, 3564, 0), "xerics_talisman_teleport_icon.png"),
 	XERICS_INFERNO(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Inferno", new WorldPoint(1504, 3819, 0), "xerics_talisman_teleport_icon.png"),
 	XERICS_HEART(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Heart", new WorldPoint(1641, 3670, 0), "xerics_talisman_teleport_icon.png"),
 	XERICS_HONOUR(TeleportType.OTHER, "Xeric's Talisman", "Xeric's Honour", new WorldPoint(1254, 3559, 0), "xerics_talisman_teleport_icon.png"),
@@ -138,6 +138,7 @@ enum TeleportLocationData
 	PHARAOHS_SCEPTRE_JALSAVRAH(TeleportType.OTHER, "Pharaoh's Sceptre", "Jalsavrah (Pyramid Plunder)", new WorldPoint(3288, 2795, 0), "pharaohs_sceptre_teleport_icon.png"),
 	PHARAOHS_SCEPTRE_JALEUSTROPHOS(TeleportType.OTHER, "Pharaoh's Sceptre", "Jaleustrophos (Agility Pyramid)", new WorldPoint(3341, 2827, 0), "pharaohs_sceptre_teleport_icon.png"),
 	PHARAOHS_SCEPTRE_JALDRAOCHT(TeleportType.OTHER, "Pharaoh's Sceptre", "Jaldraocht (Desert Treasure Pyramid)", new WorldPoint(3232, 2897, 0), "pharaohs_sceptre_teleport_icon.png"),
+	CAMULET_TEMPLE(TeleportType.OTHER, "Camulet", "Enakhra's Temple", new WorldPoint(3190, 2923, 0), "camulet_teleport_icon.png"),
 
 	// Wilderness
 	OBELISK_13(TeleportType.OTHER, "Obelisk", "13", new WorldPoint(3156, 3620, 0), "obelisk_icon.png"),
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
index 04e78fb0e4..01f52d6ad0 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/ProgressBarComponent.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.ui.overlay.components;
 
+import com.google.common.base.Strings;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -41,6 +42,7 @@ public class ProgressBarComponent implements LayoutableRenderableEntity
 	{
 		PERCENTAGE,
 		FULL,
+		TEXT_ONLY,
 		BOTH
 	}
 
@@ -53,6 +55,7 @@ public class ProgressBarComponent implements LayoutableRenderableEntity
 	private long maximum = 100;
 	private double value;
 	private LabelDisplayMode labelDisplayMode = LabelDisplayMode.PERCENTAGE;
+	private String centerLabel;
 	private String leftLabel;
 	private String rightLabel;
 	private Color foregroundColor = new Color(82, 161, 82);
@@ -75,19 +78,32 @@ public class ProgressBarComponent implements LayoutableRenderableEntity
 		final long span = maximum - minimum;
 		final double currentValue = value - minimum;
 		final double pc = currentValue / span;
-		final String textToWrite;
+		String textToWrite;
 
 		switch (labelDisplayMode)
 		{
+			case TEXT_ONLY:
+				textToWrite = "";
+				break;
 			case PERCENTAGE:
-				textToWrite = DECIMAL_FORMAT.format(pc * 100d) + "%";
+				textToWrite = formatPercentageProgress(pc);
 				break;
 			case BOTH:
-				textToWrite = DECIMAL_FORMAT_ABS.format(Math.floor(currentValue)) + "/" + maximum
-					+ " (" + DECIMAL_FORMAT.format(pc * 100d) + "%)";
+				textToWrite = formatFullProgress(currentValue, maximum) + " (" + formatPercentageProgress(pc) + ")";
 				break;
+			case FULL:
 			default:
-				textToWrite = DECIMAL_FORMAT_ABS.format(Math.floor(currentValue)) + "/" + maximum;
+				textToWrite = formatFullProgress(currentValue, maximum);
+		}
+
+		if (!Strings.isNullOrEmpty(centerLabel))
+		{
+			if (!textToWrite.isEmpty())
+			{
+				textToWrite += " ";
+			}
+
+			textToWrite += centerLabel;
 		}
 
 		final int width = preferredSize.width;
@@ -131,4 +147,14 @@ public class ProgressBarComponent implements LayoutableRenderableEntity
 		bounds.setSize(dimension);
 		return dimension;
 	}
+
+	private static String formatFullProgress(double current, long maximum)
+	{
+		return DECIMAL_FORMAT_ABS.format(Math.floor(current)) + "/" + maximum;
+	}
+
+	private static String formatPercentageProgress(double ratio)
+	{
+		return DECIMAL_FORMAT.format(ratio * 100d) + "%";
+	}
 }
diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json
index 81603408c9..8105a02ee2 100644
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -3243,7 +3243,8 @@
     6125,
     6126,
     6127,
-    13079
+    13079,
+    23458
   ],
   "branch": [
     3692,
@@ -6912,6 +6913,78 @@
     10555,
     20515
   ],
+  "attacker icon": [
+    10556,
+    22346,
+    22347,
+    22348,
+    22349,
+    22721,
+    22722,
+    22723,
+    22729,
+    22730,
+    23460,
+    23461,
+    23462,
+    23463,
+    23464,
+    23465
+  ],
+  "collector icon": [
+    10557,
+    22312,
+    22313,
+    22314,
+    22315,
+    22337,
+    22338,
+    22339,
+    22724,
+    23471,
+    23472,
+    23473,
+    23474,
+    23475,
+    23476,
+    23477
+  ],
+  "defender icon": [
+    10558,
+    22340,
+    22341,
+    22342,
+    22343,
+    22344,
+    22345,
+    22725,
+    22726,
+    22727,
+    22728,
+    23466,
+    23467,
+    23468,
+    23469,
+    23470
+  ],
+  "healer icon": [
+    10559,
+    10567,
+    20802,
+    22308,
+    22309,
+    22310,
+    22311,
+    23478,
+    23479,
+    23480,
+    23481,
+    23482,
+    23483,
+    23484,
+    23485,
+    23486
+  ],
   "keris": [
     10581,
     10582,
diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/camulet_teleport_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/camulet_teleport_icon.png
new file mode 100644
index 0000000000..7a74119cc8
Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/camulet_teleport_icon.png differ
diff --git a/runelite-client/src/main/scripts/ChatBuilder.rs2asm b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
index c30307da67..2e0bc1d37c 100644
--- a/runelite-client/src/main/scripts/ChatBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatBuilder.rs2asm
@@ -189,8 +189,10 @@ CHAT_FILTER:
    sload                  11                ; Load the message
    iconst                 1                 ; Gets changed to 0 if message is blocked
    iload                  10                ; Load the messageType
+   iload                  9                 ; Load the id of the messageNode
    sconst                 "chatFilterCheck"
    runelite_callback
+   pop_int                                  ; Pop the id of the messageNode
    pop_int                                  ; Pop the messageType
    iconst                 1                 ; 2nd half of conditional
    sstore                 11                ; Override the message with our filtered message
diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
index 45b420248d..73badbb543 100644
--- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
@@ -359,9 +359,11 @@ CHAT_FILTER:
    sload                  0                 ; Load the message
    iconst                 1                 ; Gets changed to 0 if message is blocked
    iload                  15                ; Load the messageType
+   iload                  12                ; Load the id of the messageNode
    sconst                 "chatFilterCheck"
-   runelite_callback     
-   pop_int               ; Pop the messageType
+   runelite_callback
+   pop_int                                  ; Pop the id of the messageNode
+   pop_int                                  ; Pop the messageType
    iconst                 1                 ; 2nd half of conditional
    sstore                 0                 ; Override the message with our filtered message
    if_icmpeq              LABEL327          ; Check if we are building this message
diff --git a/runelite-client/src/main/scripts/CombatInterfaceSP.hash b/runelite-client/src/main/scripts/CombatInterfaceSP.hash
new file mode 100644
index 0000000000..e92e5b127b
--- /dev/null
+++ b/runelite-client/src/main/scripts/CombatInterfaceSP.hash
@@ -0,0 +1 @@
+DDFE4E407122EEEAE2C64A233EA937B2CC20E92D66CB66772C31182A6C60820D
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/CombatInterfaceSP.rs2asm b/runelite-client/src/main/scripts/CombatInterfaceSP.rs2asm
new file mode 100644
index 0000000000..fae9b4e230
--- /dev/null
+++ b/runelite-client/src/main/scripts/CombatInterfaceSP.rs2asm
@@ -0,0 +1,29 @@
+.id                 327
+.int_stack_count    1
+.string_stack_count 0
+.int_var_count      1
+.string_var_count   0
+   ; Attach specbar redraw listeners to the weapon name text instead of to
+   ; auto retaliate text (which is var0). Test by enabling "Hide auto retaliate"
+   ; and using a spec.
+   iconst                 38862849 ; 593.1 - weapon name widget
+   istore                 0        ; overwrite script parameter which is the autoretail text
+   iload                  0
+   invoke                 187
+   iconst                 186
+   iload                  0
+   iconst                 301
+   iconst                 300
+   iconst                 284
+   iconst                 3
+   sconst                 "IY"
+   iload                  0
+   if_setonvartransmit   
+   iconst                 186
+   iload                  0
+   iconst                 94
+   iconst                 1
+   sconst                 "IY"
+   iload                  0
+   if_setoninvtransmit   
+   return                
diff --git a/runelite-client/src/main/scripts/CommandScript.rs2asm b/runelite-client/src/main/scripts/CommandScript.rs2asm
index 09504fd76f..0916a66d4a 100644
--- a/runelite-client/src/main/scripts/CommandScript.rs2asm
+++ b/runelite-client/src/main/scripts/CommandScript.rs2asm
@@ -37,6 +37,11 @@ LABEL20:
    invoke                 1972
    iconst                 1
    if_icmpeq              LABEL31
+   iconst                 0                 ; Modified to enable clanchat input
+   sconst                 "clanchatInput"
+   runelite_callback
+   iconst                 1
+   if_icmpeq              LABEL31           ; Compare to 1
    jump                   LABEL37
 LABEL31:
    get_varc_int           41
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
index 8f63169574..c0b81a9665 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
@@ -38,6 +38,7 @@ import java.applet.Applet;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -47,6 +48,8 @@ import java.util.Set;
 import net.runelite.api.Client;
 import net.runelite.client.RuneLite;
 import net.runelite.client.RuneLiteModule;
+import net.runelite.client.config.Config;
+import net.runelite.client.config.ConfigItem;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.rs.ClientUpdateCheckMode;
 import static org.junit.Assert.assertEquals;
@@ -75,6 +78,7 @@ public class PluginManagerTest
 	public Client client;
 
 	private Set<Class> pluginClasses;
+	private Set<Class> configClasses;
 
 	@Before
 	public void before() throws IOException
@@ -85,8 +89,9 @@ public class PluginManagerTest
 
 		RuneLite.setInjector(injector);
 
-		// Find plugins we expect to have
+		// Find plugins and configs we expect to have
 		pluginClasses = new HashSet<>();
+		configClasses = new HashSet<>();
 		Set<ClassInfo> classes = ClassPath.from(getClass().getClassLoader()).getTopLevelClassesRecursive(PLUGIN_PACKAGE);
 		for (ClassInfo classInfo : classes)
 		{
@@ -95,6 +100,12 @@ public class PluginManagerTest
 			if (pluginDescriptor != null)
 			{
 				pluginClasses.add(clazz);
+				continue;
+			}
+
+			if (Config.class.isAssignableFrom(clazz))
+			{
+				configClasses.add(clazz);
 			}
 		}
 
@@ -155,4 +166,37 @@ public class PluginManagerTest
 		}
 	}
 
+	@Test
+	public void ensureNoDuplicateConfigKeyNames()
+	{
+		for (final Class clazz : configClasses)
+		{
+			final Set<String> configKeyNames = new HashSet<>();
+
+			for (final Method method : clazz.getMethods())
+			{
+				if (!method.isDefault())
+				{
+					continue;
+				}
+
+				final ConfigItem annotation = method.getAnnotation(ConfigItem.class);
+
+				if (annotation == null)
+				{
+					continue;
+				}
+
+				final String configKeyName = annotation.keyName();
+
+				if (configKeyNames.contains(configKeyName))
+				{
+					throw new IllegalArgumentException("keyName " + configKeyName + " is duplicated in " + clazz);
+				}
+
+				configKeyNames.add(configKeyName);
+			}
+		}
+	}
+
 }
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
index 2fe4d88e05..a12a8b257b 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019, Adam <Adam@sigterm.info>
+ * Copyright (c) 2019, osrs-music-map <osrs-music-map@users.noreply.github.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,8 +30,11 @@ import com.google.inject.testing.fieldbinder.Bind;
 import com.google.inject.testing.fieldbinder.BoundFieldModule;
 import javax.inject.Inject;
 import net.runelite.api.Client;
+import net.runelite.api.Player;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +53,10 @@ public class ChatFilterPluginTest
 	@Bind
 	private ChatFilterConfig chatFilterConfig;
 
+	@Mock
+	@Bind
+	private Player localPlayer;
+
 	@Inject
 	private ChatFilterPlugin chatFilterPlugin;
 
@@ -60,6 +68,7 @@ public class ChatFilterPluginTest
 		when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.CENSOR_WORDS);
 		when(chatFilterConfig.filteredWords()).thenReturn("");
 		when(chatFilterConfig.filteredRegex()).thenReturn("");
+		when(client.getLocalPlayer()).thenReturn(localPlayer);
 	}
 
 	@Test
@@ -110,4 +119,51 @@ public class ChatFilterPluginTest
 		chatFilterPlugin.updateFilteredPatterns();
 		assertNull(chatFilterPlugin.censorMessage("te\u008Cst"));
 	}
+
+	@Test
+	public void testMessageFromFriendIsFiltered()
+	{
+		when(client.isFriended("Iron Mammal", false)).thenReturn(true);
+		when(chatFilterConfig.filterFriends()).thenReturn(true);
+		assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal"));
+	}
+
+	@Test
+	public void testMessageFromFriendIsNotFiltered()
+	{
+		when(client.isFriended("Iron Mammal", false)).thenReturn(true);
+		when(chatFilterConfig.filterFriends()).thenReturn(false);
+		assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal"));
+	}
+
+	@Test
+	public void testMessageFromClanIsFiltered()
+	{
+		when(client.isClanMember("B0aty")).thenReturn(true);
+		when(chatFilterConfig.filterClan()).thenReturn(true);
+		assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("B0aty"));
+	}
+
+	@Test
+	public void testMessageFromClanIsNotFiltered()
+	{
+		when(client.isClanMember("B0aty")).thenReturn(true);
+		when(chatFilterConfig.filterClan()).thenReturn(false);
+		assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("B0aty"));
+	}
+
+	@Test
+	public void testMessageFromSelfIsNotFiltered()
+	{
+		when(localPlayer.getName()).thenReturn("Swampletics");
+		assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Swampletics"));
+	}
+
+	@Test
+	public void testMessageFromNonFriendNonClanIsFiltered()
+	{
+		when(client.isFriended("Woox", false)).thenReturn(false);
+		when(client.isClanMember("Woox")).thenReturn(false);
+		assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("Woox"));
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
index 067c02943c..2aa89600e9 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
@@ -29,13 +29,11 @@ import com.google.inject.testing.fieldbinder.Bind;
 import com.google.inject.testing.fieldbinder.BoundFieldModule;
 import javax.inject.Inject;
 import net.runelite.api.ChatMessageType;
+import net.runelite.api.Client;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.client.ui.overlay.OverlayManager;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.when;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,13 +50,16 @@ public class CookingPluginTest
 		"You cook the karambwan. It looks delicious.",
 		"You roast a lobster.",
 		"You cook a bass.",
-		"You squeeze the grapes into the jug. The wine begins to ferment.",
 		"You successfully bake a tasty garden pie."
 	};
 
 	@Inject
 	CookingPlugin cookingPlugin;
 
+	@Mock
+	@Bind
+	Client client;
+
 	@Mock
 	@Bind
 	CookingConfig config;
@@ -94,26 +95,4 @@ public class CookingPluginTest
 		assertNotNull(cookingSession);
 		assertEquals(COOKING_MESSAGES.length, cookingSession.getCookAmount());
 	}
-
-	@Test
-	public void testFermentTimerOnChatMessage()
-	{
-		when(config.fermentTimer()).thenReturn(true);
-		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", COOKING_MESSAGES[6], "", 0);
-		cookingPlugin.onChatMessage(chatMessage);
-		FermentTimerSession fermentTimerSession = cookingPlugin.getFermentTimerSession();
-
-		assertNotNull(fermentTimerSession);
-	}
-
-	@Test
-	public void testFermentTimerOnChatMessage_pluginDisabled()
-	{
-		when(config.fermentTimer()).thenReturn(false);
-		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", COOKING_MESSAGES[6], "", 0);
-		cookingPlugin.onChatMessage(chatMessage);
-		FermentTimerSession fermentTimerSession = cookingPlugin.getFermentTimerSession();
-
-		assertNull(fermentTimerSession);
-	}
 }
\ No newline at end of file
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index 027603794e..1a3e6cea83 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mixins</artifactId>
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java
index e86e689fef..9bf27786eb 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSDecorativeObjectMixin.java
@@ -110,7 +110,29 @@ public abstract class RSDecorativeObjectMixin implements RSDecorativeObject
 	@Override
 	public Area getClickbox()
 	{
-		return Perspective.getClickbox(client, getModel(), getOrientation(), getLocalLocation());
+		Area clickbox = new Area();
+
+		LocalPoint lp = getLocalLocation();
+		Area clickboxA = Perspective.getClickbox(client, getModel(), 0,
+			new LocalPoint(lp.getX() + getXOffset(), lp.getY() + getYOffset()));
+		Area clickboxB = Perspective.getClickbox(client, getModel2(), 0, lp);
+
+		if (clickboxA == null && clickboxB == null)
+		{
+			return null;
+		}
+
+		if (clickboxA != null)
+		{
+			clickbox.add(clickboxA);
+		}
+
+		if (clickboxB != null)
+		{
+			clickbox.add(clickboxB);
+		}
+
+		return clickbox;
 	}
 
 	@Inject
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java
index 3ef5358ffd..e5db24d686 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWallObjectMixin.java
@@ -101,8 +101,8 @@ public abstract class RSWallObjectMixin implements RSWallObject
 	{
 		Area clickbox = new Area();
 
-		Area clickboxA = Perspective.getClickbox(client, getModelA(), getOrientationA(), getLocalLocation());
-		Area clickboxB = Perspective.getClickbox(client, getModelB(), getOrientationB(), getLocalLocation());
+		Area clickboxA = Perspective.getClickbox(client, getModelA(), 0, getLocalLocation());
+		Area clickboxB = Perspective.getClickbox(client, getModelB(), 0, getLocalLocation());
 
 		if (clickboxA == null && clickboxB == null)
 		{
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 7b64643772..e4c9962294 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>script-assembler-plugin</artifactId>
diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml
index 7d49ad3e13..f7bd6163c5 100644
--- a/runescape-api/pom.xml
+++ b/runescape-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.25-SNAPSHOT</version>
+		<version>1.5.26-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>