diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
index 736d7b3fab..5bc35696ca 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
@@ -48,6 +48,7 @@ import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.SpriteManager;
 import net.runelite.client.plugins.skillcalculator.skills.SkillAction;
@@ -65,6 +66,7 @@ class SkillCalculator extends JPanel
 
 	private final UICalculatorInputArea uiInput;
 	private final Client client;
+	private final ClientThread clientThread;
 	private final SpriteManager spriteManager;
 	private final ItemManager itemManager;
 	private final List<UIActionSlot> uiActionSlots = new ArrayList<>();
@@ -80,9 +82,10 @@ class SkillCalculator extends JPanel
 	private int targetXP = Experience.getXpForLevel(targetLevel);
 	private float xpFactor = 1;
 
-	SkillCalculator(Client client, UICalculatorInputArea uiInput, SpriteManager spriteManager, ItemManager itemManager)
+	SkillCalculator(Client client, ClientThread clientThread, UICalculatorInputArea uiInput, SpriteManager spriteManager, ItemManager itemManager)
 	{
 		this.client = client;
+		this.clientThread = clientThread;
 		this.uiInput = uiInput;
 		this.spriteManager = spriteManager;
 		this.itemManager = itemManager;
@@ -303,7 +306,7 @@ class SkillCalculator extends JPanel
 				spriteManager.addSpriteTo(uiIcon, action.getSprite(), 0);
 			}
 
-			UIActionSlot slot = new UIActionSlot(action, uiIcon);
+			UIActionSlot slot = new UIActionSlot(action, clientThread, itemManager, uiIcon);
 			uiActionSlots.add(slot); // Keep our own reference.
 			add(slot); // Add component to the panel.
 
@@ -448,7 +451,7 @@ class SkillCalculator extends JPanel
 
 	private static boolean slotContainsText(UIActionSlot slot, String text)
 	{
-		return slot.getAction().getName().toLowerCase().contains(text.toLowerCase());
+		return slot.getActionName().toLowerCase().contains(text.toLowerCase());
 	}
 
 	private static FocusAdapter buildFocusAdapter(Consumer<FocusEvent> focusLostConsumer)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
index 6c2f97f57c..82d4f59648 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
@@ -32,6 +32,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JScrollPane;
 import javax.swing.border.EmptyBorder;
 import net.runelite.api.Client;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.SkillIconManager;
 import net.runelite.client.game.SpriteManager;
@@ -46,7 +47,7 @@ class SkillCalculatorPanel extends PluginPanel
 	private final SkillIconManager iconManager;
 	private final MaterialTabGroup tabGroup;
 
-	SkillCalculatorPanel(SkillIconManager iconManager, Client client, SpriteManager spriteManager, ItemManager itemManager)
+	SkillCalculatorPanel(SkillIconManager iconManager, Client client, ClientThread clientThread, SpriteManager spriteManager, ItemManager itemManager)
 	{
 		super();
 		getScrollPane().setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
@@ -70,7 +71,7 @@ class SkillCalculatorPanel extends PluginPanel
 		final UICalculatorInputArea uiInput = new UICalculatorInputArea();
 		uiInput.setBorder(new EmptyBorder(15, 0, 15, 0));
 		uiInput.setBackground(ColorScheme.DARK_GRAY_COLOR);
-		uiCalculator = new SkillCalculator(client, uiInput, spriteManager, itemManager);
+		uiCalculator = new SkillCalculator(client, clientThread, uiInput, spriteManager, itemManager);
 
 		add(tabGroup, c);
 		c.gridy++;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
index b62f688576..1aab06820f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 import net.runelite.api.Client;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.SkillIconManager;
 import net.runelite.client.game.SpriteManager;
@@ -46,6 +47,9 @@ public class SkillCalculatorPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private ClientThread clientThread;
+
 	@Inject
 	private SkillIconManager skillIconManager;
 
@@ -64,7 +68,7 @@ public class SkillCalculatorPlugin extends Plugin
 	protected void startUp() throws Exception
 	{
 		final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "calc.png");
-		final SkillCalculatorPanel uiPanel = new SkillCalculatorPanel(skillIconManager, client, spriteManager, itemManager);
+		final SkillCalculatorPanel uiPanel = new SkillCalculatorPanel(skillIconManager, client, clientThread, spriteManager, itemManager);
 
 		uiNavigationButton = NavigationButton.builder()
 			.tooltip("Skill Calculator")
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
index c005d42f90..aa2fd23937 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
@@ -35,12 +35,15 @@ import java.awt.event.MouseListener;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
+import net.runelite.client.callback.ClientThread;
+import net.runelite.client.game.ItemManager;
 import net.runelite.client.plugins.skillcalculator.skills.SkillAction;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
@@ -64,8 +67,11 @@ class UIActionSlot extends JPanel
 
 	@Getter(AccessLevel.PACKAGE)
 	private final SkillAction action;
-	private final JShadowedLabel uiLabelActions;
 
+	@Getter(AccessLevel.PACKAGE)
+	private String actionName;
+
+	private final JShadowedLabel uiLabelActions;
 	private final JPanel uiInfo;
 
 	@Getter(AccessLevel.PACKAGE)
@@ -81,7 +87,7 @@ class UIActionSlot extends JPanel
 	@Setter(AccessLevel.PACKAGE)
 	private double value;
 
-	UIActionSlot(SkillAction action, JLabel uiIcon)
+	UIActionSlot(SkillAction action, ClientThread clientThread, ItemManager itemManager, JLabel uiIcon)
 	{
 		this.action = action;
 
@@ -120,7 +126,12 @@ class UIActionSlot extends JPanel
 		uiInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		uiInfo.setBorder(new EmptyBorder(0, 5, 0, 0));
 
-		JShadowedLabel uiLabelName = new JShadowedLabel(action.getName());
+		JShadowedLabel uiLabelName = new JShadowedLabel();
+		clientThread.invokeLater(() ->
+		{
+			actionName = action.getName(itemManager);
+			SwingUtilities.invokeLater(() -> uiLabelName.setText(actionName));
+		});
 		uiLabelName.setForeground(Color.WHITE);
 
 		uiLabelActions = new JShadowedLabel("Unknown");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/AgilityAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/AgilityAction.java
index d62285d548..3edef73f70 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/AgilityAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/AgilityAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum AgilityAction implements SkillAction
+public enum AgilityAction implements NamedSkillAction
 {
 	GNOME_STRONGHOLD_COURSE("Gnome Stronghold", 1, 86.5f, ItemID.SWAMP_TOAD),
 	SHAYZIEN_BASIC_COURSE("Shayzien Basic Course", 5, 133.2f, ItemID.SHAYZIEN_HELM_1),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ConstructionAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ConstructionAction.java
index 01b1148909..ed0e0c65b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ConstructionAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ConstructionAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum ConstructionAction implements SkillAction
+public enum ConstructionAction implements NamedSkillAction
 {
 	EXIT_PORTAL("Exit Portal", 1, 100, ItemID.EXIT_PORTAL),
 	PLANK("Plank", 1, 29, ItemID.PLANK),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CookingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CookingAction.java
index 3a9b2a208f..7a6c09cc4c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CookingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CookingAction.java
@@ -30,135 +30,134 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum CookingAction implements SkillAction
+public enum CookingAction implements ItemSkillAction
 {
-	SINEW("Sinew", 1, 3, ItemID.SINEW),
-	SHRIMPS("Shrimps", 1, 30, ItemID.SHRIMPS),
-	COOKED_CHICKEN("Cooked chicken", 1, 30, ItemID.COOKED_CHICKEN),
-	COOKED_MEAT("Cooked meat", 1, 30, ItemID.COOKED_MEAT),
-	COOKED_RABBIT("Cooked rabbit", 1, 30, ItemID.COOKED_RABBIT),
-	ANCHOVIES("Anchovies", 1, 30, ItemID.ANCHOVIES),
-	SARDINE("Sardine", 1, 40, ItemID.SARDINE),
-	POISON_KARAMBWAN("Poison karambwan", 1, 80, ItemID.POISON_KARAMBWAN),
-	UGTHANKI_MEAT("Ugthanki meat", 1, 40, ItemID.UGTHANKI_MEAT),
-	BREAD("Bread", 1, 40, ItemID.BREAD),
-	HERRING("Herring", 5, 50, ItemID.HERRING),
-	FRUIT_BLAST("Fruit blast", 6, 50, ItemID.FRUIT_BLAST),
-	BAKED_POTATO("Baked potato", 7, 15, ItemID.BAKED_POTATO),
-	GUPPY("Guppy", 7, 12, ItemID.GUPPY),
-	PINEAPPLE_PUNCH("Pineapple punch", 8, 70, ItemID.PINEAPPLE_PUNCH),
-	SPICY_SAUCE("Spicy sauce", 9, 25, ItemID.SPICY_SAUCE),
-	MACKEREL("Mackerel", 10, 60, ItemID.MACKEREL),
-	REDBERRY_PIE("Redberry pie", 10, 78, ItemID.REDBERRY_PIE),
-	TOAD_CRUNCHIES("Toad crunchies", 10, 100, ItemID.TOAD_CRUNCHIES),
-	CHILLI_CON_CARNE("Chilli con carne", 11, 55, ItemID.CHILLI_CON_CARNE),
-	ROAST_BIRD_MEAT("Roast bird meat", 11, 62.5f, ItemID.ROAST_BIRD_MEAT),
-	THIN_SNAIL_MEAT("Thin snail meat", 12, 70, ItemID.THIN_SNAIL_MEAT),
-	SPICY_CRUNCHIES("Spicy crunchies", 12, 100, ItemID.SPICY_CRUNCHIES),
-	SCRAMBLED_EGG("Scrambled egg", 13, 50, ItemID.SCRAMBLED_EGG),
-	CIDER("Cider", 14, 182, ItemID.CIDER),
-	WORM_CRUNCHIES("Worm crunchies", 14, 104, ItemID.WORM_CRUNCHIES),
-	TROUT("Trout", 15, 70, ItemID.TROUT),
-	SPIDER_ON_STICK("Spider on stick", 16, 80, ItemID.SPIDER_ON_STICK),
-	SPIDER_ON_SHAFT("Spider on shaft", 16, 80, ItemID.SPIDER_ON_SHAFT),
-	ROAST_RABBIT("Roast rabbit", 16, 72.5f, ItemID.ROAST_RABBIT),
-	CHOCCHIP_CRUNCHIES("Chocchip crunchies", 16, 100, ItemID.CHOCCHIP_CRUNCHIES),
-	LEAN_SNAIL_MEAT("Lean snail meat", 17, 80, ItemID.LEAN_SNAIL_MEAT),
-	COD("Cod", 18, 75, ItemID.COD),
-	WIZARD_BLIZZARD("Wizard blizzard", 18, 110, ItemID.WIZARD_BLIZZARD),
-	DWARVEN_STOUT("Dwarven stout", 19, 215, ItemID.DWARVEN_STOUT),
-	SHORT_GREEN_GUY("Short green guy", 20, 120, ItemID.SHORT_GREEN_GUY),
-	MEAT_PIE("Meat pie", 20, 110, ItemID.MEAT_PIE),
-	PIKE("Pike", 20, 80, ItemID.PIKE),
-	CUP_OF_TEA("Cup of tea", 20, 52, ItemID.CUP_OF_TEA),
-	CAVEFISH("Cavefish", 20, 23, ItemID.CAVEFISH),
-	ROAST_BEAST_MEAT("Roast beast meat", 21, 82.5f, ItemID.ROAST_BEAST_MEAT),
-	COOKED_CRAB_MEAT("Cooked crab meat", 21, 100, ItemID.COOKED_CRAB_MEAT),
-	POT_OF_CREAM("Pot of cream", 21, 18, ItemID.POT_OF_CREAM),
-	FAT_SNAIL_MEAT("Fat snail meat", 22, 95, ItemID.FAT_SNAIL_MEAT),
-	EGG_AND_TOMATO("Egg and tomato", 23, 50, ItemID.EGG_AND_TOMATO),
-	ASGARNIAN_ALE("Asgarnian ale", 24, 248, ItemID.ASGARNIAN_ALE),
-	SALMON("Salmon", 25, 90, ItemID.SALMON),
-	STEW("Stew", 25, 117, ItemID.STEW),
-	FRUIT_BATTA("Fruit batta", 25, 150, ItemID.FRUIT_BATTA),
-	TOAD_BATTA("Toad batta", 26, 152, ItemID.TOAD_BATTA),
-	WORM_BATTA("Worm batta", 27, 154, ItemID.WORM_BATTA),
-	VEGETABLE_BATTA("Vegetable batta", 28, 156, ItemID.VEGETABLE_BATTA),
-	SWEETCORN("Sweetcorn", 28, 104, ItemID.COOKED_SWEETCORN),
-	COOKED_SLIMY_EEL("Cooked slimy eel", 28, 95, ItemID.COOKED_SLIMY_EEL),
-	MUD_PIE("Mud pie", 29, 128, ItemID.MUD_PIE),
-	GREENMANS_ALE("Greenman's ale", 29, 281, ItemID.GREENMANS_ALE),
-	CHEESE_AND_TOMATO_BATTA("Cheese and tomato Batta", 29, 158, ItemID.CHEESETOM_BATTA),
-	TUNA("Tuna", 30, 100, ItemID.TUNA),
-	APPLE_PIE("Apple pie", 30, 130, ItemID.APPLE_PIE),
-	WORM_HOLE("Worm hole", 30, 170, ItemID.WORM_HOLE),
-	COOKED_KARAMBWAN("Cooked karambwan", 30, 190, ItemID.COOKED_KARAMBWAN),
-	ROASTED_CHOMPY("Roasted chompy", 30, 100, ItemID.COOKED_CHOMPY),
-	FISHCAKE("Fishcake", 31, 100, ItemID.COOKED_FISHCAKE),
-	DRUNK_DRAGON("Drunk dragon", 32, 160, ItemID.DRUNK_DRAGON),
-	CHOC_SATURDAY("Choc saturday", 33, 170, ItemID.CHOC_SATURDAY),
-	TETRA("Tetra", 33, 31, ItemID.TETRA),
-	GARDEN_PIE("Garden pie", 34, 138, ItemID.GARDEN_PIE),
-	WIZARDS_MIND_BOMB("Wizard's mind bomb", 34, 314, ItemID.WIZARDS_MIND_BOMB),
-	JUG_OF_WINE("Jug of wine", 35, 200, ItemID.JUG_OF_WINE),
-	PLAIN_PIZZA("Plain pizza", 35, 143, ItemID.PLAIN_PIZZA),
-	RAINBOW_FISH("Rainbow fish", 35, 110, ItemID.RAINBOW_FISH),
-	VEG_BALL("Veg ball", 35, 175, ItemID.VEG_BALL),
-	BLURBERRY_SPECIAL("Blurberry special", 37, 180, ItemID.BLURBERRY_SPECIAL),
-	CAVE_EEL("Cave eel", 38, 115, ItemID.CAVE_EEL),
-	PAT_OF_BUTTER("Pat of butter", 38, 40.5f, ItemID.PAT_OF_BUTTER),
-	DRAGON_BITTER("Dragon bitter", 39, 347, ItemID.DRAGON_BITTER),
-	POTATO_WITH_BUTTER("Potato with butter", 39, 40, ItemID.POTATO_WITH_BUTTER),
-	LOBSTER("Lobster", 40, 120, ItemID.LOBSTER),
-	CAKE("Cake", 40, 180, ItemID.CAKE),
-	TANGLED_TOADS_LEGS("Tangled toad's legs", 40, 185, ItemID.TANGLED_TOADS_LEGS),
-	CHILLI_POTATO("Chilli potato", 41, 165.5f, ItemID.CHILLI_POTATO),
-	COOKED_JUBBLY("Cooked jubbly", 41, 160, ItemID.COOKED_JUBBLY),
-	CHOCOLATE_BOMB("Chocolate bomb", 42, 190, ItemID.CHOCOLATE_BOMB),
-	FRIED_ONIONS("Fried onions", 42, 60, ItemID.FRIED_ONIONS),
-	BASS("Bass", 43, 130, ItemID.BASS),
-	MOONLIGHT_MEAD("Moonlight mead", 44, 380, ItemID.MOONLIGHT_MEAD),
-	SWORDFISH("Swordfish", 45, 140, ItemID.SWORDFISH),
-	MEAT_PIZZA("Meat pizza", 45, 169, ItemID.MEAT_PIZZA),
-	FRIED_MUSHROOMS("Fried mushrooms", 46, 60, ItemID.FRIED_MUSHROOMS),
-	CATFISH("Catfish", 46, 43, ItemID.CATFISH),
-	FISH_PIE("Fish pie", 47, 164, ItemID.FISH_PIE),
-	POTATO_WITH_CHEESE("Potato with cheese", 47, 40, ItemID.POTATO_WITH_CHEESE),
-	CHEESE("Cheese", 48, 64, ItemID.CHEESE),
-	AXEMANS_FOLLY("Axeman's folly", 49, 413, ItemID.AXEMANS_FOLLY),
-	COOKED_OOMLIE_WRAP("Cooked oomlie wrap", 50, 30, ItemID.COOKED_OOMLIE_WRAP),
-	CHOCOLATE_CAKE("Chocolate cake", 50, 210, ItemID.CHOCOLATE_CAKE),
-	EGG_POTATO("Egg potato", 51, 195.5f, ItemID.EGG_POTATO),
-	BOTANICAL_PIE("Botanical pie", 52, 180, ItemID.BOTANICAL_PIE),
-	LAVA_EEL("Lava eel", 53, 30, ItemID.LAVA_EEL),
-	CHEFS_DELIGHT("Chef's Delight", 54, 446, ItemID.CHEFS_DELIGHT),
-	ANCHOVY_PIZZA("Anchovy pizza", 55, 182, ItemID.ANCHOVY_PIZZA),
-	MUSHROOM_AND_ONION("Mushroom & onion", 57, 120, ItemID.MUSHROOM__ONION),
-	UGTHANKI_KEBAB_FRESH("Ugthanki kebab (Fresh)", 58, 80, ItemID.UGTHANKI_KEBAB),
-	PITTA_BREAD("Pitta bread", 58, 40, ItemID.PITTA_BREAD),
-	SLAYERS_RESPITE("Slayer's respite", 59, 479, ItemID.SLAYERS_RESPITE),
-	CURRY("Curry", 60, 280, ItemID.CURRY),
-	MUSHROOM_PIE("Mushroom pie", 60, 200, ItemID.MUSHROOM_PIE),
-	MONKFISH("Monkfish", 62, 150, ItemID.MONKFISH),
-	MUSHROOM_POTATO("Mushroom potato", 64, 270.5f, ItemID.MUSHROOM_POTATO),
-	PINEAPPLE_PIZZA("Pineapple pizza", 65, 188, ItemID.PINEAPPLE_PIZZA),
-	WINE_OF_ZAMORAK("Wine of zamorak", 65, 200, ItemID.WINE_OF_ZAMORAK),
-	TUNA_AND_CORN("Tuna and corn", 67, 204, ItemID.TUNA_AND_CORN),
-	TUNA_POTATO("Tuna potato", 68, 309.5f, ItemID.TUNA_POTATO),
-	ADMIRAL_PIE("Admiral pie", 70, 210, ItemID.ADMIRAL_PIE),
-	SACRED_EEL("Sacred eel", 72, 109, ItemID.SACRED_EEL),
-	DRAGONFRUIT_PIE("Dragonfruit pie", 73, 220, ItemID.DRAGONFRUIT_PIE),
-	SHARK("Shark", 80, 210, ItemID.SHARK),
-	SEA_TURTLE("Sea turtle", 82, 211.3f, ItemID.SEA_TURTLE),
-	ANGLERFISH("Anglerfish", 84, 230, ItemID.ANGLERFISH),
-	WILD_PIE("Wild pie", 85, 240, ItemID.WILD_PIE),
-	DARK_CRAB("Dark crab", 90, 215, ItemID.DARK_CRAB),
-	MANTA_RAY("Manta ray", 91, 216.3f, ItemID.MANTA_RAY),
-	SUMMER_PIE("Summer pie", 95, 260, ItemID.SUMMER_PIE),
+	SINEW(ItemID.SINEW, 1, 3),
+	SHRIMPS(ItemID.SHRIMPS, 1, 30),
+	COOKED_CHICKEN(ItemID.COOKED_CHICKEN, 1, 30),
+	COOKED_MEAT(ItemID.COOKED_MEAT, 1, 30),
+	COOKED_RABBIT(ItemID.COOKED_RABBIT, 1, 30),
+	ANCHOVIES(ItemID.ANCHOVIES, 1, 30),
+	SARDINE(ItemID.SARDINE, 1, 40),
+	POISON_KARAMBWAN(ItemID.POISON_KARAMBWAN, 1, 80),
+	UGTHANKI_MEAT(ItemID.UGTHANKI_MEAT, 1, 40),
+	BREAD(ItemID.BREAD, 1, 40),
+	HERRING(ItemID.HERRING, 5, 50),
+	FRUIT_BLAST(ItemID.FRUIT_BLAST, 6, 50),
+	BAKED_POTATO(ItemID.BAKED_POTATO, 7, 15),
+	GUPPY(ItemID.GUPPY, 7, 12),
+	PINEAPPLE_PUNCH(ItemID.PINEAPPLE_PUNCH, 8, 70),
+	SPICY_SAUCE(ItemID.SPICY_SAUCE, 9, 25),
+	MACKEREL(ItemID.MACKEREL, 10, 60),
+	REDBERRY_PIE(ItemID.REDBERRY_PIE, 10, 78),
+	TOAD_CRUNCHIES(ItemID.TOAD_CRUNCHIES, 10, 100),
+	CHILLI_CON_CARNE(ItemID.CHILLI_CON_CARNE, 11, 55),
+	ROAST_BIRD_MEAT(ItemID.ROAST_BIRD_MEAT, 11, 62.5f),
+	THIN_SNAIL_MEAT(ItemID.THIN_SNAIL_MEAT, 12, 70),
+	SPICY_CRUNCHIES(ItemID.SPICY_CRUNCHIES, 12, 100),
+	SCRAMBLED_EGG(ItemID.SCRAMBLED_EGG, 13, 50),
+	CIDER(ItemID.CIDER, 14, 182),
+	WORM_CRUNCHIES(ItemID.WORM_CRUNCHIES, 14, 104),
+	TROUT(ItemID.TROUT, 15, 70),
+	SPIDER_ON_STICK(ItemID.SPIDER_ON_STICK, 16, 80),
+	SPIDER_ON_SHAFT(ItemID.SPIDER_ON_SHAFT, 16, 80),
+	ROAST_RABBIT(ItemID.ROAST_RABBIT, 16, 72.5f),
+	CHOCCHIP_CRUNCHIES(ItemID.CHOCCHIP_CRUNCHIES, 16, 100),
+	LEAN_SNAIL_MEAT(ItemID.LEAN_SNAIL_MEAT, 17, 80),
+	COD(ItemID.COD, 18, 75),
+	WIZARD_BLIZZARD(ItemID.WIZARD_BLIZZARD, 18, 110),
+	DWARVEN_STOUT(ItemID.DWARVEN_STOUT, 19, 215),
+	SHORT_GREEN_GUY(ItemID.SHORT_GREEN_GUY, 20, 120),
+	MEAT_PIE(ItemID.MEAT_PIE, 20, 110),
+	PIKE(ItemID.PIKE, 20, 80),
+	CUP_OF_TEA(ItemID.CUP_OF_TEA, 20, 52),
+	CAVEFISH(ItemID.CAVEFISH, 20, 23),
+	ROAST_BEAST_MEAT(ItemID.ROAST_BEAST_MEAT, 21, 82.5f),
+	COOKED_CRAB_MEAT(ItemID.COOKED_CRAB_MEAT, 21, 100),
+	POT_OF_CREAM(ItemID.POT_OF_CREAM, 21, 18),
+	FAT_SNAIL_MEAT(ItemID.FAT_SNAIL_MEAT, 22, 95),
+	EGG_AND_TOMATO(ItemID.EGG_AND_TOMATO, 23, 50),
+	ASGARNIAN_ALE(ItemID.ASGARNIAN_ALE, 24, 248),
+	SALMON(ItemID.SALMON, 25, 90),
+	STEW(ItemID.STEW, 25, 117),
+	FRUIT_BATTA(ItemID.FRUIT_BATTA, 25, 150),
+	TOAD_BATTA(ItemID.TOAD_BATTA, 26, 152),
+	WORM_BATTA(ItemID.WORM_BATTA, 27, 154),
+	VEGETABLE_BATTA(ItemID.VEGETABLE_BATTA, 28, 156),
+	SWEETCORN(ItemID.COOKED_SWEETCORN, 28, 104),
+	COOKED_SLIMY_EEL(ItemID.COOKED_SLIMY_EEL, 28, 95),
+	MUD_PIE(ItemID.MUD_PIE, 29, 128),
+	GREENMANS_ALE(ItemID.GREENMANS_ALE, 29, 281),
+	CHEESE_AND_TOMATO_BATTA(ItemID.CHEESETOM_BATTA, 29, 158),
+	TUNA(ItemID.TUNA, 30, 100),
+	APPLE_PIE(ItemID.APPLE_PIE, 30, 130),
+	WORM_HOLE(ItemID.WORM_HOLE, 30, 170),
+	COOKED_KARAMBWAN(ItemID.COOKED_KARAMBWAN, 30, 190),
+	ROASTED_CHOMPY(ItemID.COOKED_CHOMPY, 30, 100),
+	FISHCAKE(ItemID.COOKED_FISHCAKE, 31, 100),
+	DRUNK_DRAGON(ItemID.DRUNK_DRAGON, 32, 160),
+	CHOC_SATURDAY(ItemID.CHOC_SATURDAY, 33, 170),
+	TETRA(ItemID.TETRA, 33, 31),
+	GARDEN_PIE(ItemID.GARDEN_PIE, 34, 138),
+	WIZARDS_MIND_BOMB(ItemID.WIZARDS_MIND_BOMB, 34, 314),
+	JUG_OF_WINE(ItemID.JUG_OF_WINE, 35, 200),
+	PLAIN_PIZZA(ItemID.PLAIN_PIZZA, 35, 143),
+	RAINBOW_FISH(ItemID.RAINBOW_FISH, 35, 110),
+	VEG_BALL(ItemID.VEG_BALL, 35, 175),
+	BLURBERRY_SPECIAL(ItemID.BLURBERRY_SPECIAL, 37, 180),
+	CAVE_EEL(ItemID.CAVE_EEL, 38, 115),
+	PAT_OF_BUTTER(ItemID.PAT_OF_BUTTER, 38, 40.5f),
+	DRAGON_BITTER(ItemID.DRAGON_BITTER, 39, 347),
+	POTATO_WITH_BUTTER(ItemID.POTATO_WITH_BUTTER, 39, 40),
+	LOBSTER(ItemID.LOBSTER, 40, 120),
+	CAKE(ItemID.CAKE, 40, 180),
+	TANGLED_TOADS_LEGS(ItemID.TANGLED_TOADS_LEGS, 40, 185),
+	CHILLI_POTATO(ItemID.CHILLI_POTATO, 41, 165.5f),
+	COOKED_JUBBLY(ItemID.COOKED_JUBBLY, 41, 160),
+	CHOCOLATE_BOMB(ItemID.CHOCOLATE_BOMB, 42, 190),
+	FRIED_ONIONS(ItemID.FRIED_ONIONS, 42, 60),
+	BASS(ItemID.BASS, 43, 130),
+	MOONLIGHT_MEAD(ItemID.MOONLIGHT_MEAD, 44, 380),
+	SWORDFISH(ItemID.SWORDFISH, 45, 140),
+	MEAT_PIZZA(ItemID.MEAT_PIZZA, 45, 169),
+	FRIED_MUSHROOMS(ItemID.FRIED_MUSHROOMS, 46, 60),
+	CATFISH(ItemID.CATFISH, 46, 43),
+	FISH_PIE(ItemID.FISH_PIE, 47, 164),
+	POTATO_WITH_CHEESE(ItemID.POTATO_WITH_CHEESE, 47, 40),
+	CHEESE(ItemID.CHEESE, 48, 64),
+	AXEMANS_FOLLY(ItemID.AXEMANS_FOLLY, 49, 413),
+	COOKED_OOMLIE_WRAP(ItemID.COOKED_OOMLIE_WRAP, 50, 30),
+	CHOCOLATE_CAKE(ItemID.CHOCOLATE_CAKE, 50, 210),
+	EGG_POTATO(ItemID.EGG_POTATO, 51, 195.5f),
+	BOTANICAL_PIE(ItemID.BOTANICAL_PIE, 52, 180),
+	LAVA_EEL(ItemID.LAVA_EEL, 53, 30),
+	CHEFS_DELIGHT(ItemID.CHEFS_DELIGHT, 54, 446),
+	ANCHOVY_PIZZA(ItemID.ANCHOVY_PIZZA, 55, 182),
+	MUSHROOM_AND_ONION(ItemID.MUSHROOM__ONION, 57, 120),
+	UGTHANKI_KEBAB_FRESH(ItemID.UGTHANKI_KEBAB, 58, 80),
+	PITTA_BREAD(ItemID.PITTA_BREAD, 58, 40),
+	SLAYERS_RESPITE(ItemID.SLAYERS_RESPITE, 59, 479),
+	CURRY(ItemID.CURRY, 60, 280),
+	MUSHROOM_PIE(ItemID.MUSHROOM_PIE, 60, 200),
+	MONKFISH(ItemID.MONKFISH, 62, 150),
+	MUSHROOM_POTATO(ItemID.MUSHROOM_POTATO, 64, 270.5f),
+	PINEAPPLE_PIZZA(ItemID.PINEAPPLE_PIZZA, 65, 188),
+	WINE_OF_ZAMORAK(ItemID.WINE_OF_ZAMORAK, 65, 200),
+	TUNA_AND_CORN(ItemID.TUNA_AND_CORN, 67, 204),
+	TUNA_POTATO(ItemID.TUNA_POTATO, 68, 309.5f),
+	ADMIRAL_PIE(ItemID.ADMIRAL_PIE, 70, 210),
+	SACRED_EEL(ItemID.SACRED_EEL, 72, 109),
+	DRAGONFRUIT_PIE(ItemID.DRAGONFRUIT_PIE, 73, 220),
+	SHARK(ItemID.SHARK, 80, 210),
+	SEA_TURTLE(ItemID.SEA_TURTLE, 82, 211.3f),
+	ANGLERFISH(ItemID.ANGLERFISH, 84, 230),
+	WILD_PIE(ItemID.WILD_PIE, 85, 240),
+	DARK_CRAB(ItemID.DARK_CRAB, 90, 215),
+	MANTA_RAY(ItemID.MANTA_RAY, 91, 216.3f),
+	SUMMER_PIE(ItemID.SUMMER_PIE, 95, 260),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CraftingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CraftingAction.java
index 26d5ecf040..c7c8720508 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CraftingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/CraftingAction.java
@@ -30,146 +30,145 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum CraftingAction implements SkillAction
+public enum CraftingAction implements ItemSkillAction
 {
-	BALL_OF_WOOL("Ball of wool", 1, 2.5f, ItemID.BALL_OF_WOOL),
-	UNFIRED_POT("Unfired pot", 1, 6.3f, ItemID.UNFIRED_POT),
-	POT("Pot", 1, 6.3f, ItemID.POT),
-	LEATHER_GLOVES("Leather gloves", 1, 13.8f, ItemID.LEATHER_GLOVES),
-	OPAL("Opal", 1, 15, ItemID.OPAL),
-	OPAL_RING("Opal ring", 1, 10, ItemID.OPAL_RING),
-	MOLTEN_GLASS("Molten glass", 1, 20, ItemID.MOLTEN_GLASS),
-	BEER_GLASS("Beer glass", 1, 17.5f, ItemID.BEER_GLASS),
-	EMPTY_CANDLE_LANTERN("Empty candle lantern", 4, 19, ItemID.EMPTY_CANDLE_LANTERN),
-	GOLD_RING("Gold ring", 5, 15, ItemID.GOLD_RING),
-	BIRD_HOUSE("Bird house", 5, 15, ItemID.BIRD_HOUSE),
-	GOLD_NECKLACE("Gold necklace", 6, 20, ItemID.GOLD_NECKLACE),
-	LEATHER_BOOTS("Leather boots", 7, 16.3f, ItemID.LEATHER_BOOTS),
-	UNFIRED_PIE_DISH("Unfired pie dish", 7, 15, ItemID.UNFIRED_PIE_DISH),
-	PIE_DISH("Pie dish", 7, 10, ItemID.PIE_DISH),
-	GOLD_BRACELET("Gold bracelet", 7, 25, ItemID.GOLD_BRACELET),
-	UNFIRED_BOWL("Unfired bowl", 8, 18, ItemID.UNFIRED_BOWL),
-	BOWL("Bowl", 8, 15, ItemID.BOWL),
-	GOLD_AMULET_U("Gold amulet (u)", 8, 30, ItemID.GOLD_AMULET_U),
-	COWL("Cowl", 9, 18.5f, ItemID.LEATHER_COWL),
-	CROSSBOW_STRING("Crossbow string", 10, 15, ItemID.CROSSBOW_STRING),
-	BOW_STRING("Bow string", 10, 15, ItemID.BOW_STRING),
-	LEATHER_VAMBRACES("Leather vambraces", 11, 22, ItemID.LEATHER_VAMBRACES),
-	EMPTY_OIL_LAMP("Empty oil lamp", 12, 25, ItemID.EMPTY_OIL_LAMP),
-	JADE("Jade", 13, 20, ItemID.JADE),
-	JADE_RING("Jade ring", 13, 32, ItemID.JADE_RING),
-	LEATHER_BODY("Leather body", 14, 25, ItemID.LEATHER_BODY),
-	OAK_BIRD_HOUSE("Oak bird house", 15, 20, ItemID.OAK_BIRD_HOUSE),
-	RED_TOPAZ("Red topaz", 16, 25, ItemID.RED_TOPAZ),
-	TOPAZ_RING("Topaz ring", 16, 35, ItemID.TOPAZ_RING),
-	HOLY_SYMBOL("Holy symbol", 16, 50, ItemID.HOLY_SYMBOL),
-	OPAL_NECKLACE("Opal necklace", 16, 35, ItemID.OPAL_NECKLACE),
-	UNHOLY_SYMBOL("Unholy symbol", 17, 50, ItemID.UNHOLY_SYMBOL),
-	LEATHER_CHAPS("Leather chaps", 18, 27, ItemID.LEATHER_CHAPS),
-	UNFIRED_PLANT_POT("Unfired plant pot", 19, 20, ItemID.UNFIRED_PLANT_POT),
-	EMPTY_PLANT_POT("Empty plant pot", 19, 17.5f, ItemID.EMPTY_PLANT_POT),
-	MAGIC_STRING("Magic string", 19, 30, ItemID.MAGIC_STRING),
-	SAPPHIRE("Sapphire", 20, 50, ItemID.SAPPHIRE),
-	SAPPHIRE_RING("Sapphire ring", 20, 40, ItemID.SAPPHIRE_RING),
-	EMPTY_SACK("Empty sack", 21, 38, ItemID.EMPTY_SACK),
-	SAPPHIRE_NECKLACE("Sapphire necklace", 22, 55, ItemID.SAPPHIRE_NECKLACE),
-	OPAL_BRACELET("Opal bracelet", 22, 45, ItemID.OPAL_BRACELET),
-	SAPPHIRE_BRACELET("Sapphire bracelet", 23, 60, ItemID.SAPPHIRE_BRACELET),
-	TIARA("Tiara", 23, 52.5f, ItemID.TIARA),
-	SAPPHIRE_AMULET_U("Sapphire amulet (u)", 24, 65, ItemID.SAPPHIRE_AMULET_U),
-	UNFIRED_POT_LID("Unfired pot lid", 25, 20, ItemID.UNFIRED_POT_LID),
-	POT_LID("Pot lid", 25, 20, ItemID.POT_LID),
-	JADE_NECKLACE("Jade necklace", 25, 54, ItemID.JADE_NECKLACE),
-	WILLOW_BIRD_HOUSE("Willow bird house", 25, 25, ItemID.WILLOW_BIRD_HOUSE),
-	DRIFT_NET("Drift net", 26, 55, ItemID.SMALL_FISHING_NET_6209),
-	EMERALD("Emerald", 27, 67.5f, ItemID.EMERALD),
-	EMERALD_RING("Emerald ring", 27, 55, ItemID.EMERALD_RING),
-	OPAL_AMULET_U("Opal amulet (u)", 27, 55, ItemID.OPAL_AMULET_U),
-	HARDLEATHER_BODY("Hardleather body", 28, 35, ItemID.HARDLEATHER_BODY),
-	EMERALD_NECKLACE("Emerald necklace", 29, 60, ItemID.EMERALD_NECKLACE),
-	JADE_BRACELET("Jade bracelet", 29, 60, ItemID.JADE_BRACELET),
-	EMERALD_BRACELET("Emerald bracelet", 30, 65, ItemID.EMERALD_BRACELET),
-	ROPE("Rope", 30, 25, ItemID.ROPE),
-	EMERALD_AMULET_U("Emerald amulet (u)", 31, 70, ItemID.EMERALD_AMULET_U),
-	SPIKY_VAMBRACES("Spiky vambraces", 32, 6, ItemID.SPIKY_VAMBRACES),
-	TOPAZ_NECKLACE("Topaz necklace", 32, 70, ItemID.TOPAZ_NECKLACE),
-	VIAL("Vial", 33, 35, ItemID.VIAL),
-	RUBY("Ruby", 34, 85, ItemID.RUBY),
-	RUBY_RING("Ruby ring", 34, 70, ItemID.RUBY_RING),
-	JADE_AMULET_U("Jade amulet (u)", 34, 70, ItemID.JADE_AMULET_U),
-	BROODOO_SHIELD("Broodoo shield", 35, 100, ItemID.BROODOO_SHIELD),
-	TEAK_BIRD_HOUSE("Teak bird house", 35, 30, ItemID.TEAK_BIRD_HOUSE),
-	BASKET("Basket", 36, 56, ItemID.BASKET),
-	COIF("Coif", 38, 37, ItemID.COIF),
-	TOPAZ_BRACELET("Topaz bracelet", 38, 75, ItemID.TOPAZ_BRACELET),
-	RUBY_NECKLACE("Ruby necklace", 40, 75, ItemID.RUBY_NECKLACE),
-	HARD_LEATHER_SHIELD("Hard leather shield", 41, 70, ItemID.HARD_LEATHER_SHIELD),
-	RUBY_BRACELET("Ruby bracelet", 42, 80, ItemID.RUBY_BRACELET),
-	FISHBOWL("Fishbowl", 42, 42.5f, ItemID.FISHBOWL),
-	DIAMOND("Diamond", 43, 107.5f, ItemID.DIAMOND),
-	DIAMOND_RING("Diamond ring", 43, 85, ItemID.DIAMOND_RING),
-	TOPAZ_AMULET_U("Topaz amulet (u)", 45, 80, ItemID.TOPAZ_AMULET_U),
-	SNAKESKIN_BOOTS("Snakeskin boots", 45, 30, ItemID.SNAKESKIN_BOOTS),
-	MAPLE_BIRD_HOUSE("Maple bird house", 45, 35, ItemID.MAPLE_BIRD_HOUSE),
-	UNPOWERED_ORB("Unpowered orb", 46, 52.5f, ItemID.UNPOWERED_ORB),
-	SNAKESKIN_VAMBRACES("Snakeskin vambraces", 47, 35, ItemID.SNAKESKIN_VAMBRACES),
-	SNAKESKIN_BANDANA("Snakeskin bandana", 48, 45, ItemID.SNAKESKIN_BANDANA),
-	LANTERN_LENS("Lantern lens", 49, 55, ItemID.LANTERN_LENS),
-	RUBY_AMULET_U("Ruby amulet (u)", 50, 85, ItemID.RUBY_AMULET_U),
-	MAHOGANY_BIRD_HOUSE("Mahogany bird house", 50, 40, ItemID.MAHOGANY_BIRD_HOUSE),
-	SNAKESKIN_CHAPS("Snakeskin chaps", 51, 50, ItemID.SNAKESKIN_CHAPS),
-	SNAKESKIN_BODY("Snakeskin body", 53, 55, ItemID.SNAKESKIN_BODY),
-	WATER_BATTLESTAFF("Water battlestaff", 54, 100, ItemID.WATER_BATTLESTAFF),
-	DRAGONSTONE("Dragonstone", 55, 137.5f, ItemID.DRAGONSTONE),
-	DRAGONSTONE_RING("Dragonstone ring", 55, 100, ItemID.DRAGONSTONE_RING),
-	DIAMOND_NECKLACE("Diamond necklace", 56, 90, ItemID.DIAMOND_NECKLACE),
-	SNAKESKIN_SHIELD("Snakeskin shield", 56, 100, ItemID.SNAKESKIN_SHIELD),
-	GREEN_DHIDE_VAMB("Green D'hide vamb", 57, 62, ItemID.GREEN_DHIDE_VAMBRACES),
-	DIAMOND_BRACELET("Diamond bracelet", 58, 95, ItemID.DIAMOND_BRACELET),
-	EARTH_BATTLESTAFF("Earth battlestaff", 58, 112.5f, ItemID.EARTH_BATTLESTAFF),
-	GREEN_DHIDE_CHAPS("Green D'hide chaps", 60, 124, ItemID.GREEN_DHIDE_CHAPS),
-	YEW_BIRD_HOUSE("Yew bird house", 60, 45, ItemID.YEW_BIRD_HOUSE),
-	FIRE_BATTLESTAFF("Fire battlestaff", 62, 125, ItemID.FIRE_BATTLESTAFF),
-	GREEN_DHIDE_SHIELD("Green D'hide shield", 62, 124, ItemID.GREEN_DHIDE_SHIELD),
-	GREEN_DHIDE_BODY("Green D'hide body", 63, 186, ItemID.GREEN_DHIDE_BODY),
-	AIR_BATTLESTAFF("Air battlestaff", 66, 137.5f, ItemID.AIR_BATTLESTAFF),
-	BLUE_DHIDE_VAMB("Blue D'hide vamb", 66, 70, ItemID.BLUE_DHIDE_VAMBRACES),
-	ONYX_RING("Onyx ring", 67, 115, ItemID.ONYX_RING),
-	ONYX("Onyx", 67, 167.5f, ItemID.ONYX),
-	BLUE_DHIDE_CHAPS("Blue D'hide chaps", 68, 140, ItemID.BLUE_DHIDE_CHAPS),
-	BLUE_DHIDE_SHIELD("Blue D'hide shield", 69, 140, ItemID.BLUE_DHIDE_SHIELD),
-	DIAMOND_AMULET_U("Diamond amulet (u)", 70, 100, ItemID.DIAMOND_AMULET_U),
-	BLUE_DHIDE_BODY("Blue D'hide body", 71, 210, ItemID.BLUE_DHIDE_BODY),
-	DRAGONSTONE_NECKLACE("Dragonstone necklace", 72, 105, ItemID.DRAGON_NECKLACE),
-	RED_DHIDE_VAMB("Red D'hide vamb", 73, 78, ItemID.RED_DHIDE_VAMBRACES),
-	DRAGONSTONE_BRACELET("Dragonstone bracelet", 74, 110, ItemID.DRAGONSTONE_BRACELET),
-	RED_DHIDE_CHAPS("Red D'hide chaps", 75, 156, ItemID.RED_DHIDE_CHAPS),
-	MAGIC_BIRD_HOUSE("Magic bird house", 75, 50, ItemID.MAGIC_BIRD_HOUSE),
-	RED_DHIDE_SHIELD("Red D'hide shield", 76, 156, ItemID.RED_DHIDE_SHIELD),
-	RED_DHIDE_BODY("Red D'hide body", 77, 234, ItemID.RED_DHIDE_BODY),
-	BLACK_DHIDE_VAMB("Black D'hide vamb", 79, 86, ItemID.BLACK_DHIDE_VAMBRACES),
-	DRAGONSTONE_AMULET_U("Dragonstone amulet (u)", 80, 150, ItemID.DRAGONSTONE_AMULET_U),
-	BLACK_DHIDE_CHAPS("Black D'hide chaps", 82, 172, ItemID.BLACK_DHIDE_CHAPS),
-	ONYX_NECKLACE("Onyx necklace", 82, 120, ItemID.ONYX_NECKLACE),
-	AMETHYST_BOLT_TIPS("Amethyst bolt tips", 83, 4, ItemID.AMETHYST_BOLT_TIPS),
-	BLACK_DHIDE_SHIELD("Black D'hide shield", 83, 172, ItemID.BLACK_DHIDE_SHIELD),
-	BLACK_DHIDE_BODY("Black D'hide body", 84, 258, ItemID.BLACK_DHIDE_BODY),
-	ONYX_BRACELET("Onyx bracelet", 84, 125, ItemID.ONYX_BRACELET),
-	AMETHYST_ARROWTIPS("Amethyst arrowtips", 85, 4, ItemID.AMETHYST_ARROWTIPS),
-	AMETHYST_JAVELIN_HEADS("Amethyst javelin heads", 87, 12, ItemID.AMETHYST_JAVELIN_HEADS),
-	LIGHT_ORB("Light orb", 87, 70, ItemID.LIGHT_ORB),
-	AMETHYST_DART_TIP("Amethyst dart tip", 89, 7.5f, ItemID.AMETHYST_DART_TIP),
-	ZENYTE("Zenyte", 89, 200, ItemID.ZENYTE),
-	ZENYTE_RING("Zenyte ring", 89, 150, ItemID.ZENYTE_RING),
-	ONYX_AMULET_U("Onyx amulet (u)", 90, 165, ItemID.ONYX_AMULET_U),
-	REDWOOD_BIRD_HOUSE("Redwood bird house", 90, 55, ItemID.REDWOOD_BIRD_HOUSE),
-	ZENYTE_NECKLACE("Zenyte necklace", 92, 165, ItemID.ZENYTE_NECKLACE),
-	ZENYTE_BRACELET("Zenyte bracelet", 95, 180, ItemID.ZENYTE_BRACELET),
-	ZENYTE_AMULET_U("Zenyte amulet (u)", 98, 200, ItemID.ZENYTE_AMULET_U),
+	BALL_OF_WOOL(ItemID.BALL_OF_WOOL, 1, 2.5f),
+	UNFIRED_POT(ItemID.UNFIRED_POT, 1, 6.3f),
+	POT(ItemID.POT, 1, 6.3f),
+	LEATHER_GLOVES(ItemID.LEATHER_GLOVES, 1, 13.8f),
+	OPAL(ItemID.OPAL, 1, 15),
+	OPAL_RING(ItemID.OPAL_RING, 1, 10),
+	MOLTEN_GLASS(ItemID.MOLTEN_GLASS, 1, 20),
+	BEER_GLASS(ItemID.BEER_GLASS, 1, 17.5f),
+	EMPTY_CANDLE_LANTERN(ItemID.EMPTY_CANDLE_LANTERN, 4, 19),
+	GOLD_RING(ItemID.GOLD_RING, 5, 15),
+	BIRD_HOUSE(ItemID.BIRD_HOUSE, 5, 15),
+	GOLD_NECKLACE(ItemID.GOLD_NECKLACE, 6, 20),
+	LEATHER_BOOTS(ItemID.LEATHER_BOOTS, 7, 16.3f),
+	UNFIRED_PIE_DISH(ItemID.UNFIRED_PIE_DISH, 7, 15),
+	PIE_DISH(ItemID.PIE_DISH, 7, 10),
+	GOLD_BRACELET(ItemID.GOLD_BRACELET, 7, 25),
+	UNFIRED_BOWL(ItemID.UNFIRED_BOWL, 8, 18),
+	BOWL(ItemID.BOWL, 8, 15),
+	GOLD_AMULET_U(ItemID.GOLD_AMULET_U, 8, 30),
+	COWL(ItemID.LEATHER_COWL, 9, 18.5f),
+	CROSSBOW_STRING(ItemID.CROSSBOW_STRING, 10, 15),
+	BOW_STRING(ItemID.BOW_STRING, 10, 15),
+	LEATHER_VAMBRACES(ItemID.LEATHER_VAMBRACES, 11, 22),
+	EMPTY_OIL_LAMP(ItemID.EMPTY_OIL_LAMP, 12, 25),
+	JADE(ItemID.JADE, 13, 20),
+	JADE_RING(ItemID.JADE_RING, 13, 32),
+	LEATHER_BODY(ItemID.LEATHER_BODY, 14, 25),
+	OAK_BIRD_HOUSE(ItemID.OAK_BIRD_HOUSE, 15, 20),
+	RED_TOPAZ(ItemID.RED_TOPAZ, 16, 25),
+	TOPAZ_RING(ItemID.TOPAZ_RING, 16, 35),
+	HOLY_SYMBOL(ItemID.HOLY_SYMBOL, 16, 50),
+	OPAL_NECKLACE(ItemID.OPAL_NECKLACE, 16, 35),
+	UNHOLY_SYMBOL(ItemID.UNHOLY_SYMBOL, 17, 50),
+	LEATHER_CHAPS(ItemID.LEATHER_CHAPS, 18, 27),
+	UNFIRED_PLANT_POT(ItemID.UNFIRED_PLANT_POT, 19, 20),
+	EMPTY_PLANT_POT(ItemID.EMPTY_PLANT_POT, 19, 17.5f),
+	MAGIC_STRING(ItemID.MAGIC_STRING, 19, 30),
+	SAPPHIRE(ItemID.SAPPHIRE, 20, 50),
+	SAPPHIRE_RING(ItemID.SAPPHIRE_RING, 20, 40),
+	EMPTY_SACK(ItemID.EMPTY_SACK, 21, 38),
+	SAPPHIRE_NECKLACE(ItemID.SAPPHIRE_NECKLACE, 22, 55),
+	OPAL_BRACELET(ItemID.OPAL_BRACELET, 22, 45),
+	SAPPHIRE_BRACELET(ItemID.SAPPHIRE_BRACELET, 23, 60),
+	TIARA(ItemID.TIARA, 23, 52.5f),
+	SAPPHIRE_AMULET_U(ItemID.SAPPHIRE_AMULET_U, 24, 65),
+	UNFIRED_POT_LID(ItemID.UNFIRED_POT_LID, 25, 20),
+	POT_LID(ItemID.POT_LID, 25, 20),
+	JADE_NECKLACE(ItemID.JADE_NECKLACE, 25, 54),
+	WILLOW_BIRD_HOUSE(ItemID.WILLOW_BIRD_HOUSE, 25, 25),
+	DRIFT_NET(ItemID.SMALL_FISHING_NET_6209, 26, 55),
+	EMERALD(ItemID.EMERALD, 27, 67.5f),
+	EMERALD_RING(ItemID.EMERALD_RING, 27, 55),
+	OPAL_AMULET_U(ItemID.OPAL_AMULET_U, 27, 55),
+	HARDLEATHER_BODY(ItemID.HARDLEATHER_BODY, 28, 35),
+	EMERALD_NECKLACE(ItemID.EMERALD_NECKLACE, 29, 60),
+	JADE_BRACELET(ItemID.JADE_BRACELET, 29, 60),
+	EMERALD_BRACELET(ItemID.EMERALD_BRACELET, 30, 65),
+	ROPE(ItemID.ROPE, 30, 25),
+	EMERALD_AMULET_U(ItemID.EMERALD_AMULET_U, 31, 70),
+	SPIKY_VAMBRACES(ItemID.SPIKY_VAMBRACES, 32, 6),
+	TOPAZ_NECKLACE(ItemID.TOPAZ_NECKLACE, 32, 70),
+	VIAL(ItemID.VIAL, 33, 35),
+	RUBY(ItemID.RUBY, 34, 85),
+	RUBY_RING(ItemID.RUBY_RING, 34, 70),
+	JADE_AMULET_U(ItemID.JADE_AMULET_U, 34, 70),
+	BROODOO_SHIELD(ItemID.BROODOO_SHIELD, 35, 100),
+	TEAK_BIRD_HOUSE(ItemID.TEAK_BIRD_HOUSE, 35, 30),
+	BASKET(ItemID.BASKET, 36, 56),
+	COIF(ItemID.COIF, 38, 37),
+	TOPAZ_BRACELET(ItemID.TOPAZ_BRACELET, 38, 75),
+	RUBY_NECKLACE(ItemID.RUBY_NECKLACE, 40, 75),
+	HARD_LEATHER_SHIELD(ItemID.HARD_LEATHER_SHIELD, 41, 70),
+	RUBY_BRACELET(ItemID.RUBY_BRACELET, 42, 80),
+	FISHBOWL(ItemID.FISHBOWL, 42, 42.5f),
+	DIAMOND(ItemID.DIAMOND, 43, 107.5f),
+	DIAMOND_RING(ItemID.DIAMOND_RING, 43, 85),
+	TOPAZ_AMULET_U(ItemID.TOPAZ_AMULET_U, 45, 80),
+	SNAKESKIN_BOOTS(ItemID.SNAKESKIN_BOOTS, 45, 30),
+	MAPLE_BIRD_HOUSE(ItemID.MAPLE_BIRD_HOUSE, 45, 35),
+	UNPOWERED_ORB(ItemID.UNPOWERED_ORB, 46, 52.5f),
+	SNAKESKIN_VAMBRACES(ItemID.SNAKESKIN_VAMBRACES, 47, 35),
+	SNAKESKIN_BANDANA(ItemID.SNAKESKIN_BANDANA, 48, 45),
+	LANTERN_LENS(ItemID.LANTERN_LENS, 49, 55),
+	RUBY_AMULET_U(ItemID.RUBY_AMULET_U, 50, 85),
+	MAHOGANY_BIRD_HOUSE(ItemID.MAHOGANY_BIRD_HOUSE, 50, 40),
+	SNAKESKIN_CHAPS(ItemID.SNAKESKIN_CHAPS, 51, 50),
+	SNAKESKIN_BODY(ItemID.SNAKESKIN_BODY, 53, 55),
+	WATER_BATTLESTAFF(ItemID.WATER_BATTLESTAFF, 54, 100),
+	DRAGONSTONE(ItemID.DRAGONSTONE, 55, 137.5f),
+	DRAGONSTONE_RING(ItemID.DRAGONSTONE_RING, 55, 100),
+	DIAMOND_NECKLACE(ItemID.DIAMOND_NECKLACE, 56, 90),
+	SNAKESKIN_SHIELD(ItemID.SNAKESKIN_SHIELD, 56, 100),
+	GREEN_DHIDE_VAMB(ItemID.GREEN_DHIDE_VAMBRACES, 57, 62),
+	DIAMOND_BRACELET(ItemID.DIAMOND_BRACELET, 58, 95),
+	EARTH_BATTLESTAFF(ItemID.EARTH_BATTLESTAFF, 58, 112.5f),
+	GREEN_DHIDE_CHAPS(ItemID.GREEN_DHIDE_CHAPS, 60, 124),
+	YEW_BIRD_HOUSE(ItemID.YEW_BIRD_HOUSE, 60, 45),
+	FIRE_BATTLESTAFF(ItemID.FIRE_BATTLESTAFF, 62, 125),
+	GREEN_DHIDE_SHIELD(ItemID.GREEN_DHIDE_SHIELD, 62, 124),
+	GREEN_DHIDE_BODY(ItemID.GREEN_DHIDE_BODY, 63, 186),
+	AIR_BATTLESTAFF(ItemID.AIR_BATTLESTAFF, 66, 137.5f),
+	BLUE_DHIDE_VAMB(ItemID.BLUE_DHIDE_VAMBRACES, 66, 70),
+	ONYX_RING(ItemID.ONYX_RING, 67, 115),
+	ONYX(ItemID.ONYX, 67, 167.5f),
+	BLUE_DHIDE_CHAPS(ItemID.BLUE_DHIDE_CHAPS, 68, 140),
+	BLUE_DHIDE_SHIELD(ItemID.BLUE_DHIDE_SHIELD, 69, 140),
+	DIAMOND_AMULET_U(ItemID.DIAMOND_AMULET_U, 70, 100),
+	BLUE_DHIDE_BODY(ItemID.BLUE_DHIDE_BODY, 71, 210),
+	DRAGONSTONE_NECKLACE(ItemID.DRAGON_NECKLACE, 72, 105),
+	RED_DHIDE_VAMB(ItemID.RED_DHIDE_VAMBRACES, 73, 78),
+	DRAGONSTONE_BRACELET(ItemID.DRAGONSTONE_BRACELET, 74, 110),
+	RED_DHIDE_CHAPS(ItemID.RED_DHIDE_CHAPS, 75, 156),
+	MAGIC_BIRD_HOUSE(ItemID.MAGIC_BIRD_HOUSE, 75, 50),
+	RED_DHIDE_SHIELD(ItemID.RED_DHIDE_SHIELD, 76, 156),
+	RED_DHIDE_BODY(ItemID.RED_DHIDE_BODY, 77, 234),
+	BLACK_DHIDE_VAMB(ItemID.BLACK_DHIDE_VAMBRACES, 79, 86),
+	DRAGONSTONE_AMULET_U(ItemID.DRAGONSTONE_AMULET_U, 80, 150),
+	BLACK_DHIDE_CHAPS(ItemID.BLACK_DHIDE_CHAPS, 82, 172),
+	ONYX_NECKLACE(ItemID.ONYX_NECKLACE, 82, 120),
+	AMETHYST_BOLT_TIPS(ItemID.AMETHYST_BOLT_TIPS, 83, 4),
+	BLACK_DHIDE_SHIELD(ItemID.BLACK_DHIDE_SHIELD, 83, 172),
+	BLACK_DHIDE_BODY(ItemID.BLACK_DHIDE_BODY, 84, 258),
+	ONYX_BRACELET(ItemID.ONYX_BRACELET, 84, 125),
+	AMETHYST_ARROWTIPS(ItemID.AMETHYST_ARROWTIPS, 85, 4),
+	AMETHYST_JAVELIN_HEADS(ItemID.AMETHYST_JAVELIN_HEADS, 87, 12),
+	LIGHT_ORB(ItemID.LIGHT_ORB, 87, 70),
+	AMETHYST_DART_TIP(ItemID.AMETHYST_DART_TIP, 89, 7.5f),
+	ZENYTE(ItemID.ZENYTE, 89, 200),
+	ZENYTE_RING(ItemID.ZENYTE_RING, 89, 150),
+	ONYX_AMULET_U(ItemID.ONYX_AMULET_U, 90, 165),
+	REDWOOD_BIRD_HOUSE(ItemID.REDWOOD_BIRD_HOUSE, 90, 55),
+	ZENYTE_NECKLACE(ItemID.ZENYTE_NECKLACE, 92, 165),
+	ZENYTE_BRACELET(ItemID.ZENYTE_BRACELET, 95, 180),
+	ZENYTE_AMULET_U(ItemID.ZENYTE_AMULET_U, 98, 200),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java
index bcf06f1668..6f17dcceb3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum FarmingAction implements SkillAction
+public enum FarmingAction implements NamedSkillAction
 {
 	PLANT("Plant", 1, 31, ItemID.PLANT),
 	FERN_BIG_PLANT("Fern (big plant)", 1, 31, ItemID.FERN_8186),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FiremakingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FiremakingAction.java
index 57d1b92e7e..424fb851a8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FiremakingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FiremakingAction.java
@@ -30,24 +30,23 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum FiremakingAction implements SkillAction
+public enum FiremakingAction implements ItemSkillAction
 {
-	LOGS("Logs", 1, 40, ItemID.LOGS),
-	ACHEY_TREE_LOGS("Achey tree logs", 1, 40, ItemID.ACHEY_TREE_LOGS),
-	OAK_LOGS("Oak logs", 15, 60, ItemID.OAK_LOGS),
-	WILLOW_LOGS("Willow logs", 30, 90, ItemID.WILLOW_LOGS),
-	TEAK_LOGS("Teak logs", 35, 105, ItemID.TEAK_LOGS),
-	ARCTIC_PINE_LOGS("Arctic pine logs", 42, 125, ItemID.ARCTIC_PINE_LOGS),
-	MAPLE_LOGS("Maple logs", 45, 135, ItemID.MAPLE_LOGS),
-	MAHOGANY_LOGS("Mahogany logs", 50, 157.5f, ItemID.MAHOGANY_LOGS),
-	YEW_LOGS("Yew logs", 60, 202.5f, ItemID.YEW_LOGS),
-	BLISTERWOOD_LOGS("Blisterwood logs", 62, 96, ItemID.BLISTERWOOD_LOGS),
-	MAGIC_LOGS("Magic logs", 75, 303.8f, ItemID.MAGIC_LOGS),
-	REDWOOD_LOGS("Redwood logs", 90, 350, ItemID.REDWOOD_LOGS),
+	LOGS(ItemID.LOGS, 1, 40),
+	ACHEY_TREE_LOGS(ItemID.ACHEY_TREE_LOGS, 1, 40),
+	OAK_LOGS(ItemID.OAK_LOGS, 15, 60),
+	WILLOW_LOGS(ItemID.WILLOW_LOGS, 30, 90),
+	TEAK_LOGS(ItemID.TEAK_LOGS, 35, 105),
+	ARCTIC_PINE_LOGS(ItemID.ARCTIC_PINE_LOGS, 42, 125),
+	MAPLE_LOGS(ItemID.MAPLE_LOGS, 45, 135),
+	MAHOGANY_LOGS(ItemID.MAHOGANY_LOGS, 50, 157.5f),
+	YEW_LOGS(ItemID.YEW_LOGS, 60, 202.5f),
+	BLISTERWOOD_LOGS(ItemID.BLISTERWOOD_LOGS, 62, 96),
+	MAGIC_LOGS(ItemID.MAGIC_LOGS, 75, 303.8f),
+	REDWOOD_LOGS(ItemID.REDWOOD_LOGS, 90, 350),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FishingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FishingAction.java
index c414ac2d77..7f42218de2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FishingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FishingAction.java
@@ -30,46 +30,45 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum FishingAction implements SkillAction
+public enum FishingAction implements ItemSkillAction
 {
-	RAW_SHRIMPS("Raw shrimps", 1, 10, ItemID.RAW_SHRIMPS),
-	RAW_SARDINE("Raw sardine", 5, 20, ItemID.RAW_SARDINE),
-	RAW_KARAMBWANJI("Raw karambwanji", 5, 5, ItemID.RAW_KARAMBWANJI),
-	RAW_GUPPY("Raw guppy", 7, 8, ItemID.RAW_GUPPY),
-	RAW_HERRING("Raw herring", 10, 30, ItemID.RAW_HERRING),
-	RAW_ANCHOVIES("Raw anchovies", 15, 40, ItemID.RAW_ANCHOVIES),
-	RAW_MACKEREL("Raw mackerel", 16, 20, ItemID.RAW_MACKEREL),
-	RAW_TROUT("Raw trout", 20, 50, ItemID.RAW_TROUT),
-	RAW_CAVEFISH("Raw cavefish", 20, 16, ItemID.RAW_CAVEFISH),
-	RAW_COD("Raw cod", 23, 45, ItemID.RAW_COD),
-	RAW_PIKE("Raw pike", 25, 60, ItemID.RAW_PIKE),
-	RAW_SLIMY_EEL("Raw slimy eel", 28, 65, ItemID.RAW_SLIMY_EEL),
-	RAW_SALMON("Raw salmon", 30, 70, ItemID.RAW_SALMON),
-	RAW_TETRA("Raw tetra", 33, 24, ItemID.RAW_TETRA),
-	RAW_TUNA("Raw tuna", 35, 80, ItemID.RAW_TUNA),
-	RAW_RAINBOW_FISH("Raw rainbow fish", 38, 80, ItemID.RAW_RAINBOW_FISH),
-	RAW_CAVE_EEL("Raw cave eel", 38, 80, ItemID.RAW_CAVE_EEL),
-	RAW_LOBSTER("Raw lobster", 40, 90, ItemID.RAW_LOBSTER),
-	RAW_BASS("Raw bass", 46, 100, ItemID.RAW_BASS),
-	RAW_CATFISH("Raw catfish", 46, 33, ItemID.RAW_CATFISH),
-	LEAPING_TROUT("Leaping trout", 48, 50, ItemID.LEAPING_TROUT),
-	RAW_SWORDFISH("Raw swordfish", 50, 100, ItemID.RAW_SWORDFISH),
-	LEAPING_SALMON("Leaping salmon", 58, 70, ItemID.LEAPING_SALMON),
-	RAW_MONKFISH("Raw monkfish", 62, 120, ItemID.RAW_MONKFISH),
-	RAW_KARAMBWAN("Raw karambwan", 65, 50, ItemID.RAW_KARAMBWAN),
-	LEAPING_STURGEON("Leaping sturgeon", 70, 80, ItemID.LEAPING_STURGEON),
-	RAW_SHARK("Raw shark", 76, 110, ItemID.RAW_SHARK),
-	RAW_SEA_TURTLE("Raw sea turtle", 79, 38, ItemID.RAW_SEA_TURTLE),
-	INFERNAL_EEL("Infernal eel", 80, 95, ItemID.INFERNAL_EEL),
-	RAW_MANTA_RAY("Raw manta ray", 81, 46, ItemID.RAW_MANTA_RAY),
-	RAW_ANGLERFISH("Raw anglerfish", 82, 120, ItemID.RAW_ANGLERFISH),
-	MINNOW("Minnow", 82, 26.5f, ItemID.MINNOW),
-	RAW_DARK_CRAB("Raw dark crab", 85, 130, ItemID.RAW_DARK_CRAB),
-	SACRED_EEL("Sacred eel", 87, 105, ItemID.SACRED_EEL),
+	RAW_SHRIMPS(ItemID.RAW_SHRIMPS, 1, 10),
+	RAW_SARDINE(ItemID.RAW_SARDINE, 5, 20),
+	RAW_KARAMBWANJI(ItemID.RAW_KARAMBWANJI, 5, 5),
+	RAW_GUPPY(ItemID.RAW_GUPPY, 7, 8),
+	RAW_HERRING(ItemID.RAW_HERRING, 10, 30),
+	RAW_ANCHOVIES(ItemID.RAW_ANCHOVIES, 15, 40),
+	RAW_MACKEREL(ItemID.RAW_MACKEREL, 16, 20),
+	RAW_TROUT(ItemID.RAW_TROUT, 20, 50),
+	RAW_CAVEFISH(ItemID.RAW_CAVEFISH, 20, 16),
+	RAW_COD(ItemID.RAW_COD, 23, 45),
+	RAW_PIKE(ItemID.RAW_PIKE, 25, 60),
+	RAW_SLIMY_EEL(ItemID.RAW_SLIMY_EEL, 28, 65),
+	RAW_SALMON(ItemID.RAW_SALMON, 30, 70),
+	RAW_TETRA(ItemID.RAW_TETRA, 33, 24),
+	RAW_TUNA(ItemID.RAW_TUNA, 35, 80),
+	RAW_RAINBOW_FISH(ItemID.RAW_RAINBOW_FISH, 38, 80),
+	RAW_CAVE_EEL(ItemID.RAW_CAVE_EEL, 38, 80),
+	RAW_LOBSTER(ItemID.RAW_LOBSTER, 40, 90),
+	RAW_BASS(ItemID.RAW_BASS, 46, 100),
+	RAW_CATFISH(ItemID.RAW_CATFISH, 46, 33),
+	LEAPING_TROUT(ItemID.LEAPING_TROUT, 48, 50),
+	RAW_SWORDFISH(ItemID.RAW_SWORDFISH, 50, 100),
+	LEAPING_SALMON(ItemID.LEAPING_SALMON, 58, 70),
+	RAW_MONKFISH(ItemID.RAW_MONKFISH, 62, 120),
+	RAW_KARAMBWAN(ItemID.RAW_KARAMBWAN, 65, 50),
+	LEAPING_STURGEON(ItemID.LEAPING_STURGEON, 70, 80),
+	RAW_SHARK(ItemID.RAW_SHARK, 76, 110),
+	RAW_SEA_TURTLE(ItemID.RAW_SEA_TURTLE, 79, 38),
+	INFERNAL_EEL(ItemID.INFERNAL_EEL, 80, 95),
+	RAW_MANTA_RAY(ItemID.RAW_MANTA_RAY, 81, 46),
+	RAW_ANGLERFISH(ItemID.RAW_ANGLERFISH, 82, 120),
+	MINNOW(ItemID.MINNOW, 82, 26.5f),
+	RAW_DARK_CRAB(ItemID.RAW_DARK_CRAB, 85, 130),
+	SACRED_EEL(ItemID.SACRED_EEL, 87, 105),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FletchingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FletchingAction.java
index 7da07f6817..c869ed06a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FletchingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FletchingAction.java
@@ -30,110 +30,109 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum FletchingAction implements SkillAction
+public enum FletchingAction implements ItemSkillAction
 {
-	ARROW_SHAFT("Arrow shaft", 1, 0.33f, ItemID.ARROW_SHAFT),
-	HEADLESS_ARROW("Headless arrow", 1, 1, ItemID.HEADLESS_ARROW),
-	BRONZE_ARROW("Bronze arrow", 1, 1.3f, ItemID.BRONZE_ARROW),
-	OGRE_ARROW("Ogre arrow", 5, 1, ItemID.OGRE_ARROW),
-	SHORTBOW_U("Shortbow (u)", 5, 5, ItemID.SHORTBOW_U),
-	SHORTBOW("Shortbow", 5, 5, ItemID.SHORTBOW),
-	BRONZE_BOLTS("Bronze bolts", 9, 0.5f, ItemID.BRONZE_BOLTS),
-	WOODEN_STOCK("Wooden stock", 9, 6, ItemID.WOODEN_STOCK),
-	BRONZE_CROSSBOW_U("Bronze crossbow (u)", 9, 12, ItemID.BRONZE_CROSSBOW_U),
-	BRONZE_CROSSBOW("Bronze crossbow", 9, 6, ItemID.BRONZE_CROSSBOW),
-	BRONZE_DART("Bronze dart", 10, 1.8f, ItemID.BRONZE_DART),
-	LONGBOW("Longbow", 10, 10, ItemID.LONGBOW),
-	LONGBOW_U("Longbow (u)", 10, 10, ItemID.LONGBOW_U),
-	OPAL_BOLTS("Opal bolts", 11, 1.6f, ItemID.OPAL_BOLTS),
-	IRON_ARROW("Iron arrow", 15, 2.5f, ItemID.IRON_ARROW),
-	OAK_SHORTBOW_U("Oak shortbow (u)", 20, 16.5f, ItemID.OAK_SHORTBOW_U),
-	OAK_SHORTBOW("Oak shortbow", 20, 16.5f, ItemID.OAK_SHORTBOW),
-	IRON_DART("Iron dart", 22, 3.8f, ItemID.IRON_DART),
-	OAK_STOCK("Oak stock", 24, 16, ItemID.OAK_STOCK),
-	BLURITE_CROSSBOW_U("Blurite crossbow (u)", 24, 32, ItemID.BLURITE_CROSSBOW_U),
-	BLURITE_CROSSBOW("Blurite crossbow", 24, 16, ItemID.BLURITE_CROSSBOW),
-	OAK_LONGBOW_U("Oak longbow (u)", 25, 25, ItemID.OAK_LONGBOW_U),
-	OAK_LONGBOW("Oak longbow", 25, 25, ItemID.OAK_LONGBOW),
-	OAK_SHIELD("Oak shield", 27, 50, ItemID.OAK_SHIELD),
-	STEEL_ARROW("Steel arrow", 30, 5, ItemID.STEEL_ARROW),
-	KEBBIT_BOLTS("Kebbit bolts", 32, 1, ItemID.KEBBIT_BOLTS),
-	WILLOW_SHORTBOW_U("Willow shortbow (u)", 35, 33.3f, ItemID.WILLOW_SHORTBOW_U),
-	WILLOW_SHORTBOW("Willow shortbow", 35, 33.3f, ItemID.WILLOW_SHORTBOW),
-	STEEL_DART("Steel dart", 37, 7.5f, ItemID.STEEL_DART),
-	IRON_BOLTS("Iron bolts", 39, 1.5f, ItemID.IRON_BOLTS),
-	WILLOW_STOCK("Willow stock", 39, 22, ItemID.WILLOW_STOCK),
-	IRON_CROSSBOW_U("Iron crossbow (u)", 39, 44, ItemID.IRON_CROSSBOW_U),
-	IRON_CROSSBOW("Iron crossbow", 39, 22, ItemID.IRON_CROSSBOW),
-	WILLOW_LONGBOW_U("Willow longbow (u)", 40, 41.5f, ItemID.WILLOW_LONGBOW_U),
-	WILLOW_LONGBOW("Willow longbow", 40, 41.5f, ItemID.WILLOW_LONGBOW),
-	BATTLESTAFF("Battlestaff", 40, 80, ItemID.BATTLESTAFF),
-	PEARL_BOLTS("Pearl bolts", 41, 3.2f, ItemID.PEARL_BOLTS),
-	WILLOW_SHIELD("Willow shield", 42, 83, ItemID.WILLOW_SHIELD),
-	LONG_KEBBIT_BOLTS("Long kebbit bolts", 42, 1.3f, ItemID.LONG_KEBBIT_BOLTS),
-	SILVER_BOLTS("Silver bolts", 43, 2.5f, ItemID.SILVER_BOLTS),
-	MITHRIL_ARROW("Mithril arrow", 45, 7.5f, ItemID.MITHRIL_ARROW),
-	STEEL_BOLTS("Steel bolts", 46, 3.5f, ItemID.STEEL_BOLTS),
-	TEAK_STOCK("Teak stock", 46, 27, ItemID.TEAK_STOCK),
-	STEEL_CROSSBOW_U("Steel crossbow (u)", 46, 54, ItemID.STEEL_CROSSBOW_U),
-	STEEL_CROSSBOW("Steel crossbow", 46, 27, ItemID.STEEL_CROSSBOW),
-	MAPLE_SHORTBOW_U("Maple shortbow (u)", 50, 50, ItemID.MAPLE_SHORTBOW_U),
-	MAPLE_SHORTBOW("Maple shortbow", 50, 50, ItemID.MAPLE_SHORTBOW),
-	BARBED_BOLTS("Barbed bolts", 51, 9.5f, ItemID.BARBED_BOLTS),
-	MITHRIL_DART("Mithril dart", 52, 11.2f, ItemID.MITHRIL_DART),
-	BROAD_ARROWS("Broad arrows", 52, 10, ItemID.BROAD_ARROWS),
-	TOXIC_BLOWPIPE("Toxic blowpipe", 53, 120, ItemID.TOXIC_BLOWPIPE),
-	MITH_CROSSBOW("Mith crossbow", 54, 32, ItemID.MITHRIL_CROSSBOW),
-	MAPLE_STOCK("Maple stock", 54, 32, ItemID.MAPLE_STOCK),
-	MITHRIL_BOLTS("Mithril bolts", 54, 5, ItemID.MITHRIL_BOLTS),
-	MITHRIL_CROSSBOW_U("Mithril crossbow (u)", 54, 64f, ItemID.MITHRIL_CROSSBOW_U),
-	MAPLE_LONGBOW_U("Maple longbow (u)", 55, 58.3f, ItemID.MAPLE_LONGBOW_U),
-	BROAD_BOLTS("Broad bolts", 55, 3, ItemID.BROAD_BOLTS),
-	MAPLE_LONGBOW("Maple longbow", 55, 58, ItemID.MAPLE_LONGBOW),
-	SAPPHIRE_BOLTS("Sapphire bolts", 56, 4.7f, ItemID.SAPPHIRE_BOLTS),
-	MAPLE_SHIELD("Maple shield", 57, 116.5f, ItemID.MAPLE_SHIELD),
-	EMERALD_BOLTS("Emerald bolts", 58, 5.5f, ItemID.EMERALD_BOLTS),
-	ADAMANT_ARROW("Adamant arrow", 60, 10, ItemID.ADAMANT_ARROW),
-	ADAMANT_BOLTS("Adamant bolts", 61, 7, ItemID.ADAMANT_BOLTS),
-	MAHOGANY_STOCK("Mahogany stock", 61, 41, ItemID.MAHOGANY_STOCK),
-	ADAMANT_CROSSBOW_U("Adamant crossbow (u)", 61, 82, ItemID.ADAMANT_CROSSBOW_U),
-	ADAMANT_CROSSBOW("Adamant crossbow", 61, 41, ItemID.ADAMANT_CROSSBOW),
-	RUBY_BOLTS("Ruby bolts", 63, 6.3f, ItemID.RUBY_BOLTS),
-	DIAMOND_BOLTS("Diamond bolts", 65, 7, ItemID.DIAMOND_BOLTS),
-	YEW_SHORTBOW("Yew shortbow", 65, 67.5f, ItemID.YEW_SHORTBOW),
-	YEW_SHORTBOW_U("Yew shortbow (u)", 65, 67.5f, ItemID.YEW_SHORTBOW_U),
-	ADAMANT_DART("Adamant dart", 67, 15, ItemID.ADAMANT_DART),
-	RUNITE_CROSSBOW_U("Runite crossbow (u)", 69, 100, ItemID.RUNITE_CROSSBOW_U),
-	RUNE_CROSSBOW("Rune crossbow", 69, 50, ItemID.RUNE_CROSSBOW),
-	YEW_STOCK("Yew stock", 69, 50, ItemID.YEW_STOCK),
-	RUNITE_BOLTS("Runite bolts", 69, 10, ItemID.RUNITE_BOLTS),
-	YEW_LONGBOW("Yew longbow", 70, 75, ItemID.YEW_LONGBOW),
-	YEW_LONGBOW_U("Yew longbow (u)", 70, 75, ItemID.YEW_LONGBOW_U),
-	DRAGONSTONE_BOLTS("Dragonstone bolts", 71, 8.2f, ItemID.DRAGONSTONE_BOLTS),
-	YEW_SHIELD("Yew shield", 72, 150, ItemID.YEW_SHIELD),
-	ONYX_BOLTS("Onyx bolts", 73, 9.4f, ItemID.ONYX_BOLTS),
-	RUNE_ARROW("Rune arrow", 75, 12.5f, ItemID.RUNE_ARROW),
-	AMETHYST_BROAD_BOLTS("Amethyst broad bolts", 76, 10.6f, ItemID.AMETHYST_BROAD_BOLTS),
-	MAGIC_STOCK("Magic stock", 78, 70, ItemID.MAGIC_STOCK),
-	DRAGON_CROSSBOW_U("Dragon crossbow (u)", 78, 135, ItemID.DRAGON_CROSSBOW_U),
-	DRAGON_CROSSBOW("Dragon crossbow", 78, 70, ItemID.DRAGON_CROSSBOW),
-	MAGIC_SHORTBOW("Magic shortbow", 80, 83.3f, ItemID.MAGIC_SHORTBOW),
-	MAGIC_SHORTBOW_U("Magic shortbow (u)", 80, 83.3f, ItemID.MAGIC_SHORTBOW_U),
-	RUNE_DART("Rune dart", 81, 18.8f, ItemID.RUNE_DART),
-	AMETHYST_ARROW("Amethyst arrow", 82, 13.5f, ItemID.AMETHYST_ARROW),
-	DRAGON_BOLTS("Dragon bolts", 84, 12, ItemID.DRAGON_BOLTS_UNF),
-	AMETHYST_JAVELIN("Amethyst javelin", 84, 13.5f, ItemID.AMETHYST_JAVELIN),
-	MAGIC_LONGBOW("Magic longbow", 85, 91.5f, ItemID.MAGIC_LONGBOW),
-	MAGIC_LONGBOW_U("Magic longbow (u)", 85, 91.5f, ItemID.MAGIC_LONGBOW_U),
-	MAGIC_SHIELD("Magic shield", 87, 183, ItemID.MAGIC_SHIELD),
-	AMETHYST_DART("Amethyst dart", 90, 21, ItemID.AMETHYST_DART),
-	DRAGON_ARROW("Dragon arrow", 90, 15, ItemID.DRAGON_ARROW),
-	REDWOOD_SHIELD("Redwood shield", 92, 216, ItemID.REDWOOD_SHIELD),
-	DRAGON_DART("Dragon dart", 95, 25, ItemID.DRAGON_DART),
+	ARROW_SHAFT(ItemID.ARROW_SHAFT, 1, 0.33f),
+	HEADLESS_ARROW(ItemID.HEADLESS_ARROW, 1, 1),
+	BRONZE_ARROW(ItemID.BRONZE_ARROW, 1, 1.3f),
+	OGRE_ARROW(ItemID.OGRE_ARROW, 5, 1),
+	SHORTBOW_U(ItemID.SHORTBOW_U, 5, 5),
+	SHORTBOW(ItemID.SHORTBOW, 5, 5),
+	BRONZE_BOLTS(ItemID.BRONZE_BOLTS, 9, 0.5f),
+	WOODEN_STOCK(ItemID.WOODEN_STOCK, 9, 6),
+	BRONZE_CROSSBOW_U(ItemID.BRONZE_CROSSBOW_U, 9, 12),
+	BRONZE_CROSSBOW(ItemID.BRONZE_CROSSBOW, 9, 6),
+	BRONZE_DART(ItemID.BRONZE_DART, 10, 1.8f),
+	LONGBOW(ItemID.LONGBOW, 10, 10),
+	LONGBOW_U(ItemID.LONGBOW_U, 10, 10),
+	OPAL_BOLTS(ItemID.OPAL_BOLTS, 11, 1.6f),
+	IRON_ARROW(ItemID.IRON_ARROW, 15, 2.5f),
+	OAK_SHORTBOW_U(ItemID.OAK_SHORTBOW_U, 20, 16.5f),
+	OAK_SHORTBOW(ItemID.OAK_SHORTBOW, 20, 16.5f),
+	IRON_DART(ItemID.IRON_DART, 22, 3.8f),
+	OAK_STOCK(ItemID.OAK_STOCK, 24, 16),
+	BLURITE_CROSSBOW_U(ItemID.BLURITE_CROSSBOW_U, 24, 32),
+	BLURITE_CROSSBOW(ItemID.BLURITE_CROSSBOW, 24, 16),
+	OAK_LONGBOW_U(ItemID.OAK_LONGBOW_U, 25, 25),
+	OAK_LONGBOW(ItemID.OAK_LONGBOW, 25, 25),
+	OAK_SHIELD(ItemID.OAK_SHIELD, 27, 50),
+	STEEL_ARROW(ItemID.STEEL_ARROW, 30, 5),
+	KEBBIT_BOLTS(ItemID.KEBBIT_BOLTS, 32, 1),
+	WILLOW_SHORTBOW_U(ItemID.WILLOW_SHORTBOW_U, 35, 33.3f),
+	WILLOW_SHORTBOW(ItemID.WILLOW_SHORTBOW, 35, 33.3f),
+	STEEL_DART(ItemID.STEEL_DART, 37, 7.5f),
+	IRON_BOLTS(ItemID.IRON_BOLTS, 39, 1.5f),
+	WILLOW_STOCK(ItemID.WILLOW_STOCK, 39, 22),
+	IRON_CROSSBOW_U(ItemID.IRON_CROSSBOW_U, 39, 44),
+	IRON_CROSSBOW(ItemID.IRON_CROSSBOW, 39, 22),
+	WILLOW_LONGBOW_U(ItemID.WILLOW_LONGBOW_U, 40, 41.5f),
+	WILLOW_LONGBOW(ItemID.WILLOW_LONGBOW, 40, 41.5f),
+	BATTLESTAFF(ItemID.BATTLESTAFF, 40, 80),
+	PEARL_BOLTS(ItemID.PEARL_BOLTS, 41, 3.2f),
+	WILLOW_SHIELD(ItemID.WILLOW_SHIELD, 42, 83),
+	LONG_KEBBIT_BOLTS(ItemID.LONG_KEBBIT_BOLTS, 42, 1.3f),
+	SILVER_BOLTS(ItemID.SILVER_BOLTS, 43, 2.5f),
+	MITHRIL_ARROW(ItemID.MITHRIL_ARROW, 45, 7.5f),
+	STEEL_BOLTS(ItemID.STEEL_BOLTS, 46, 3.5f),
+	TEAK_STOCK(ItemID.TEAK_STOCK, 46, 27),
+	STEEL_CROSSBOW_U(ItemID.STEEL_CROSSBOW_U, 46, 54),
+	STEEL_CROSSBOW(ItemID.STEEL_CROSSBOW, 46, 27),
+	MAPLE_SHORTBOW_U(ItemID.MAPLE_SHORTBOW_U, 50, 50),
+	MAPLE_SHORTBOW(ItemID.MAPLE_SHORTBOW, 50, 50),
+	BARBED_BOLTS(ItemID.BARBED_BOLTS, 51, 9.5f),
+	MITHRIL_DART(ItemID.MITHRIL_DART, 52, 11.2f),
+	BROAD_ARROWS(ItemID.BROAD_ARROWS, 52, 10),
+	TOXIC_BLOWPIPE(ItemID.TOXIC_BLOWPIPE, 53, 120),
+	MITH_CROSSBOW(ItemID.MITHRIL_CROSSBOW, 54, 32),
+	MAPLE_STOCK(ItemID.MAPLE_STOCK, 54, 32),
+	MITHRIL_BOLTS(ItemID.MITHRIL_BOLTS, 54, 5),
+	MITHRIL_CROSSBOW_U(ItemID.MITHRIL_CROSSBOW_U, 54, 64),
+	MAPLE_LONGBOW_U(ItemID.MAPLE_LONGBOW_U, 55, 58.3f),
+	BROAD_BOLTS(ItemID.BROAD_BOLTS, 55, 3),
+	MAPLE_LONGBOW(ItemID.MAPLE_LONGBOW, 55, 58),
+	SAPPHIRE_BOLTS(ItemID.SAPPHIRE_BOLTS, 56, 4.7f),
+	MAPLE_SHIELD(ItemID.MAPLE_SHIELD, 57, 116.5f),
+	EMERALD_BOLTS(ItemID.EMERALD_BOLTS, 58, 5.5f),
+	ADAMANT_ARROW(ItemID.ADAMANT_ARROW, 60, 10),
+	ADAMANT_BOLTS(ItemID.ADAMANT_BOLTS, 61, 7),
+	MAHOGANY_STOCK(ItemID.MAHOGANY_STOCK, 61, 41),
+	ADAMANT_CROSSBOW_U(ItemID.ADAMANT_CROSSBOW_U, 61, 82),
+	ADAMANT_CROSSBOW(ItemID.ADAMANT_CROSSBOW, 61, 41),
+	RUBY_BOLTS(ItemID.RUBY_BOLTS, 63, 6.3f),
+	DIAMOND_BOLTS(ItemID.DIAMOND_BOLTS, 65, 7),
+	YEW_SHORTBOW(ItemID.YEW_SHORTBOW, 65, 67.5f),
+	YEW_SHORTBOW_U(ItemID.YEW_SHORTBOW_U, 65, 67.5f),
+	ADAMANT_DART(ItemID.ADAMANT_DART, 67, 15),
+	RUNITE_CROSSBOW_U(ItemID.RUNITE_CROSSBOW_U, 69, 100),
+	RUNE_CROSSBOW(ItemID.RUNE_CROSSBOW, 69, 50),
+	YEW_STOCK(ItemID.YEW_STOCK, 69, 50),
+	RUNITE_BOLTS(ItemID.RUNITE_BOLTS, 69, 10),
+	YEW_LONGBOW(ItemID.YEW_LONGBOW, 70, 75),
+	YEW_LONGBOW_U(ItemID.YEW_LONGBOW_U, 70, 75),
+	DRAGONSTONE_BOLTS(ItemID.DRAGONSTONE_BOLTS, 71, 8.2f),
+	YEW_SHIELD(ItemID.YEW_SHIELD, 72, 150),
+	ONYX_BOLTS(ItemID.ONYX_BOLTS, 73, 9.4f),
+	RUNE_ARROW(ItemID.RUNE_ARROW, 75, 12.5f),
+	AMETHYST_BROAD_BOLTS(ItemID.AMETHYST_BROAD_BOLTS, 76, 10.6f),
+	MAGIC_STOCK(ItemID.MAGIC_STOCK, 78, 70),
+	DRAGON_CROSSBOW_U(ItemID.DRAGON_CROSSBOW_U, 78, 135),
+	DRAGON_CROSSBOW(ItemID.DRAGON_CROSSBOW, 78, 70),
+	MAGIC_SHORTBOW(ItemID.MAGIC_SHORTBOW, 80, 83.3f),
+	MAGIC_SHORTBOW_U(ItemID.MAGIC_SHORTBOW_U, 80, 83.3f),
+	RUNE_DART(ItemID.RUNE_DART, 81, 18.8f),
+	AMETHYST_ARROW(ItemID.AMETHYST_ARROW, 82, 13.5f),
+	DRAGON_BOLTS(ItemID.DRAGON_BOLTS_UNF, 84, 12),
+	AMETHYST_JAVELIN(ItemID.AMETHYST_JAVELIN, 84, 13.5f),
+	MAGIC_LONGBOW(ItemID.MAGIC_LONGBOW, 85, 91.5f),
+	MAGIC_LONGBOW_U(ItemID.MAGIC_LONGBOW_U, 85, 91.5f),
+	MAGIC_SHIELD(ItemID.MAGIC_SHIELD, 87, 183),
+	AMETHYST_DART(ItemID.AMETHYST_DART, 90, 21),
+	DRAGON_ARROW(ItemID.DRAGON_ARROW, 90, 15),
+	REDWOOD_SHIELD(ItemID.REDWOOD_SHIELD, 92, 216),
+	DRAGON_DART(ItemID.DRAGON_DART, 95, 25),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HerbloreAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HerbloreAction.java
index fc2d5b6c65..805bea57f0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HerbloreAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HerbloreAction.java
@@ -30,84 +30,83 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum HerbloreAction implements SkillAction
+public enum HerbloreAction implements ItemSkillAction
 {
-	ATTACK_POTION_3("Attack potion (3)", 3, 25, ItemID.ATTACK_POTION3),
-	GUAM_LEAF("Guam leaf", 3, 2.5f, ItemID.GUAM_LEAF),
-	MARRENTILL("Marrentill", 5, 3.8f, ItemID.MARRENTILL),
-	ANTIPOISON_3("Antipoison (3)", 5, 37.5f, ItemID.ANTIPOISON3),
-	RELICYMS_BALM_3("Relicym's balm (3)", 8, 40, ItemID.RELICYMS_BALM3),
-	TARROMIN("Tarromin", 11, 5, ItemID.TARROMIN),
-	STRENGTH_POTION_3("Strength potion (3)", 12, 50, ItemID.STRENGTH_POTION3),
-	SERUM_207_3("Serum 207 (3)", 15, 50, ItemID.SERUM_207_3),
-	GUTHIX_REST_3("Guthix rest (3)", 18, 59, ItemID.GUTHIX_REST3),
-	GUAM_TAR("Guam tar", 19, 30, ItemID.GUAM_TAR),
-	HARRALANDER("Harralander", 20, 6.3f, ItemID.HARRALANDER),
-	COMPOST_POTION_3("Compost potion (3)", 22, 60, ItemID.COMPOST_POTION3),
-	RESTORE_POTION_3("Restore potion (3)", 22, 62.5f, ItemID.RESTORE_POTION3),
-	RANARR_WEED("Ranarr weed", 25, 7.5f, ItemID.RANARR_WEED),
-	ENERGY_POTION_3("Energy potion (3)", 26, 67.5f, ItemID.ENERGY_POTION3),
-	TOADFLAX("Toadflax", 30, 8, ItemID.TOADFLAX),
-	DEFENCE_POTION_3("Defence potion (3)", 30, 75, ItemID.DEFENCE_POTION3),
-	MARRENTILL_TAR("Marrentill tar", 31, 42.5f, ItemID.MARRENTILL_TAR),
-	AGILITY_POTION_3("Agility potion (3)", 34, 80, ItemID.AGILITY_POTION3),
-	COMBAT_POTION_3("Combat potion (3)", 36, 84, ItemID.COMBAT_POTION3),
-	PRAYER_POTION_3("Prayer potion (3)", 38, 87.5f, ItemID.PRAYER_POTION3),
-	TARROMIN_TAR("Tarromin tar", 39, 55, ItemID.TARROMIN_TAR),
-	IRIT_LEAF("Irit leaf", 40, 8.8f, ItemID.IRIT_LEAF),
-	HARRALANDER_TAR("Harralander tar", 44, 72.5f, ItemID.HARRALANDER_TAR),
-	SUPER_ATTACK_3("Super attack (3)", 45, 100, ItemID.SUPER_ATTACK3),
-	SUPERANTIPOISON_3("Superantipoison (3)", 48, 106.3f, ItemID.SUPERANTIPOISON3),
-	AVANTOE("Avantoe", 48, 10, ItemID.AVANTOE),
-	FISHING_POTION_3("Fishing potion (3)", 50, 112.5f, ItemID.FISHING_POTION3),
-	SUPER_ENERGY_3("Super energy (3)", 52, 117.5f, ItemID.SUPER_ENERGY3),
-	HUNTER_POTION_3("Hunter potion (3)", 53, 120, ItemID.HUNTER_POTION3),
-	KWUARM("Kwuarm", 54, 11.3f, ItemID.KWUARM),
-	SUPER_STRENGTH_3("Super strength (3)", 55, 125, ItemID.SUPER_STRENGTH3),
-	MAGIC_ESSENCE_POTION_3("Magic essence potion (3)", 57, 130, ItemID.MAGIC_ESSENCE3),
-	SNAPDRAGON("Snapdragon", 59, 11.8f, ItemID.SNAPDRAGON),
-	WEAPON_POISON("Weapon poison", 60, 137.5f, ItemID.WEAPON_POISON),
-	SUPER_RESTORE_3("Super restore (3)", 63, 142.5f, ItemID.SUPER_RESTORE3),
-	CADANTINE("Cadantine", 65, 12.5f, ItemID.CADANTINE),
-	SANFEW_SERUM_3("Sanfew serum (3)", 65, 160, ItemID.SANFEW_SERUM3),
-	SUPER_DEFENCE_3("Super defence (3)", 66, 150, ItemID.SUPER_DEFENCE3),
-	LANTADYME("Lantadyme", 67, 13.1f, ItemID.LANTADYME),
-	ANTIDOTE_PLUS_3("Antidote+ (3)", 68, 155, ItemID.ANTIDOTE3),
-	ANTIFIRE_POTION_3("Antifire potion (3)", 69, 157.5f, ItemID.ANTIFIRE_POTION3),
-	DIVINE_SUPER_ATTACK_POTION_4("Divine super attack potion(4)", 70, 2, ItemID.DIVINE_SUPER_ATTACK_POTION4),
-	DIVINE_SUPER_DEFENCE_POTION_4("Divine super defence potion(4)", 70, 2, ItemID.DIVINE_SUPER_DEFENCE_POTION4),
-	DIVINE_SUPER_STRENGTH_POTION_4("Divine super strength potion(4)", 70, 2, ItemID.DIVINE_SUPER_STRENGTH_POTION4),
-	DWARF_WEED("Dwarf weed", 70, 13.8f, ItemID.DWARF_WEED),
-	RANGING_POTION_3("Ranging potion (3)", 72, 162.5f, ItemID.RANGING_POTION3),
-	WEAPON_POISON_PLUS("Weapon poison (+)", 73, 165, ItemID.WEAPON_POISON_5937),
-	DIVINE_RANGING_POTION_4("Divine ranging potion(4)", 74, 2, ItemID.DIVINE_RANGING_POTION4),
-	TORSTOL("Torstol", 75, 15, ItemID.TORSTOL),
-	MAGIC_POTION_3("Magic potion (3)", 76, 172.5f, ItemID.MAGIC_POTION3),
-	STAMINA_POTION_3("Stamina potion (3)", 77, 76.5f, ItemID.STAMINA_POTION3),
-	STAMINA_POTION_4("Stamina potion (4)", 77, 102, ItemID.STAMINA_POTION4),
-	DIVINE_MAGIC_POTION_4("Divine magic potion(4)", 78, 2, ItemID.DIVINE_MAGIC_POTION4),
-	ZAMORAK_BREW_3("Zamorak brew (3)", 78, 175, ItemID.ZAMORAK_BREW3),
-	ANTIDOTE_PLUS_PLUS_3("Antidote++ (3)", 79, 177.5f, ItemID.ANTIDOTE3_5954),
-	BASTION_POTION_3("Bastion potion (3)", 80, 155, ItemID.BASTION_POTION3),
-	BATTLEMAGE_POTION_3("Battlemage potion (3)", 80, 155, ItemID.BATTLEMAGE_POTION3),
-	SARADOMIN_BREW_3("Saradomin brew (3)", 81, 180, ItemID.SARADOMIN_BREW3),
-	WEAPON_POISON_PLUS_PLUS("Weapon poison (++)", 82, 190, ItemID.WEAPON_POISON_5940),
-	EXTENDED_ANTIFIRE_3("Extended antifire (3)", 84, 82.5f, ItemID.EXTENDED_ANTIFIRE3),
-	EXTENDED_ANTIFIRE_4("Extended antifire (4)", 84, 110, ItemID.EXTENDED_ANTIFIRE4),
-	DIVINE_BASTION_POTION_4("Divine bastion potion(4)", 86, 2, ItemID.DIVINE_BASTION_POTION4),
-	DIVINE_BATTLEMAGE_POTION_4("Divine battlemage potion(4)", 86, 2, ItemID.DIVINE_BATTLEMAGE_POTION4),
-	ANTIVENOM_3("Anti-venom(3)", 87, 90, ItemID.ANTIVENOM3),
-	ANTIVENOM_4("Anti-venom(4)", 87, 120, ItemID.ANTIVENOM4),
-	SUPER_COMBAT_POTION_4("Super combat potion(4)", 90, 150, ItemID.SUPER_COMBAT_POTION4),
-	SUPER_ANTIFIRE_4("Super antifire (4)", 92, 130, ItemID.SUPER_ANTIFIRE_POTION4),
-	ANTIVENOM_PLUS_4("Anti-venom+(4)", 94, 125, ItemID.ANTIVENOM4_12913),
-	DIVINE_SUPER_COMBAT_POTION_4("Divine super combat potion(4)", 97, 2, ItemID.DIVINE_SUPER_COMBAT_POTION4),
-	EXTENDED_SUPER_ANTIFIRE_3("Extended super antifire (3)", 98, 120, ItemID.SUPER_ANTIFIRE_POTION3),
-	EXTENDED_SUPER_ANTIFIRE_4("Extended super antifire (4)", 98, 160, ItemID.SUPER_ANTIFIRE_POTION4),
+	ATTACK_POTION_3(ItemID.ATTACK_POTION3, 3, 25),
+	GUAM_LEAF(ItemID.GUAM_LEAF, 3, 2.5f),
+	MARRENTILL(ItemID.MARRENTILL, 5, 3.8f),
+	ANTIPOISON_3(ItemID.ANTIPOISON3, 5, 37.5f),
+	RELICYMS_BALM_3(ItemID.RELICYMS_BALM3, 8, 40),
+	TARROMIN(ItemID.TARROMIN, 11, 5),
+	STRENGTH_POTION_3(ItemID.STRENGTH_POTION3, 12, 50),
+	SERUM_207_3(ItemID.SERUM_207_3, 15, 50),
+	GUTHIX_REST_3(ItemID.GUTHIX_REST3, 18, 59),
+	GUAM_TAR(ItemID.GUAM_TAR, 19, 30),
+	HARRALANDER(ItemID.HARRALANDER, 20, 6.3f),
+	COMPOST_POTION_3(ItemID.COMPOST_POTION3, 22, 60),
+	RESTORE_POTION_3(ItemID.RESTORE_POTION3, 22, 62.5f),
+	RANARR_WEED(ItemID.RANARR_WEED, 25, 7.5f),
+	ENERGY_POTION_3(ItemID.ENERGY_POTION3, 26, 67.5f),
+	TOADFLAX(ItemID.TOADFLAX, 30, 8),
+	DEFENCE_POTION_3(ItemID.DEFENCE_POTION3, 30, 75),
+	MARRENTILL_TAR(ItemID.MARRENTILL_TAR, 31, 42.5f),
+	AGILITY_POTION_3(ItemID.AGILITY_POTION3, 34, 80),
+	COMBAT_POTION_3(ItemID.COMBAT_POTION3, 36, 84),
+	PRAYER_POTION_3(ItemID.PRAYER_POTION3, 38, 87.5f),
+	TARROMIN_TAR(ItemID.TARROMIN_TAR, 39, 55),
+	IRIT_LEAF(ItemID.IRIT_LEAF, 40, 8.8f),
+	HARRALANDER_TAR(ItemID.HARRALANDER_TAR, 44, 72.5f),
+	SUPER_ATTACK_3(ItemID.SUPER_ATTACK3, 45, 100),
+	SUPERANTIPOISON_3(ItemID.SUPERANTIPOISON3, 48, 106.3f),
+	AVANTOE(ItemID.AVANTOE, 48, 10),
+	FISHING_POTION_3(ItemID.FISHING_POTION3, 50, 112.5f),
+	SUPER_ENERGY_3(ItemID.SUPER_ENERGY3, 52, 117.5f),
+	HUNTER_POTION_3(ItemID.HUNTER_POTION3, 53, 120),
+	KWUARM(ItemID.KWUARM, 54, 11.3f),
+	SUPER_STRENGTH_3(ItemID.SUPER_STRENGTH3, 55, 125),
+	MAGIC_ESSENCE_POTION_3(ItemID.MAGIC_ESSENCE3, 57, 130),
+	SNAPDRAGON(ItemID.SNAPDRAGON, 59, 11.8f),
+	WEAPON_POISON(ItemID.WEAPON_POISON, 60, 137.5f),
+	SUPER_RESTORE_3(ItemID.SUPER_RESTORE3, 63, 142.5f),
+	CADANTINE(ItemID.CADANTINE, 65, 12.5f),
+	SANFEW_SERUM_3(ItemID.SANFEW_SERUM3, 65, 160),
+	SUPER_DEFENCE_3(ItemID.SUPER_DEFENCE3, 66, 150),
+	LANTADYME(ItemID.LANTADYME, 67, 13.1f),
+	ANTIDOTE_PLUS_3(ItemID.ANTIDOTE3, 68, 155),
+	ANTIFIRE_POTION_3(ItemID.ANTIFIRE_POTION3, 69, 157.5f),
+	DIVINE_SUPER_ATTACK_POTION_4(ItemID.DIVINE_SUPER_ATTACK_POTION4, 70, 2),
+	DIVINE_SUPER_DEFENCE_POTION_4(ItemID.DIVINE_SUPER_DEFENCE_POTION4, 70, 2),
+	DIVINE_SUPER_STRENGTH_POTION_4(ItemID.DIVINE_SUPER_STRENGTH_POTION4, 70, 2),
+	DWARF_WEED(ItemID.DWARF_WEED, 70, 13.8f),
+	RANGING_POTION_3(ItemID.RANGING_POTION3, 72, 162.5f),
+	WEAPON_POISON_PLUS(ItemID.WEAPON_POISON_5937, 73, 165),
+	DIVINE_RANGING_POTION_4(ItemID.DIVINE_RANGING_POTION4, 74, 2),
+	TORSTOL(ItemID.TORSTOL, 75, 15),
+	MAGIC_POTION_3(ItemID.MAGIC_POTION3, 76, 172.5f),
+	STAMINA_POTION_3(ItemID.STAMINA_POTION3, 77, 76.5f),
+	STAMINA_POTION_4(ItemID.STAMINA_POTION4, 77, 102),
+	DIVINE_MAGIC_POTION_4(ItemID.DIVINE_MAGIC_POTION4, 78, 2),
+	ZAMORAK_BREW_3(ItemID.ZAMORAK_BREW3, 78, 175),
+	ANTIDOTE_PLUS_PLUS_3(ItemID.ANTIDOTE3_5954, 79, 177.5f),
+	BASTION_POTION_3(ItemID.BASTION_POTION3, 80, 155),
+	BATTLEMAGE_POTION_3(ItemID.BATTLEMAGE_POTION3, 80, 155),
+	SARADOMIN_BREW_3(ItemID.SARADOMIN_BREW3, 81, 180),
+	WEAPON_POISON_PLUS_PLUS(ItemID.WEAPON_POISON_5940, 82, 190),
+	EXTENDED_ANTIFIRE_3(ItemID.EXTENDED_ANTIFIRE3, 84, 82.5f),
+	EXTENDED_ANTIFIRE_4(ItemID.EXTENDED_ANTIFIRE4, 84, 110),
+	DIVINE_BASTION_POTION_4(ItemID.DIVINE_BASTION_POTION4, 86, 2),
+	DIVINE_BATTLEMAGE_POTION_4(ItemID.DIVINE_BATTLEMAGE_POTION4, 86, 2),
+	ANTIVENOM_3(ItemID.ANTIVENOM3, 87, 90),
+	ANTIVENOM_4(ItemID.ANTIVENOM4, 87, 120),
+	SUPER_COMBAT_POTION_4(ItemID.SUPER_COMBAT_POTION4, 90, 150),
+	SUPER_ANTIFIRE_4(ItemID.SUPER_ANTIFIRE_POTION4, 92, 130),
+	ANTIVENOM_PLUS_4(ItemID.ANTIVENOM4_12913, 94, 125),
+	DIVINE_SUPER_COMBAT_POTION_4(ItemID.DIVINE_SUPER_COMBAT_POTION4, 97, 2),
+	EXTENDED_SUPER_ANTIFIRE_3(ItemID.SUPER_ANTIFIRE_POTION3, 98, 120),
+	EXTENDED_SUPER_ANTIFIRE_4(ItemID.SUPER_ANTIFIRE_POTION4, 98, 160),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java
index 01ed388c80..644bcd2598 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum HunterAction implements SkillAction
+public enum HunterAction implements NamedSkillAction
 {
 	CRIMSON_SWIFT("Crimson Swift", 1, 34, ItemID.CRIMSON_SWIFT),
 	POLAR_KEBBIT("Polar Kebbit", 1, 30, ItemID.KEBBIT),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ItemSkillAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ItemSkillAction.java
new file mode 100644
index 0000000000..61a148749a
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ItemSkillAction.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021, Jordan Atwood <nightfirecat@protonmail.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.plugins.skillcalculator.skills;
+
+import net.runelite.client.game.ItemManager;
+
+/**
+ * An object representing a single skill action involving an item which grants some xp.
+ */
+public interface ItemSkillAction extends SkillAction
+{
+	/**
+	 * Gets the item ID used for this action.
+	 *
+	 * @return The item ID used for this action.
+	 * @see net.runelite.api.ItemID
+	 */
+	int getItemId();
+
+	/**
+	 * Gets the item icon ID for this skill action.
+	 *
+	 * @return The item icon ID of this skill action.
+	 * @see net.runelite.api.ItemID
+	 * @see #getItemId()
+	 */
+	@Override
+	default int getIcon()
+	{
+		return getItemId();
+	}
+
+	/**
+	 * Gets the name of this skill action's associated item.
+	 *
+	 * @param itemManager An {@link ItemManager item manager} instance.
+	 * @return The name of this skill action item.
+	 * @see #getItemId()
+	 */
+	@Override
+	default String getName(final ItemManager itemManager)
+	{
+		return itemManager.getItemComposition(getItemId()).getName();
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MagicAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MagicAction.java
index bb3b5a20ff..e907ebb48a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MagicAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MagicAction.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.skills;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.SpriteID;
+import net.runelite.client.game.ItemManager;
 
 @AllArgsConstructor
 @Getter
@@ -218,4 +219,10 @@ public enum MagicAction implements SkillAction
 	private final int level;
 	private final float xp;
 	private final int sprite;
+
+	@Override
+	public String getName(final ItemManager itemManager)
+	{
+		return getName();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MiningAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MiningAction.java
index cdbcdb74cf..e16b0cd6c2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MiningAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/MiningAction.java
@@ -31,7 +31,7 @@ import net.runelite.api.NullItemID;
 
 @AllArgsConstructor
 @Getter
-public enum MiningAction implements SkillAction
+public enum MiningAction implements NamedSkillAction
 {
 	CLAY("Clay", 1, 5, ItemID.CLAY),
 	RUNE_ESSENCE("Rune essence", 1, 5, ItemID.RUNE_ESSENCE),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/NamedSkillAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/NamedSkillAction.java
new file mode 100644
index 0000000000..b551474bc9
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/NamedSkillAction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021, Jordan Atwood <nightfirecat@protonmail.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.plugins.skillcalculator.skills;
+
+import net.runelite.client.game.ItemManager;
+
+/**
+ * An object representing a single skill action which grants some xp, with an explicitly defined name field.
+ */
+public interface NamedSkillAction extends SkillAction
+{
+	/**
+	 * Gets the name of this skill action, usually the item or object created, or the spell cast.
+	 *
+	 * @return The name of this skill action.
+	 */
+	String getName();
+
+	@Override
+	default String getName(ItemManager itemManager)
+	{
+		return getName();
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/PrayerAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/PrayerAction.java
index 0995027103..ba4c1fa48e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/PrayerAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/PrayerAction.java
@@ -30,71 +30,70 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum PrayerAction implements SkillAction
+public enum PrayerAction implements ItemSkillAction
 {
-	ENSOULED_GOBLIN_HEAD("Ensouled goblin head", 1, 130, ItemID.ENSOULED_GOBLIN_HEAD, true),
-	ENSOULED_MONKEY_HEAD("Ensouled monkey head", 1, 182, ItemID.ENSOULED_MONKEY_HEAD, true),
-	ENSOULED_IMP_HEAD("Ensouled imp head", 1, 286, ItemID.ENSOULED_IMP_HEAD, true),
-	ENSOULED_MINOTAUR_HEAD("Ensouled minotaur head", 1, 364, ItemID.ENSOULED_MINOTAUR_HEAD, true),
-	ENSOULED_SCORPION_HEAD("Ensouled scorpion head", 1, 454, ItemID.ENSOULED_SCORPION_HEAD, true),
-	ENSOULED_BEAR_HEAD("Ensouled bear head", 1, 480, ItemID.ENSOULED_BEAR_HEAD, true),
-	ENSOULED_UNICORN_HEAD("Ensouled unicorn head", 1, 494, ItemID.ENSOULED_UNICORN_HEAD, true),
-	ENSOULED_DOG_HEAD("Ensouled dog head", 1, 520, ItemID.ENSOULED_DOG_HEAD, true),
-	ENSOULED_CHAOS_DRUID_HEAD("Ensouled chaos druid head", 1, 584, ItemID.ENSOULED_CHAOS_DRUID_HEAD, true),
-	ENSOULED_GIANT_HEAD("Ensouled giant head", 1, 650, ItemID.ENSOULED_GIANT_HEAD, true),
-	ENSOULED_OGRE_HEAD("Ensouled ogre head", 1, 716, ItemID.ENSOULED_OGRE_HEAD, true),
-	ENSOULED_ELF_HEAD("Ensouled elf head", 1, 754, ItemID.ENSOULED_ELF_HEAD, true),
-	ENSOULED_TROLL_HEAD("Ensouled troll head", 1, 780, ItemID.ENSOULED_TROLL_HEAD, true),
-	ENSOULED_HORROR_HEAD("Ensouled horror head", 1, 832, ItemID.ENSOULED_HORROR_HEAD, true),
-	ENSOULED_KALPHITE_HEAD("Ensouled kalphite head", 1, 884, ItemID.ENSOULED_KALPHITE_HEAD, true),
-	ENSOULED_DAGANNOTH_HEAD("Ensouled dagannoth head", 1, 936, ItemID.ENSOULED_DAGANNOTH_HEAD, true),
-	ENSOULED_BLOODVELD_HEAD("Ensouled bloodveld head", 1, 1040, ItemID.ENSOULED_BLOODVELD_HEAD, true),
-	ENSOULED_TZHAAR_HEAD("Ensouled tzhaar head", 1, 1104, ItemID.ENSOULED_TZHAAR_HEAD, true),
-	ENSOULED_DEMON_HEAD("Ensouled demon head", 1, 1170, ItemID.ENSOULED_DEMON_HEAD, true),
-	ENSOULED_AVIANSIE_HEAD("Ensouled aviansie head", 1, 1234, ItemID.ENSOULED_AVIANSIE_HEAD, true),
-	ENSOULED_ABYSSAL_HEAD("Ensouled abyssal head", 1, 1300, ItemID.ENSOULED_ABYSSAL_HEAD, true),
-	ENSOULED_DRAGON_HEAD("Ensouled dragon head", 1, 1560, ItemID.ENSOULED_DRAGON_HEAD, true),
-	FIENDISH_ASHES("Fiendish ashes", 1, 10, ItemID.FIENDISH_ASHES, true),
-	VILE_ASHES("Vile ashes", 1, 25, ItemID.VILE_ASHES, true),
-	MALICIOUS_ASHES("Malicious ashes", 1, 65, ItemID.MALICIOUS_ASHES, true),
-	ABYSSAL_ASHES("Abyssal ashes", 1, 85, ItemID.ABYSSAL_ASHES, true),
-	INFERNAL_ASHES("Infernal ashes", 1, 110, ItemID.INFERNAL_ASHES, true),
-	BONES("Bones", 1, 4.5f, ItemID.BONES, false),
-	WOLF_BONES("Wolf bones", 1, 4.5f, ItemID.WOLF_BONES, false),
-	LOAR_REMAINS("Loar remains", 1, 33, ItemID.LOAR_REMAINS, false),
-	BURNT_BONES("Burnt bones", 1, 4.5f, ItemID.BURNT_BONES, false),
-	MONKEY_BONES("Monkey bones", 1, 5, ItemID.MONKEY_BONES, false),
-	BAT_BONES("Bat bones", 1, 5.3f, ItemID.BAT_BONES, false),
-	JOGRE_BONES("Jogre bones", 1, 15, ItemID.JOGRE_BONES, false),
-	BIG_BONES("Big bones", 1, 15, ItemID.BIG_BONES, false),
-	ZOGRE_BONES("Zogre bones", 1, 22.5f, ItemID.ZOGRE_BONES, false),
-	SHAIKAHAN_BONES("Shaikahan bones", 1, 25, ItemID.SHAIKAHAN_BONES, false),
-	BABYDRAGON_BONES("Babydragon bones", 1, 30, ItemID.BABYDRAGON_BONES, false),
-	PHRIN_REMAINS("Phrin remains", 1, 46.5f, ItemID.PHRIN_REMAINS, false),
-	WYRM_BONES("Wyrm bones", 1, 50, ItemID.WYRM_BONES, false),
-	RIYL_REMAINS("Riyl remains", 1, 59.5f, ItemID.RIYL_REMAINS, false),
-	WYVERN_BONES("Wyvern bones", 1, 72, ItemID.WYVERN_BONES, false),
-	DRAGON_BONES("Dragon bones", 1, 72, ItemID.DRAGON_BONES, false),
-	DRAKE_BONES("Drake bones", 1, 80, ItemID.DRAKE_BONES, false),
-	ASYN_REMAINS("Asyn remains", 1, 82.5f, ItemID.ASYN_REMAINS, false),
-	FAYRG_BONES("Fayrg bones", 1, 84, ItemID.FAYRG_BONES, false),
-	FIYR_REMAINS("Fiyr remains", 1, 84, ItemID.FIYR_REMAINS, false),
-	LAVA_DRAGON_BONES("Lava dragon bones", 1, 85, ItemID.LAVA_DRAGON_BONES, false),
-	RAURG_BONES("Raurg bones", 1, 96, ItemID.RAURG_BONES, false),
-	HYDRA_BONES("Hydra bones", 1, 110, ItemID.HYDRA_BONES, false),
-	DAGANNOTH_BONES("Dagannoth bones", 1, 125, ItemID.DAGANNOTH_BONES, false),
-	OURG_BONES("Ourg bones", 1, 140, ItemID.OURG_BONES, false),
-	URIUM_REMAINS("Urium remains", 1, 120, ItemID.URIUM_REMAINS, false),
-	GUPPY("Guppy", 1, 4, ItemID.GUPPY, false),
-	CAVEFISH("Cavefish", 1, 7, ItemID.CAVEFISH, false),
-	TETRA("Tetra", 1, 10, ItemID.TETRA, false),
-	CATFISH("Catfish", 1, 16, ItemID.CATFISH, false),
-	SUPERIOR_DRAGON_BONES("Superior dragon bones", 70, 150, ItemID.SUPERIOR_DRAGON_BONES, false),
+	ENSOULED_GOBLIN_HEAD(ItemID.ENSOULED_GOBLIN_HEAD, 1, 130, true),
+	ENSOULED_MONKEY_HEAD(ItemID.ENSOULED_MONKEY_HEAD, 1, 182, true),
+	ENSOULED_IMP_HEAD(ItemID.ENSOULED_IMP_HEAD, 1, 286, true),
+	ENSOULED_MINOTAUR_HEAD(ItemID.ENSOULED_MINOTAUR_HEAD, 1, 364, true),
+	ENSOULED_SCORPION_HEAD(ItemID.ENSOULED_SCORPION_HEAD, 1, 454, true),
+	ENSOULED_BEAR_HEAD(ItemID.ENSOULED_BEAR_HEAD, 1, 480, true),
+	ENSOULED_UNICORN_HEAD(ItemID.ENSOULED_UNICORN_HEAD, 1, 494, true),
+	ENSOULED_DOG_HEAD(ItemID.ENSOULED_DOG_HEAD, 1, 520, true),
+	ENSOULED_CHAOS_DRUID_HEAD(ItemID.ENSOULED_CHAOS_DRUID_HEAD, 1, 584, true),
+	ENSOULED_GIANT_HEAD(ItemID.ENSOULED_GIANT_HEAD, 1, 650, true),
+	ENSOULED_OGRE_HEAD(ItemID.ENSOULED_OGRE_HEAD, 1, 716, true),
+	ENSOULED_ELF_HEAD(ItemID.ENSOULED_ELF_HEAD, 1, 754, true),
+	ENSOULED_TROLL_HEAD(ItemID.ENSOULED_TROLL_HEAD, 1, 780, true),
+	ENSOULED_HORROR_HEAD(ItemID.ENSOULED_HORROR_HEAD, 1, 832, true),
+	ENSOULED_KALPHITE_HEAD(ItemID.ENSOULED_KALPHITE_HEAD, 1, 884, true),
+	ENSOULED_DAGANNOTH_HEAD(ItemID.ENSOULED_DAGANNOTH_HEAD, 1, 936, true),
+	ENSOULED_BLOODVELD_HEAD(ItemID.ENSOULED_BLOODVELD_HEAD, 1, 1040, true),
+	ENSOULED_TZHAAR_HEAD(ItemID.ENSOULED_TZHAAR_HEAD, 1, 1104, true),
+	ENSOULED_DEMON_HEAD(ItemID.ENSOULED_DEMON_HEAD, 1, 1170, true),
+	ENSOULED_AVIANSIE_HEAD(ItemID.ENSOULED_AVIANSIE_HEAD, 1, 1234, true),
+	ENSOULED_ABYSSAL_HEAD(ItemID.ENSOULED_ABYSSAL_HEAD, 1, 1300, true),
+	ENSOULED_DRAGON_HEAD(ItemID.ENSOULED_DRAGON_HEAD, 1, 1560, true),
+	FIENDISH_ASHES(ItemID.FIENDISH_ASHES, 1, 10, true),
+	VILE_ASHES(ItemID.VILE_ASHES, 1, 25, true),
+	MALICIOUS_ASHES(ItemID.MALICIOUS_ASHES, 1, 65, true),
+	ABYSSAL_ASHES(ItemID.ABYSSAL_ASHES, 1, 85, true),
+	INFERNAL_ASHES(ItemID.INFERNAL_ASHES, 1, 110, true),
+	BONES(ItemID.BONES, 1, 4.5f, false),
+	WOLF_BONES(ItemID.WOLF_BONES, 1, 4.5f, false),
+	LOAR_REMAINS(ItemID.LOAR_REMAINS, 1, 33, false),
+	BURNT_BONES(ItemID.BURNT_BONES, 1, 4.5f, false),
+	MONKEY_BONES(ItemID.MONKEY_BONES, 1, 5, false),
+	BAT_BONES(ItemID.BAT_BONES, 1, 5.3f, false),
+	JOGRE_BONES(ItemID.JOGRE_BONES, 1, 15, false),
+	BIG_BONES(ItemID.BIG_BONES, 1, 15, false),
+	ZOGRE_BONES(ItemID.ZOGRE_BONES, 1, 22.5f, false),
+	SHAIKAHAN_BONES(ItemID.SHAIKAHAN_BONES, 1, 25, false),
+	BABYDRAGON_BONES(ItemID.BABYDRAGON_BONES, 1, 30, false),
+	PHRIN_REMAINS(ItemID.PHRIN_REMAINS, 1, 46.5f, false),
+	WYRM_BONES(ItemID.WYRM_BONES, 1, 50, false),
+	RIYL_REMAINS(ItemID.RIYL_REMAINS, 1, 59.5f, false),
+	WYVERN_BONES(ItemID.WYVERN_BONES, 1, 72, false),
+	DRAGON_BONES(ItemID.DRAGON_BONES, 1, 72, false),
+	DRAKE_BONES(ItemID.DRAKE_BONES, 1, 80, false),
+	ASYN_REMAINS(ItemID.ASYN_REMAINS, 1, 82.5f, false),
+	FAYRG_BONES(ItemID.FAYRG_BONES, 1, 84, false),
+	FIYR_REMAINS(ItemID.FIYR_REMAINS, 1, 84, false),
+	LAVA_DRAGON_BONES(ItemID.LAVA_DRAGON_BONES, 1, 85, false),
+	RAURG_BONES(ItemID.RAURG_BONES, 1, 96, false),
+	HYDRA_BONES(ItemID.HYDRA_BONES, 1, 110, false),
+	DAGANNOTH_BONES(ItemID.DAGANNOTH_BONES, 1, 125, false),
+	OURG_BONES(ItemID.OURG_BONES, 1, 140, false),
+	URIUM_REMAINS(ItemID.URIUM_REMAINS, 1, 120, false),
+	GUPPY(ItemID.GUPPY, 1, 4, false),
+	CAVEFISH(ItemID.CAVEFISH, 1, 7, false),
+	TETRA(ItemID.TETRA, 1, 10, false),
+	CATFISH(ItemID.CATFISH, 1, 16, false),
+	SUPERIOR_DRAGON_BONES(ItemID.SUPERIOR_DRAGON_BONES, 70, 150, false),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 	private final boolean ignoreBonus;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/RunecraftAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/RunecraftAction.java
index d6eda355db..b779822207 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/RunecraftAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/RunecraftAction.java
@@ -30,49 +30,48 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum RunecraftAction implements SkillAction
+public enum RunecraftAction implements ItemSkillAction
 {
-	AIR_TIARA("Air tiara", 1, 25, ItemID.AIR_TIARA, true),
-	MIND_TIARA("Mind tiara", 1, 27.5f, ItemID.MIND_TIARA, true),
-	WATER_TIARA("Water tiara", 1, 30, ItemID.WATER_TIARA, true),
-	EARTH_TIARA("Earth tiara", 1, 32.5f, ItemID.EARTH_TIARA, true),
-	FIRE_TIARA("Fire tiara", 1, 35, ItemID.FIRE_TIARA, true),
-	BODY_TIARA("Body tiara", 1, 37.5f, ItemID.BODY_TIARA, true),
-	COSMIC_TIARA("Cosmic tiara", 1, 40, ItemID.COSMIC_TIARA, true),
-	CHAOS_TIARA("Chaos tiara", 1, 42.5f, ItemID.CHAOS_TIARA, true),
-	NATURE_TIARA("Nature tiara", 1, 45, ItemID.NATURE_TIARA, true),
-	LAW_TIARA("Law tiara", 1, 47.5f, ItemID.LAW_TIARA, true),
-	DEATH_TIARA("Death tiara", 1, 50, ItemID.DEATH_TIARA, true),
-	WRATH_TIARA("Wrath tiara", 1, 52.5f, ItemID.WRATH_TIARA, true),
-	AIR_RUNE("Air rune", 1, 5, ItemID.AIR_RUNE, false),
-	MIND_RUNE("Mind rune", 2, 5.5f, ItemID.MIND_RUNE, false),
-	MIND_CORE("Mind core", 2, 55, ItemID.MIND_CORE, false),
-	WATER_RUNE("Water rune", 5, 6, ItemID.WATER_RUNE, false),
-	MIST_RUNE("Mist rune", 6, 8.5f, ItemID.MIST_RUNE, false),
-	EARTH_RUNE("Earth rune", 9, 6.5f, ItemID.EARTH_RUNE, false),
-	DUST_RUNE("Dust rune", 10, 9, ItemID.DUST_RUNE, false),
-	MUD_RUNE("Mud rune", 13, 9.5f, ItemID.MUD_RUNE, false),
-	FIRE_RUNE("Fire rune", 14, 7, ItemID.FIRE_RUNE, false),
-	SMOKE_RUNE("Smoke rune", 15, 9.5f, ItemID.SMOKE_RUNE, false),
-	STEAM_RUNE("Steam rune", 19, 10, ItemID.STEAM_RUNE, false),
-	BODY_RUNE("Body rune", 20, 7.5f, ItemID.BODY_RUNE, false),
-	BODY_CORE("Body core", 20, 75, ItemID.BODY_CORE, false),
-	LAVA_RUNE("Lava rune", 23, 10.5f, ItemID.LAVA_RUNE, false),
-	COSMIC_RUNE("Cosmic rune", 27, 8, ItemID.COSMIC_RUNE, false),
-	CHAOS_RUNE("Chaos rune", 35, 8.5f, ItemID.CHAOS_RUNE, false),
-	CHAOS_CORE("Chaos core", 35, 85, ItemID.CHAOS_CORE, false),
-	ASTRAL_RUNE("Astral rune", 40, 8.7f, ItemID.ASTRAL_RUNE, false),
-	NATURE_RUNE("Nature rune", 44, 9, ItemID.NATURE_RUNE, false),
-	LAW_RUNE("Law rune", 54, 9.5f, ItemID.LAW_RUNE, false),
-	DEATH_RUNE("Death rune", 65, 10, ItemID.DEATH_RUNE, false),
-	BLOOD_RUNE("Blood rune", 77, 24.425f, ItemID.BLOOD_RUNE, true),
-	SOUL_RUNE("Soul rune", 90, 30.325f, ItemID.SOUL_RUNE, true),
-	WRATH_RUNE("Wrath rune", 95, 8, ItemID.WRATH_RUNE, false),
+	AIR_TIARA(ItemID.AIR_TIARA, 1, 25, true),
+	MIND_TIARA(ItemID.MIND_TIARA, 1, 27.5f, true),
+	WATER_TIARA(ItemID.WATER_TIARA, 1, 30, true),
+	EARTH_TIARA(ItemID.EARTH_TIARA, 1, 32.5f, true),
+	FIRE_TIARA(ItemID.FIRE_TIARA, 1, 35, true),
+	BODY_TIARA(ItemID.BODY_TIARA, 1, 37.5f, true),
+	COSMIC_TIARA(ItemID.COSMIC_TIARA, 1, 40, true),
+	CHAOS_TIARA(ItemID.CHAOS_TIARA, 1, 42.5f, true),
+	NATURE_TIARA(ItemID.NATURE_TIARA, 1, 45, true),
+	LAW_TIARA(ItemID.LAW_TIARA, 1, 47.5f, true),
+	DEATH_TIARA(ItemID.DEATH_TIARA, 1, 50, true),
+	WRATH_TIARA(ItemID.WRATH_TIARA, 1, 52.5f, true),
+	AIR_RUNE(ItemID.AIR_RUNE, 1, 5, false),
+	MIND_RUNE(ItemID.MIND_RUNE, 2, 5.5f, false),
+	MIND_CORE(ItemID.MIND_CORE, 2, 55, false),
+	WATER_RUNE(ItemID.WATER_RUNE, 5, 6, false),
+	MIST_RUNE(ItemID.MIST_RUNE, 6, 8.5f, false),
+	EARTH_RUNE(ItemID.EARTH_RUNE, 9, 6.5f, false),
+	DUST_RUNE(ItemID.DUST_RUNE, 10, 9, false),
+	MUD_RUNE(ItemID.MUD_RUNE, 13, 9.5f, false),
+	FIRE_RUNE(ItemID.FIRE_RUNE, 14, 7, false),
+	SMOKE_RUNE(ItemID.SMOKE_RUNE, 15, 9.5f, false),
+	STEAM_RUNE(ItemID.STEAM_RUNE, 19, 10, false),
+	BODY_RUNE(ItemID.BODY_RUNE, 20, 7.5f, false),
+	BODY_CORE(ItemID.BODY_CORE, 20, 75, false),
+	LAVA_RUNE(ItemID.LAVA_RUNE, 23, 10.5f, false),
+	COSMIC_RUNE(ItemID.COSMIC_RUNE, 27, 8, false),
+	CHAOS_RUNE(ItemID.CHAOS_RUNE, 35, 8.5f, false),
+	CHAOS_CORE(ItemID.CHAOS_CORE, 35, 85, false),
+	ASTRAL_RUNE(ItemID.ASTRAL_RUNE, 40, 8.7f, false),
+	NATURE_RUNE(ItemID.NATURE_RUNE, 44, 9, false),
+	LAW_RUNE(ItemID.LAW_RUNE, 54, 9.5f, false),
+	DEATH_RUNE(ItemID.DEATH_RUNE, 65, 10, false),
+	BLOOD_RUNE(ItemID.BLOOD_RUNE, 77, 24.425f, true),
+	SOUL_RUNE(ItemID.SOUL_RUNE, 90, 30.325f, true),
+	WRATH_RUNE(ItemID.WRATH_RUNE, 95, 8, false),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 	private final boolean ignoreBonus;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SkillAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SkillAction.java
index 9f6153678a..f7b739457c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SkillAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SkillAction.java
@@ -24,17 +24,22 @@
  */
 package net.runelite.client.plugins.skillcalculator.skills;
 
+import net.runelite.api.ItemComposition;
+import net.runelite.client.game.ItemManager;
+
 /**
  * An object representing a single skill action which grants some xp.
  */
 public interface SkillAction
 {
 	/**
-	 * Gets the name of this skill action, usually the item or object created, or the spell cast.
+	 * Gets the name of this skill action, usually the item or object created, or the spell cast. This name may be
+	 * fetched via {@link ItemComposition#getName()} from some defined item ID or explicitly defined.
 	 *
+	 * @param itemManager An {@link ItemManager item manager} instance.
 	 * @return The name of this skill action.
 	 */
-	String getName();
+	String getName(final ItemManager itemManager);
 
 	/**
 	 * Gets the level required to perform this skill action.
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java
index 8e32705cd1..f4211febb9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java
@@ -30,193 +30,192 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum SmithingAction implements SkillAction
+public enum SmithingAction implements ItemSkillAction
 {
-	BRONZE_BAR("Bronze bar", 1, 6.3f, ItemID.BRONZE_BAR),
-	BRONZE_AXE("Bronze axe", 1, 12.5f, ItemID.BRONZE_AXE),
-	BRONZE_DAGGER("Bronze dagger", 1, 12.5f, ItemID.BRONZE_DAGGER),
-	BRONZE_MACE("Bronze mace", 2, 12.5f, ItemID.BRONZE_MACE),
-	BRONZE_MED_HELM("Bronze med helm", 3, 12.5f, ItemID.BRONZE_MED_HELM),
-	BRONZE_BOLTS_UNF("Bronze bolts (unf)", 3, 12.5f, ItemID.BRONZE_BOLTS_UNF),
-	BRONZE_NAILS("Bronze nails", 4, 12.5f, ItemID.BRONZE_NAILS),
-	BRONZE_SWORD("Bronze sword", 4, 12.5f, ItemID.BRONZE_SWORD),
-	BRONZE_WIRE("Bronze wire", 4, 12.5f, ItemID.BRONZE_WIRE),
-	BRONZE_DART_TIP("Bronze dart tip", 4, 12.5f, ItemID.BRONZE_DART_TIP),
-	BRONZE_ARROWTIPS("Bronze arrowtips", 5, 12.5f, ItemID.BRONZE_ARROWTIPS),
-	BRONZE_SCIMITAR("Bronze scimitar", 5, 25, ItemID.BRONZE_SCIMITAR),
-	BRONZE_HASTA("Bronze hasta", 5, 25, ItemID.BRONZE_HASTA),
-	BRONZE_SPEAR("Bronze spear", 5, 25, ItemID.BRONZE_SPEAR),
-	BRONZE_JAVELIN_HEADS("Bronze javelin heads", 6, 12.5f, ItemID.BRONZE_JAVELIN_HEADS),
-	BRONZE_LONGSWORD("Bronze longsword", 6, 25, ItemID.BRONZE_LONGSWORD),
-	BRONZE_LIMBS("Bronze limbs", 6, 12.5f, ItemID.BRONZE_LIMBS),
-	BRONZE_KNIFE("Bronze knife", 7, 12.5f, ItemID.BRONZE_KNIFE),
-	BRONZE_FULL_HELM("Bronze full helm", 7, 25, ItemID.BRONZE_FULL_HELM),
-	BRONZE_SQ_SHIELD("Bronze sq shield", 8, 25, ItemID.BRONZE_SQ_SHIELD),
-	BRONZE_WARHAMMER("Bronze warhammer", 9, 37.5f, ItemID.BRONZE_WARHAMMER),
-	BRONZE_BATTLEAXE("Bronze battleaxe", 10, 37.5f, ItemID.BRONZE_BATTLEAXE),
-	BRONZE_CHAINBODY("Bronze chainbody", 11, 37.5f, ItemID.BRONZE_CHAINBODY),
-	BRONZE_KITESHIELD("Bronze kiteshield", 12, 37.5f, ItemID.BRONZE_KITESHIELD),
-	BRONZE_CLAWS("Bronze claws", 13, 25, ItemID.BRONZE_CLAWS),
-	BRONZE_2H_SWORD("Bronze 2h sword", 14, 37.5f, ItemID.BRONZE_2H_SWORD),
-	BARRONITE_DEPOSITS("Barronite deposits", 14, 30, ItemID.BARRONITE_DEPOSIT),
-	IRON_BAR("Iron bar", 15, 12.5f, ItemID.IRON_BAR),
-	IRON_DAGGER("Iron dagger", 15, 25, ItemID.IRON_DAGGER),
-	IRON_AXE("Iron axe", 16, 25, ItemID.IRON_AXE),
-	BRONZE_PLATELEGS("Bronze platelegs", 16, 37.5f, ItemID.BRONZE_PLATELEGS),
-	BRONZE_PLATESKIRT("Bronze plateskirt", 16, 37.5f, ItemID.BRONZE_PLATESKIRT),
-	IRON_SPIT("Iron spit", 17, 25, ItemID.IRON_SPIT),
-	IRON_MACE("Iron mace", 17, 25, ItemID.IRON_MACE),
-	IRON_BOLTS_UNF("Iron bolts (unf)", 18, 25, ItemID.IRON_BOLTS_UNF),
-	BRONZE_PLATEBODY("Bronze platebody", 18, 62.5f, ItemID.BRONZE_PLATEBODY),
-	IRON_MED_HELM("Iron med helm", 18, 25, ItemID.IRON_MED_HELM),
-	IRON_NAILS("Iron nails", 19, 25, ItemID.IRON_NAILS),
-	IRON_DART_TIP("Iron dart tip", 19, 25, ItemID.IRON_DART_TIP),
-	IRON_SWORD("Iron sword", 19, 25, ItemID.IRON_SWORD),
-	SILVER_BAR("Silver bar", 20, 13.7f, ItemID.SILVER_BAR),
-	IRON_ARROWTIPS("Iron arrowtips", 20, 25, ItemID.IRON_ARROWTIPS),
-	IRON_SCIMITAR("Iron scimitar", 20, 50, ItemID.IRON_SCIMITAR),
-	IRON_HASTA("Iron hasta", 20, 50, ItemID.IRON_HASTA),
-	IRON_SPEAR("Iron spear", 20, 50, ItemID.IRON_SPEAR),
-	IRON_LONGSWORD("Iron longsword", 21, 50, ItemID.IRON_LONGSWORD),
-	IRON_JAVELIN_HEADS("Iron javelin heads", 21, 25, ItemID.IRON_JAVELIN_HEADS),
-	IRON_FULL_HELM("Iron full helm", 22, 50, ItemID.IRON_FULL_HELM),
-	IRON_KNIFE("Iron knife", 22, 25, ItemID.IRON_KNIFE),
-	IRON_LIMBS("Iron limbs", 23, 25, ItemID.IRON_LIMBS),
-	IRON_SQ_SHIELD("Iron sq shield", 23, 50, ItemID.IRON_SQ_SHIELD),
-	IRON_WARHAMMER("Iron warhammer", 24, 75, ItemID.IRON_WARHAMMER),
-	IRON_BATTLEAXE("Iron battleaxe", 25, 75, ItemID.IRON_BATTLEAXE),
-	OIL_LANTERN_FRAME("Oil lantern frame", 26, 25, ItemID.OIL_LANTERN_FRAME),
-	IRON_CHAINBODY("Iron chainbody", 26, 75, ItemID.IRON_CHAINBODY),
-	IRON_KITESHIELD("Iron kiteshield", 27, 75, ItemID.IRON_KITESHIELD),
-	IRON_CLAWS("Iron claws", 28, 50, ItemID.IRON_CLAWS),
-	IRON_2H_SWORD("Iron 2h sword", 29, 75, ItemID.IRON_2H_SWORD),
-	STEEL_DAGGER("Steel dagger", 30, 37.5f, ItemID.STEEL_DAGGER),
-	STEEL_BAR("Steel bar", 30, 17.5f, ItemID.STEEL_BAR),
-	IRON_PLATESKIRT("Iron plateskirt", 31, 75, ItemID.IRON_PLATESKIRT),
-	IRON_PLATELEGS("Iron platelegs", 31, 75, ItemID.IRON_PLATELEGS),
-	STEEL_AXE("Steel axe", 31, 37.5f, ItemID.STEEL_AXE),
-	STEEL_MACE("Steel mace", 32, 37.5f, ItemID.STEEL_MACE),
-	IRON_PLATEBODY("Iron platebody", 33, 125, ItemID.IRON_PLATEBODY),
-	STEEL_MED_HELM("Steel med helm", 33, 37.5f, ItemID.STEEL_MED_HELM),
-	STEEL_BOLTS_UNF("Steel bolts (unf)", 33, 37.5f, ItemID.STEEL_BOLTS_UNF),
-	STEEL_DART_TIP("Steel dart tip", 34, 37.5f, ItemID.STEEL_DART_TIP),
-	STEEL_NAILS("Steel nails", 34, 37.5f, ItemID.STEEL_NAILS),
-	STEEL_SWORD("Steel sword", 34, 37.5f, ItemID.STEEL_SWORD),
-	CANNONBALL("Cannonball", 35, 25.6f, ItemID.CANNONBALL),
-	STEEL_SCIMITAR("Steel scimitar", 35, 75, ItemID.STEEL_SCIMITAR),
-	STEEL_ARROWTIPS("Steel arrowtips", 35, 37.5f, ItemID.STEEL_ARROWTIPS),
-	STEEL_HASTA("Steel hasta", 35, 75, ItemID.STEEL_HASTA),
-	STEEL_SPEAR("Steel spear", 35, 75, ItemID.STEEL_SPEAR),
-	STEEL_LIMBS("Steel limbs", 36, 37.5f, ItemID.STEEL_LIMBS),
-	STEEL_STUDS("Steel studs", 36, 37.5f, ItemID.STEEL_STUDS),
-	STEEL_LONGSWORD("Steel longsword", 36, 75, ItemID.STEEL_LONGSWORD),
-	STEEL_JAVELIN_HEADS("Steel javelin heads", 36, 37.5f, ItemID.STEEL_JAVELIN_HEADS),
-	STEEL_KNIFE("Steel knife", 37, 37.5f, ItemID.STEEL_KNIFE),
-	STEEL_FULL_HELM("Steel full helm", 37, 75, ItemID.STEEL_FULL_HELM),
-	STEEL_SQ_SHIELD("Steel sq shield", 38, 75, ItemID.STEEL_SQ_SHIELD),
-	STEEL_WARHAMMER("Steel warhammer", 39, 112.5f, ItemID.STEEL_WARHAMMER),
-	STEEL_BATTLEAXE("Steel battleaxe", 40, 112.5f, ItemID.STEEL_BATTLEAXE),
-	GOLD_BAR_GOLDSMITH_GAUNTLETS("Gold bar (Goldsmith gauntlets)", 40, 56.2f, ItemID.GOLD_BAR),
-	GOLD_BAR("Gold bar", 40, 22.5f, ItemID.GOLD_BAR),
-	STEEL_CHAINBODY("Steel chainbody", 41, 112.5f, ItemID.STEEL_CHAINBODY),
-	STEEL_KITESHIELD("Steel kiteshield", 42, 112.5f, ItemID.STEEL_KITESHIELD),
-	STEEL_CLAWS("Steel claws", 43, 75, ItemID.STEEL_CLAWS),
-	STEEL_2H_SWORD("Steel 2h sword", 44, 112.5f, ItemID.STEEL_2H_SWORD),
-	STEEL_PLATELEGS("Steel platelegs", 46, 112.5f, ItemID.STEEL_PLATELEGS),
-	STEEL_PLATESKIRT("Steel plateskirt", 46, 112.5f, ItemID.STEEL_PLATESKIRT),
-	STEEL_PLATEBODY("Steel platebody", 48, 187.5f, ItemID.STEEL_PLATEBODY),
-	BULLSEYE_LANTERN_UNF("Bullseye lantern (unf)", 49, 37, ItemID.BULLSEYE_LANTERN_UNF),
-	MITHRIL_DAGGER("Mithril dagger", 50, 50, ItemID.MITHRIL_DAGGER),
-	MITHRIL_BAR("Mithril bar", 50, 30, ItemID.MITHRIL_BAR),
-	MITHRIL_AXE("Mithril axe", 51, 50, ItemID.MITHRIL_AXE),
-	MITHRIL_MACE("Mithril mace", 52, 50, ItemID.MITHRIL_MACE),
-	MITHRIL_MED_HELM("Mithril med helm", 53, 50, ItemID.MITHRIL_MED_HELM),
-	MITHRIL_BOLTS_UNF("Mithril bolts (unf)", 53, 50, ItemID.MITHRIL_BOLTS_UNF),
-	MITHRIL_SWORD("Mithril sword", 54, 50, ItemID.MITHRIL_SWORD),
-	MITHRIL_DART_TIP("Mithril dart tip", 54, 50, ItemID.MITHRIL_DART_TIP),
-	MITHRIL_NAILS("Mithril nails", 54, 50, ItemID.MITHRIL_NAILS),
-	MITHRIL_ARROWTIPS("Mithril arrowtips", 55, 50, ItemID.MITHRIL_ARROWTIPS),
-	MITHRIL_SCIMITAR("Mithril scimitar", 55, 100, ItemID.MITHRIL_SCIMITAR),
-	MITHRIL_HASTA("Mithril hasta", 55, 100, ItemID.MITHRIL_HASTA),
-	MITHRIL_SPEAR("Mithril spear", 55, 100, ItemID.MITHRIL_SPEAR),
-	MITHRIL_LONGSWORD("Mithril longsword", 56, 100, ItemID.MITHRIL_LONGSWORD),
-	MITHRIL_JAVELIN_HEADS("Mithril javelin heads", 56, 50, ItemID.MITHRIL_JAVELIN_HEADS),
-	MITHRIL_LIMBS("Mithril limbs", 56, 50, ItemID.MITHRIL_LIMBS),
-	MITHRIL_FULL_HELM("Mithril full helm", 57, 100, ItemID.MITHRIL_FULL_HELM),
-	MITHRIL_KNIFE("Mithril knife", 57, 50, ItemID.MITHRIL_KNIFE),
-	MITHRIL_SQ_SHIELD("Mithril sq shield", 58, 100, ItemID.MITHRIL_SQ_SHIELD),
-	MITH_GRAPPLE_TIP("Mith grapple tip", 59, 50, ItemID.MITH_GRAPPLE_TIP),
-	MITHRIL_WARHAMMER("Mithril warhammer", 59, 150, ItemID.MITHRIL_WARHAMMER),
-	DRAGON_SQ_SHIELD("Dragon sq shield", 60, 75, ItemID.DRAGON_SQ_SHIELD),
-	MITHRIL_BATTLEAXE("Mithril battleaxe", 60, 150, ItemID.MITHRIL_BATTLEAXE),
-	MITHRIL_CHAINBODY("Mithril chainbody", 61, 150, ItemID.MITHRIL_CHAINBODY),
-	MITHRIL_KITESHIELD("Mithril kiteshield", 62, 150, ItemID.MITHRIL_KITESHIELD),
-	MITHRIL_CLAWS("Mithril claws", 63, 100, ItemID.MITHRIL_CLAWS),
-	MITHRIL_2H_SWORD("Mithril 2h sword", 64, 150, ItemID.MITHRIL_2H_SWORD),
-	MITHRIL_PLATESKIRT("Mithril plateskirt", 66, 150, ItemID.MITHRIL_PLATESKIRT),
-	MITHRIL_PLATELEGS("Mithril platelegs", 66, 150, ItemID.MITHRIL_PLATELEGS),
-	MITHRIL_PLATEBODY("Mithril platebody", 68, 250, ItemID.MITHRIL_PLATEBODY),
-	ADAMANT_DAGGER("Adamant dagger", 70, 62.5f, ItemID.ADAMANT_DAGGER),
-	ADAMANTITE_BAR("Adamantite bar", 70, 37.5f, ItemID.ADAMANTITE_BAR),
-	ADAMANT_AXE("Adamant axe", 71, 62.5f, ItemID.ADAMANT_AXE),
-	ADAMANT_MACE("Adamant mace", 72, 62.5f, ItemID.ADAMANT_MACE),
-	ADAMANT_BOLTS_UNF("Adamant bolts (unf)", 73, 62.5f, ItemID.ADAMANT_BOLTSUNF),
-	ADAMANT_MED_HELM("Adamant med helm", 73, 62.5f, ItemID.ADAMANT_MED_HELM),
-	ADAMANT_DART_TIP("Adamant dart tip", 74, 62.5f, ItemID.ADAMANT_DART_TIP),
-	ADAMANT_SWORD("Adamant sword", 74, 62.5f, ItemID.ADAMANT_SWORD),
-	ADAMANTITE_NAILS("Adamantite nails", 74, 62.5f, ItemID.ADAMANTITE_NAILS),
-	ADAMANT_ARROWTIPS("Adamant arrowtips", 75, 62.5f, ItemID.ADAMANT_ARROWTIPS),
-	ADAMANT_SCIMITAR("Adamant scimitar", 75, 125, ItemID.ADAMANT_SCIMITAR),
-	ADAMANT_HASTA("Adamant hasta", 75, 125, ItemID.ADAMANT_HASTA),
-	ADAMANT_SPEAR("Adamant spear", 75, 125, ItemID.ADAMANT_SPEAR),
-	ADAMANTITE_LIMBS("Adamantite limbs", 76, 62.5f, ItemID.ADAMANTITE_LIMBS),
-	ADAMANT_LONGSWORD("Adamant longsword", 76, 125, ItemID.ADAMANT_LONGSWORD),
-	ADAMANT_JAVELIN_HEADS("Adamant javelin heads", 76, 62.5f, ItemID.ADAMANT_JAVELIN_HEADS),
-	ADAMANT_FULL_HELM("Adamant full helm", 77, 125, ItemID.ADAMANT_FULL_HELM),
-	ADAMANT_KNIFE("Adamant knife", 77, 62.5f, ItemID.ADAMANT_KNIFE),
-	ADAMANT_SQ_SHIELD("Adamant sq shield", 78, 125, ItemID.ADAMANT_SQ_SHIELD),
-	ADAMANT_WARHAMMER("Adamant warhammer", 79, 187.5f, ItemID.ADAMANT_WARHAMMER),
-	ADAMANT_BATTLEAXE("Adamant battleaxe", 80, 187.5f, ItemID.ADAMANT_BATTLEAXE),
-	ADAMANT_CHAINBODY("Adamant chainbody", 81, 187.5f, ItemID.ADAMANT_CHAINBODY),
-	ADAMANT_KITESHIELD("Adamant kiteshield", 82, 187.5f, ItemID.ADAMANT_KITESHIELD),
-	ADAMANT_CLAWS("Adamant claws", 83, 125, ItemID.ADAMANT_CLAWS),
-	ADAMANT_2H_SWORD("Adamant 2h sword", 84, 187.5f, ItemID.ADAMANT_2H_SWORD),
-	RUNITE_BAR("Runite bar", 85, 50, ItemID.RUNITE_BAR),
-	RUNE_DAGGER("Rune dagger", 85, 75, ItemID.RUNE_DAGGER),
-	RUNE_AXE("Rune axe", 86, 75, ItemID.RUNE_AXE),
-	ADAMANT_PLATESKIRT("Adamant plateskirt", 86, 187.5f, ItemID.ADAMANT_PLATESKIRT),
-	ADAMANT_PLATELEGS("Adamant platelegs", 86, 187.5f, ItemID.ADAMANT_PLATELEGS),
-	RUNE_MACE("Rune mace", 87, 75, ItemID.RUNE_MACE),
-	RUNITE_BOLTS_UNF("Runite bolts (unf)", 88, 75, ItemID.RUNITE_BOLTS_UNF),
-	RUNE_MED_HELM("Rune med helm", 88, 75, ItemID.RUNE_MED_HELM),
-	ADAMANT_PLATEBODY("Adamant platebody", 88, 312.5f, ItemID.ADAMANT_PLATEBODY),
-	RUNE_SWORD("Rune sword", 89, 75, ItemID.RUNE_SWORD),
-	RUNE_NAILS("Rune nails", 89, 75, ItemID.RUNE_NAILS),
-	RUNE_DART_TIP("Rune dart tip", 89, 75, ItemID.RUNE_DART_TIP),
-	RUNE_ARROWTIPS("Rune arrowtips", 90, 75, ItemID.RUNE_ARROWTIPS),
-	RUNE_SCIMITAR("Rune scimitar", 90, 150, ItemID.RUNE_SCIMITAR),
-	RUNE_HASTA("Rune hasta", 90, 150, ItemID.RUNE_HASTA),
-	RUNE_SPEAR("Rune spear", 90, 150, ItemID.RUNE_SPEAR),
-	DRAGONFIRE_SHIELD("Dragonfire shield", 90, 2000, ItemID.DRAGONFIRE_SHIELD),
-	RUNE_LONGSWORD("Rune longsword", 91, 150, ItemID.RUNE_LONGSWORD),
-	RUNE_JAVELIN_HEADS("Rune javelin heads", 91, 75, ItemID.RUNE_JAVELIN_HEADS),
-	RUNITE_LIMBS("Runite limbs", 91, 75, ItemID.RUNITE_LIMBS),
-	RUNE_KNIFE("Rune knife", 92, 75, ItemID.RUNE_KNIFE),
-	RUNE_FULL_HELM("Rune full helm", 92, 150, ItemID.RUNE_FULL_HELM),
-	RUNE_SQ_SHIELD("Rune sq shield", 93, 150, ItemID.RUNE_SQ_SHIELD),
-	RUNE_WARHAMMER("Rune warhammer", 94, 225, ItemID.RUNE_WARHAMMER),
-	RUNE_BATTLEAXE("Rune battleaxe", 95, 225, ItemID.RUNE_BATTLEAXE),
-	RUNE_CHAINBODY("Rune chainbody", 96, 225, ItemID.RUNE_CHAINBODY),
-	RUNE_KITESHIELD("Rune kiteshield", 97, 225, ItemID.RUNE_KITESHIELD),
-	RUNE_CLAWS("Rune claws", 98, 150, ItemID.RUNE_CLAWS),
-	RUNE_PLATEBODY("Rune platebody", 99, 375, ItemID.RUNE_PLATEBODY),
-	RUNE_PLATESKIRT("Rune plateskirt", 99, 225, ItemID.RUNE_PLATESKIRT),
-	RUNE_PLATELEGS("Rune platelegs", 99, 225, ItemID.RUNE_PLATELEGS),
-	RUNE_2H_SWORD("Rune 2h sword", 99, 225, ItemID.RUNE_2H_SWORD),
+	BRONZE_BAR(ItemID.BRONZE_BAR, 1, 6.3f),
+	BRONZE_AXE(ItemID.BRONZE_AXE, 1, 12.5f),
+	BRONZE_DAGGER(ItemID.BRONZE_DAGGER, 1, 12.5f),
+	BRONZE_MACE(ItemID.BRONZE_MACE, 2, 12.5f),
+	BRONZE_MED_HELM(ItemID.BRONZE_MED_HELM, 3, 12.5f),
+	BRONZE_BOLTS_UNF(ItemID.BRONZE_BOLTS_UNF, 3, 12.5f),
+	BRONZE_NAILS(ItemID.BRONZE_NAILS, 4, 12.5f),
+	BRONZE_SWORD(ItemID.BRONZE_SWORD, 4, 12.5f),
+	BRONZE_WIRE(ItemID.BRONZE_WIRE, 4, 12.5f),
+	BRONZE_DART_TIP(ItemID.BRONZE_DART_TIP, 4, 12.5f),
+	BRONZE_ARROWTIPS(ItemID.BRONZE_ARROWTIPS, 5, 12.5f),
+	BRONZE_SCIMITAR(ItemID.BRONZE_SCIMITAR, 5, 25),
+	BRONZE_HASTA(ItemID.BRONZE_HASTA, 5, 25),
+	BRONZE_SPEAR(ItemID.BRONZE_SPEAR, 5, 25),
+	BRONZE_JAVELIN_HEADS(ItemID.BRONZE_JAVELIN_HEADS, 6, 12.5f),
+	BRONZE_LONGSWORD(ItemID.BRONZE_LONGSWORD, 6, 25),
+	BRONZE_LIMBS(ItemID.BRONZE_LIMBS, 6, 12.5f),
+	BRONZE_KNIFE(ItemID.BRONZE_KNIFE, 7, 12.5f),
+	BRONZE_FULL_HELM(ItemID.BRONZE_FULL_HELM, 7, 25),
+	BRONZE_SQ_SHIELD(ItemID.BRONZE_SQ_SHIELD, 8, 25),
+	BRONZE_WARHAMMER(ItemID.BRONZE_WARHAMMER, 9, 37.5f),
+	BRONZE_BATTLEAXE(ItemID.BRONZE_BATTLEAXE, 10, 37.5f),
+	BRONZE_CHAINBODY(ItemID.BRONZE_CHAINBODY, 11, 37.5f),
+	BRONZE_KITESHIELD(ItemID.BRONZE_KITESHIELD, 12, 37.5f),
+	BRONZE_CLAWS(ItemID.BRONZE_CLAWS, 13, 25),
+	BRONZE_2H_SWORD(ItemID.BRONZE_2H_SWORD, 14, 37.5f),
+	BARRONITE_DEPOSITS(ItemID.BARRONITE_DEPOSIT, 14, 30),
+	IRON_BAR(ItemID.IRON_BAR, 15, 12.5f),
+	IRON_DAGGER(ItemID.IRON_DAGGER, 15, 25),
+	IRON_AXE(ItemID.IRON_AXE, 16, 25),
+	BRONZE_PLATELEGS(ItemID.BRONZE_PLATELEGS, 16, 37.5f),
+	BRONZE_PLATESKIRT(ItemID.BRONZE_PLATESKIRT, 16, 37.5f),
+	IRON_SPIT(ItemID.IRON_SPIT, 17, 25),
+	IRON_MACE(ItemID.IRON_MACE, 17, 25),
+	IRON_BOLTS_UNF(ItemID.IRON_BOLTS_UNF, 18, 25),
+	BRONZE_PLATEBODY(ItemID.BRONZE_PLATEBODY, 18, 62.5f),
+	IRON_MED_HELM(ItemID.IRON_MED_HELM, 18, 25),
+	IRON_NAILS(ItemID.IRON_NAILS, 19, 25),
+	IRON_DART_TIP(ItemID.IRON_DART_TIP, 19, 25),
+	IRON_SWORD(ItemID.IRON_SWORD, 19, 25),
+	SILVER_BAR(ItemID.SILVER_BAR, 20, 13.7f),
+	IRON_ARROWTIPS(ItemID.IRON_ARROWTIPS, 20, 25),
+	IRON_SCIMITAR(ItemID.IRON_SCIMITAR, 20, 50),
+	IRON_HASTA(ItemID.IRON_HASTA, 20, 50),
+	IRON_SPEAR(ItemID.IRON_SPEAR, 20, 50),
+	IRON_LONGSWORD(ItemID.IRON_LONGSWORD, 21, 50),
+	IRON_JAVELIN_HEADS(ItemID.IRON_JAVELIN_HEADS, 21, 25),
+	IRON_FULL_HELM(ItemID.IRON_FULL_HELM, 22, 50),
+	IRON_KNIFE(ItemID.IRON_KNIFE, 22, 25),
+	IRON_LIMBS(ItemID.IRON_LIMBS, 23, 25),
+	IRON_SQ_SHIELD(ItemID.IRON_SQ_SHIELD, 23, 50),
+	IRON_WARHAMMER(ItemID.IRON_WARHAMMER, 24, 75),
+	IRON_BATTLEAXE(ItemID.IRON_BATTLEAXE, 25, 75),
+	OIL_LANTERN_FRAME(ItemID.OIL_LANTERN_FRAME, 26, 25),
+	IRON_CHAINBODY(ItemID.IRON_CHAINBODY, 26, 75),
+	IRON_KITESHIELD(ItemID.IRON_KITESHIELD, 27, 75),
+	IRON_CLAWS(ItemID.IRON_CLAWS, 28, 50),
+	IRON_2H_SWORD(ItemID.IRON_2H_SWORD, 29, 75),
+	STEEL_DAGGER(ItemID.STEEL_DAGGER, 30, 37.5f),
+	STEEL_BAR(ItemID.STEEL_BAR, 30, 17.5f),
+	IRON_PLATESKIRT(ItemID.IRON_PLATESKIRT, 31, 75),
+	IRON_PLATELEGS(ItemID.IRON_PLATELEGS, 31, 75),
+	STEEL_AXE(ItemID.STEEL_AXE, 31, 37.5f),
+	STEEL_MACE(ItemID.STEEL_MACE, 32, 37.5f),
+	IRON_PLATEBODY(ItemID.IRON_PLATEBODY, 33, 125),
+	STEEL_MED_HELM(ItemID.STEEL_MED_HELM, 33, 37.5f),
+	STEEL_BOLTS_UNF(ItemID.STEEL_BOLTS_UNF, 33, 37.5f),
+	STEEL_DART_TIP(ItemID.STEEL_DART_TIP, 34, 37.5f),
+	STEEL_NAILS(ItemID.STEEL_NAILS, 34, 37.5f),
+	STEEL_SWORD(ItemID.STEEL_SWORD, 34, 37.5f),
+	CANNONBALL(ItemID.CANNONBALL, 35, 25.6f),
+	STEEL_SCIMITAR(ItemID.STEEL_SCIMITAR, 35, 75),
+	STEEL_ARROWTIPS(ItemID.STEEL_ARROWTIPS, 35, 37.5f),
+	STEEL_HASTA(ItemID.STEEL_HASTA, 35, 75),
+	STEEL_SPEAR(ItemID.STEEL_SPEAR, 35, 75),
+	STEEL_LIMBS(ItemID.STEEL_LIMBS, 36, 37.5f),
+	STEEL_STUDS(ItemID.STEEL_STUDS, 36, 37.5f),
+	STEEL_LONGSWORD(ItemID.STEEL_LONGSWORD, 36, 75),
+	STEEL_JAVELIN_HEADS(ItemID.STEEL_JAVELIN_HEADS, 36, 37.5f),
+	STEEL_KNIFE(ItemID.STEEL_KNIFE, 37, 37.5f),
+	STEEL_FULL_HELM(ItemID.STEEL_FULL_HELM, 37, 75),
+	STEEL_SQ_SHIELD(ItemID.STEEL_SQ_SHIELD, 38, 75),
+	STEEL_WARHAMMER(ItemID.STEEL_WARHAMMER, 39, 112.5f),
+	STEEL_BATTLEAXE(ItemID.STEEL_BATTLEAXE, 40, 112.5f),
+	GOLD_BAR_GOLDSMITH_GAUNTLETS(ItemID.GOLD_BAR, 40, 56.2f),
+	GOLD_BAR(ItemID.GOLD_BAR, 40, 22.5f),
+	STEEL_CHAINBODY(ItemID.STEEL_CHAINBODY, 41, 112.5f),
+	STEEL_KITESHIELD(ItemID.STEEL_KITESHIELD, 42, 112.5f),
+	STEEL_CLAWS(ItemID.STEEL_CLAWS, 43, 75),
+	STEEL_2H_SWORD(ItemID.STEEL_2H_SWORD, 44, 112.5f),
+	STEEL_PLATELEGS(ItemID.STEEL_PLATELEGS, 46, 112.5f),
+	STEEL_PLATESKIRT(ItemID.STEEL_PLATESKIRT, 46, 112.5f),
+	STEEL_PLATEBODY(ItemID.STEEL_PLATEBODY, 48, 187.5f),
+	BULLSEYE_LANTERN_UNF(ItemID.BULLSEYE_LANTERN_UNF, 49, 37),
+	MITHRIL_DAGGER(ItemID.MITHRIL_DAGGER, 50, 50),
+	MITHRIL_BAR(ItemID.MITHRIL_BAR, 50, 30),
+	MITHRIL_AXE(ItemID.MITHRIL_AXE, 51, 50),
+	MITHRIL_MACE(ItemID.MITHRIL_MACE, 52, 50),
+	MITHRIL_MED_HELM(ItemID.MITHRIL_MED_HELM, 53, 50),
+	MITHRIL_BOLTS_UNF(ItemID.MITHRIL_BOLTS_UNF, 53, 50),
+	MITHRIL_SWORD(ItemID.MITHRIL_SWORD, 54, 50),
+	MITHRIL_DART_TIP(ItemID.MITHRIL_DART_TIP, 54, 50),
+	MITHRIL_NAILS(ItemID.MITHRIL_NAILS, 54, 50),
+	MITHRIL_ARROWTIPS(ItemID.MITHRIL_ARROWTIPS, 55, 50),
+	MITHRIL_SCIMITAR(ItemID.MITHRIL_SCIMITAR, 55, 100),
+	MITHRIL_HASTA(ItemID.MITHRIL_HASTA, 55, 100),
+	MITHRIL_SPEAR(ItemID.MITHRIL_SPEAR, 55, 100),
+	MITHRIL_LONGSWORD(ItemID.MITHRIL_LONGSWORD, 56, 100),
+	MITHRIL_JAVELIN_HEADS(ItemID.MITHRIL_JAVELIN_HEADS, 56, 50),
+	MITHRIL_LIMBS(ItemID.MITHRIL_LIMBS, 56, 50),
+	MITHRIL_FULL_HELM(ItemID.MITHRIL_FULL_HELM, 57, 100),
+	MITHRIL_KNIFE(ItemID.MITHRIL_KNIFE, 57, 50),
+	MITHRIL_SQ_SHIELD(ItemID.MITHRIL_SQ_SHIELD, 58, 100),
+	MITH_GRAPPLE_TIP(ItemID.MITH_GRAPPLE_TIP, 59, 50),
+	MITHRIL_WARHAMMER(ItemID.MITHRIL_WARHAMMER, 59, 150),
+	DRAGON_SQ_SHIELD(ItemID.DRAGON_SQ_SHIELD, 60, 75),
+	MITHRIL_BATTLEAXE(ItemID.MITHRIL_BATTLEAXE, 60, 150),
+	MITHRIL_CHAINBODY(ItemID.MITHRIL_CHAINBODY, 61, 150),
+	MITHRIL_KITESHIELD(ItemID.MITHRIL_KITESHIELD, 62, 150),
+	MITHRIL_CLAWS(ItemID.MITHRIL_CLAWS, 63, 100),
+	MITHRIL_2H_SWORD(ItemID.MITHRIL_2H_SWORD, 64, 150),
+	MITHRIL_PLATESKIRT(ItemID.MITHRIL_PLATESKIRT, 66, 150),
+	MITHRIL_PLATELEGS(ItemID.MITHRIL_PLATELEGS, 66, 150),
+	MITHRIL_PLATEBODY(ItemID.MITHRIL_PLATEBODY, 68, 250),
+	ADAMANT_DAGGER(ItemID.ADAMANT_DAGGER, 70, 62.5f),
+	ADAMANTITE_BAR(ItemID.ADAMANTITE_BAR, 70, 37.5f),
+	ADAMANT_AXE(ItemID.ADAMANT_AXE, 71, 62.5f),
+	ADAMANT_MACE(ItemID.ADAMANT_MACE, 72, 62.5f),
+	ADAMANT_BOLTS_UNF(ItemID.ADAMANT_BOLTSUNF, 73, 62.5f),
+	ADAMANT_MED_HELM(ItemID.ADAMANT_MED_HELM, 73, 62.5f),
+	ADAMANT_DART_TIP(ItemID.ADAMANT_DART_TIP, 74, 62.5f),
+	ADAMANT_SWORD(ItemID.ADAMANT_SWORD, 74, 62.5f),
+	ADAMANTITE_NAILS(ItemID.ADAMANTITE_NAILS, 74, 62.5f),
+	ADAMANT_ARROWTIPS(ItemID.ADAMANT_ARROWTIPS, 75, 62.5f),
+	ADAMANT_SCIMITAR(ItemID.ADAMANT_SCIMITAR, 75, 125),
+	ADAMANT_HASTA(ItemID.ADAMANT_HASTA, 75, 125),
+	ADAMANT_SPEAR(ItemID.ADAMANT_SPEAR, 75, 125),
+	ADAMANTITE_LIMBS(ItemID.ADAMANTITE_LIMBS, 76, 62.5f),
+	ADAMANT_LONGSWORD(ItemID.ADAMANT_LONGSWORD, 76, 125),
+	ADAMANT_JAVELIN_HEADS(ItemID.ADAMANT_JAVELIN_HEADS, 76, 62.5f),
+	ADAMANT_FULL_HELM(ItemID.ADAMANT_FULL_HELM, 77, 125),
+	ADAMANT_KNIFE(ItemID.ADAMANT_KNIFE, 77, 62.5f),
+	ADAMANT_SQ_SHIELD(ItemID.ADAMANT_SQ_SHIELD, 78, 125),
+	ADAMANT_WARHAMMER(ItemID.ADAMANT_WARHAMMER, 79, 187.5f),
+	ADAMANT_BATTLEAXE(ItemID.ADAMANT_BATTLEAXE, 80, 187.5f),
+	ADAMANT_CHAINBODY(ItemID.ADAMANT_CHAINBODY, 81, 187.5f),
+	ADAMANT_KITESHIELD(ItemID.ADAMANT_KITESHIELD, 82, 187.5f),
+	ADAMANT_CLAWS(ItemID.ADAMANT_CLAWS, 83, 125),
+	ADAMANT_2H_SWORD(ItemID.ADAMANT_2H_SWORD, 84, 187.5f),
+	RUNITE_BAR(ItemID.RUNITE_BAR, 85, 50),
+	RUNE_DAGGER(ItemID.RUNE_DAGGER, 85, 75),
+	RUNE_AXE(ItemID.RUNE_AXE, 86, 75),
+	ADAMANT_PLATESKIRT(ItemID.ADAMANT_PLATESKIRT, 86, 187.5f),
+	ADAMANT_PLATELEGS(ItemID.ADAMANT_PLATELEGS, 86, 187.5f),
+	RUNE_MACE(ItemID.RUNE_MACE, 87, 75),
+	RUNITE_BOLTS_UNF(ItemID.RUNITE_BOLTS_UNF, 88, 75),
+	RUNE_MED_HELM(ItemID.RUNE_MED_HELM, 88, 75),
+	ADAMANT_PLATEBODY(ItemID.ADAMANT_PLATEBODY, 88, 312.5f),
+	RUNE_SWORD(ItemID.RUNE_SWORD, 89, 75),
+	RUNE_NAILS(ItemID.RUNE_NAILS, 89, 75),
+	RUNE_DART_TIP(ItemID.RUNE_DART_TIP, 89, 75),
+	RUNE_ARROWTIPS(ItemID.RUNE_ARROWTIPS, 90, 75),
+	RUNE_SCIMITAR(ItemID.RUNE_SCIMITAR, 90, 150),
+	RUNE_HASTA(ItemID.RUNE_HASTA, 90, 150),
+	RUNE_SPEAR(ItemID.RUNE_SPEAR, 90, 150),
+	DRAGONFIRE_SHIELD(ItemID.DRAGONFIRE_SHIELD, 90, 2000),
+	RUNE_LONGSWORD(ItemID.RUNE_LONGSWORD, 91, 150),
+	RUNE_JAVELIN_HEADS(ItemID.RUNE_JAVELIN_HEADS, 91, 75),
+	RUNITE_LIMBS(ItemID.RUNITE_LIMBS, 91, 75),
+	RUNE_KNIFE(ItemID.RUNE_KNIFE, 92, 75),
+	RUNE_FULL_HELM(ItemID.RUNE_FULL_HELM, 92, 150),
+	RUNE_SQ_SHIELD(ItemID.RUNE_SQ_SHIELD, 93, 150),
+	RUNE_WARHAMMER(ItemID.RUNE_WARHAMMER, 94, 225),
+	RUNE_BATTLEAXE(ItemID.RUNE_BATTLEAXE, 95, 225),
+	RUNE_CHAINBODY(ItemID.RUNE_CHAINBODY, 96, 225),
+	RUNE_KITESHIELD(ItemID.RUNE_KITESHIELD, 97, 225),
+	RUNE_CLAWS(ItemID.RUNE_CLAWS, 98, 150),
+	RUNE_PLATEBODY(ItemID.RUNE_PLATEBODY, 99, 375),
+	RUNE_PLATESKIRT(ItemID.RUNE_PLATESKIRT, 99, 225),
+	RUNE_PLATELEGS(ItemID.RUNE_PLATELEGS, 99, 225),
+	RUNE_2H_SWORD(ItemID.RUNE_2H_SWORD, 99, 225),
 	;
 
-	private final String name;
+	private final int itemId;
 	private final int level;
 	private final float xp;
-	private final int icon;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ThievingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ThievingAction.java
index 1f168e6dba..0809ef0b72 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ThievingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/ThievingAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum ThievingAction implements SkillAction
+public enum ThievingAction implements NamedSkillAction
 {
 	MAN_OR_WOMAN("Man / Woman", 1, 8, ItemID.MAN),
 	WINTER_SQIRKJUICE("Winter Sq'irkjuice", 1, 350, ItemID.WINTER_SQIRKJUICE),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/WoodcuttingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/WoodcuttingAction.java
index 6bb90b5ea1..8aad519aaa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/WoodcuttingAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/WoodcuttingAction.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemID;
 
 @AllArgsConstructor
 @Getter
-public enum WoodcuttingAction implements SkillAction
+public enum WoodcuttingAction implements NamedSkillAction
 {
 	LOGS("Logs", 1, 25, ItemID.LOGS),
 	ACHEY_TREE_LOGS("Achey tree logs", 1, 25, ItemID.ACHEY_TREE_LOGS),