diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
index b51940b206..f9c4889c75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
@@ -53,6 +53,10 @@ import net.runelite.client.plugins.menuentryswapper.util.CharterOption;
 @ConfigGroup("menuentryswapper")
 public interface MenuEntrySwapperConfig extends Config
 {
+	//------------------------------------------------------------//
+	// Banking
+	//------------------------------------------------------------//
+
 	@ConfigItem(
 		keyName = "withdrawOne",
 		name = "Withdraw/Deposit One",
@@ -197,13 +201,15 @@ public interface MenuEntrySwapperConfig extends Config
 		return "";
 	}
 
+	//------------------------------------------------------------//
+	// Equipment Swapper
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "swapMax",
 		name = "Swap Max Cape",
 		description = "Enables swapping max cape options in worn interface.",
-		position = 11,
+		position = 0,
 		group = "Equipment swapper"
 	)
 	default boolean swapMax()
@@ -215,7 +221,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "teleEquippedCape",
 		name = "Teleport Equipped Cape",
 		description = "Makes Teleport/Tele to POH the left click option on equip screen",
-		position = 12,
+		position = 1,
 		group = "Equipment swapper"
 	)
 	default boolean teleEquippedCape()
@@ -227,7 +233,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "telecapeMode",
 		name = "ModeTeleCape",
 		description = "",
-		position = 13,
+		position = 2,
 		group = "Equipment swapper",
 		hidden = true,
 		unhide = "teleEquippedCape"
@@ -241,7 +247,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "maxMode",
 		name = "Mode",
 		description = "",
-		position = 14,
+		position = 3,
 		group = "Equipment swapper",
 		hidden = true,
 		unhide = "swapMax"
@@ -255,7 +261,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapArdougneCape",
 		name = "Swap Ardougne Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
-		position = 15,
+		position = 4,
 		group = "Equipment swapper"
 	)
 	default boolean getSwapArdougneCape()
@@ -267,7 +273,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapConstructionCape",
 		name = "Swap Construction Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
-		position = 16,
+		position = 5,
 		group = "Equipment swapper"
 	)
 	default boolean getSwapConstructionCape()
@@ -279,7 +285,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapCraftingCape",
 		name = "Swap Crafting Cape",
 		description = "Enables swapping of 'Teleport' and 'Wear'.",
-		position = 17,
+		position = 6,
 		group = "Equipment swapper"
 	)
 	default boolean getSwapCraftingCape()
@@ -291,7 +297,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapMagicCape",
 		name = "Swap Magic Cape",
 		description = "Enables swapping of 'Spellbook' and 'Wear'.",
-		position = 18,
+		position = 7,
 		group = "Equipment swapper"
 	)
 	default boolean getSwapMagicCape()
@@ -303,7 +309,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapExplorersRing",
 		name = "Swap Explorer's Ring",
 		description = "Enables swapping of 'Spellbook' and 'Wear'.",
-		position = 19,
+		position = 8,
 		group = "Equipment swapper"
 	)
 	default boolean getSwapExplorersRing()
@@ -315,7 +321,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapAdmire",
 		name = "Admire",
 		description = "Swap 'Admire' with 'Teleport', 'Spellbook' and 'Perks' (max cape) for mounted skill capes.",
-		position = 20,
+		position = 9,
 		group = "Equipment swapper"
 	)
 	default boolean swapAdmire()
@@ -327,7 +333,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapQuestCape",
 		name = "Swap Quest Cape",
 		description = "Enables swapping Quest cape options in worn interface.",
-		position = 21,
+		position = 10,
 		group = "Equipment swapper"
 	)
 	default boolean swapQuestCape()
@@ -339,7 +345,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "questCapeMode",
 		name = "Mode",
 		description = "",
-		position = 22,
+		position = 11,
 		group = "Equipment swapper",
 		hidden = true,
 		unhide = "swapQuestCape"
@@ -349,13 +355,15 @@ public interface MenuEntrySwapperConfig extends Config
 		return QuestCapeMode.TELEPORT;
 	}
 
+	//------------------------------------------------------------//
+	// Miscellaneous
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "customSwaps",
 		name = "Custom Swaps",
 		description = "Add custom swaps here, 1 per line. Syntax: option, target : option, target<br>Note that the first entry should be the left click one!",
-		position = 23,
+		position = 0,
 		group = "Miscellaneous",
 		parse = true,
 		clazz = Parse.class,
@@ -370,7 +378,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "shiftClickCustomization",
 		name = "Customizable Shift-click",
 		description = "Allows customization of shift-clicks on items.",
-		position = 24,
+		position = 1,
 		group = "Miscellaneous"
 	)
 	default boolean shiftClickCustomization()
@@ -382,7 +390,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapCoalBag",
 		name = "Swap Coal Bag Empty",
 		description = "Makes Empty the left click option when in a bank",
-		position = 25,
+		position = 2,
 		group = "Miscellaneous"
 	)
 	default boolean swapCoalBag()
@@ -394,7 +402,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBirdhouseEmpty",
 		name = "Birdhouse",
 		description = "Swap 'Interact' with 'Empty' for birdhouses on Fossil Island.",
-		position = 26,
+		position = 3,
 		group = "Miscellaneous"
 	)
 	default boolean swapBirdhouseEmpty()
@@ -406,7 +414,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBones",
 		name = "Bury",
 		description = "Swap 'Bury' with 'Use' on Bones.",
-		position = 27,
+		position = 4,
 		group = "Miscellaneous"
 	)
 	default boolean swapBones()
@@ -418,7 +426,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapChase",
 		name = "Chase",
 		description = "Allows to left click your cat to chase rats.",
-		position = 28,
+		position = 5,
 		group = "Miscellaneous"
 	)
 	default boolean swapChase()
@@ -430,7 +438,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapHarpoon",
 		name = "Harpoon",
 		description = "Swap 'Cage', 'Big Net' with 'Harpoon' on Fishing spots.",
-		position = 29,
+		position = 6,
 		group = "Miscellaneous"
 	)
 	default boolean swapHarpoon()
@@ -442,7 +450,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapOccult",
 		name = "Occult Altar",
 		description = "Swap 'Venerate' with 'Ancient', 'Lunar', or 'Arceuus' on an Altar of the Occult.",
-		position = 30,
+		position = 7,
 		group = "Miscellaneous"
 	)
 	default boolean swapOccult()
@@ -454,7 +462,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "occultalter",
 		name = "Mode",
 		description = "",
-		position = 31,
+		position = 8,
 		group = "Miscellaneous",
 		hidden = true,
 		unhide = "swapOccult"
@@ -468,7 +476,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapHomePortal",
 		name = "Home",
 		description = "Swap 'Enter' with 'Home', 'Build' or 'Friend's house' on Portal.",
-		position = 32,
+		position = 9,
 		group = "Miscellaneous"
 	)
 	default boolean swapHomePortal()
@@ -480,7 +488,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "home",
 		name = "Mode",
 		description = "",
-		position = 33,
+		position = 10,
 		group = "Miscellaneous",
 		hidden = true,
 		unhide = "swapHomePortal"
@@ -494,7 +502,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPrivate",
 		name = "Private",
 		description = "Swap 'Shared' with 'Private' on the Chambers of Xeric storage units.",
-		position = 34,
+		position = 11,
 		group = "Miscellaneous"
 	)
 	default boolean swapPrivate()
@@ -506,7 +514,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPick",
 		name = "Pick",
 		description = "Swap 'Pick' with 'Pick-lots' of the Gourd tree in the Chambers of Xeric.",
-		position = 35,
+		position = 12,
 		group = "Miscellaneous"
 	)
 	default boolean swapPick()
@@ -518,7 +526,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapQuick",
 		name = "Quick Pass/Open/Start/Travel",
 		description = "Swap 'Pass' with 'Quick-Pass', 'Open' with 'Quick-Open', 'Ring' with 'Quick-Start' and 'Talk-to' with 'Quick-Travel'.",
-		position = 36,
+		position = 13,
 		group = "Miscellaneous"
 	)
 	default boolean swapQuick()
@@ -530,7 +538,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBoxTrap",
 		name = "Reset",
 		description = "Swap 'Check' with 'Reset' on box traps.",
-		position = 37,
+		position = 14,
 		group = "Miscellaneous"
 	)
 	default boolean swapBoxTrap()
@@ -542,7 +550,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "rockCake",
 		name = "Rock Cake Guzzle",
 		description = "Enables Left Click 'Guzzle' on the Dwarven Rock Cake.",
-		position = 38,
+		position = 15,
 		group = "Miscellaneous"
 	)
 	default boolean rockCake()
@@ -554,7 +562,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapRogueschests",
 		name = "Rogues Chests",
 		description = "Swap Rogues Chests from 'Open' to 'Search for traps'.",
-		position = 39,
+		position = 16,
 		group = "Miscellaneous"
 	)
 	default boolean swapRogueschests()
@@ -566,7 +574,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapClimbUpDown",
 		name = "Climb",
 		description = "Swap 'Climb-Up'/'Climb-Down' depending on Shift or Control key.",
-		position = 40,
+		position = 17,
 		group = "Miscellaneous"
 	)
 	default boolean swapClimbUpDown()
@@ -578,7 +586,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapStun",
 		name = "Stun Hoop Snakes",
 		description = "Swap 'Attack' with 'Stun'.",
-		position = 41,
+		position = 18,
 		group = "Miscellaneous"
 	)
 	default boolean swapStun()
@@ -590,7 +598,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSearch",
 		name = "Search",
 		description = "Swap 'Close', 'Shut' with 'Search' on chests, cupboards, etc.",
-		position = 42,
+		position = 19,
 		group = "Miscellaneous"
 	)
 	default boolean swapSearch()
@@ -602,7 +610,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapHardWoodGrove",
 		name = "Hardwood Grove",
 		description = "Swap 'Quick-Pay(100)' and 'Send-Parcel' at Hardwood Grove.",
-		position = 43,
+		position = 20,
 		group = "Miscellaneous"
 	)
 	default boolean swapHardWoodGrove()
@@ -615,7 +623,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "removeObjects",
 		name = "Remove Objects",
 		description = "Removes interaction with the listed objects.",
-		position = 44,
+		position = 21,
 		group = "Miscellaneous"
 	)
 	default boolean getRemoveObjects()
@@ -627,7 +635,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "removedObjects",
 		name = "Objects",
 		description = "Objects listed here will have all interaction be removed.",
-		position = 45,
+		position = 22,
 		group = "Miscellaneous",
 		hidden = true,
 		unhide = "removeObjects"
@@ -638,38 +646,38 @@ public interface MenuEntrySwapperConfig extends Config
 	}
 
 	@ConfigItem(
-		keyName = "swapslayer",
-		name = "Swap Slayer Ring",
-		description = "",
-		position = 46,
-		group = "Teleportation"
-	)
-	default boolean getSlayerRing()
+		keyName = "swapImps",
+		name = "Impling Jars",
+		description = "Don't open implings if bank has a clue.",
+		position = 23,
+		group = "Miscellaneous"
+)
+default boolean swapImps()
 	{
 		return false;
 	}
 
-	@ConfigItem(
-		keyName = "slayerringmode",
-		name = "Mode",
-		description = "",
-		position = 47,
-		group = "Teleportation",
-		hidden = true,
-		unhide = "swapslayer"
-	)
-	default SlayerRingMode getSlayerRingMode()
+@ConfigItem(
+		keyName = "charterOption",
+		name = "Trader Crew",
+		description = "Configure whether you want Charter or Trade to be the first option of Trader Crewmembers.",
+		position = 24,
+		group = "Miscellaneous"
+)
+default CharterOption charterOption()
 	{
-		return SlayerRingMode.CHECK;
+		return CharterOption.TRADE;
 	}
 
+	//------------------------------------------------------------//
+	// Shop / Stores
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "swapBuyOne",
 		name = "Swappable Buy One",
 		description = "",
-		position = 48,
+		position = 0,
 		group = "Shop / stores"
 	)
 	default boolean getSwapBuyOne()
@@ -682,7 +690,7 @@ public interface MenuEntrySwapperConfig extends Config
 		name = "Items",
 		description = "",
 		group = "Shop / stores",
-		position = 49,
+		position = 1,
 		hidden = true,
 		unhide = "swapBuyOne"
 	)
@@ -695,7 +703,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBuyFive",
 		name = "Swappable Buy Five",
 		description = "",
-		position = 50,
+		position = 2,
 		group = "Shop / stores"
 	)
 	default boolean getSwapBuyFive()
@@ -707,7 +715,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "buyFiveItems",
 		name = "Items",
 		description = "",
-		position = 51,
+		position = 3,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapBuyFive"
@@ -721,7 +729,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBuyTen",
 		name = "Swappable Buy Ten",
 		description = "",
-		position = 52,
+		position = 4,
 		group = "Shop / stores"
 	)
 	default boolean getSwapBuyTen()
@@ -733,7 +741,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "buyTenItems",
 		name = "Items",
 		description = "",
-		position = 53,
+		position = 5,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapBuyTen"
@@ -747,7 +755,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBuyFifty",
 		name = "Swappable Buy Fifty",
 		description = "",
-		position = 54,
+		position = 6,
 		group = "Shop / stores"
 	)
 	default boolean getSwapBuyFifty()
@@ -759,7 +767,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "buyFiftyItems",
 		name = "Items",
 		description = "",
-		position = 55,
+		position = 7,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapBuyFifty"
@@ -773,7 +781,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSellOne",
 		name = "Swappable Sell One",
 		description = "",
-		position = 56,
+		position = 8,
 		group = "Shop / stores"
 	)
 	default boolean getSwapSellOne()
@@ -785,7 +793,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "sellOneItems",
 		name = "Items",
 		description = "",
-		position = 57,
+		position = 9,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapSellOne"
@@ -799,7 +807,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSellFive",
 		name = "Swappable Sell Five",
 		description = "",
-		position = 58,
+		position = 10,
 		group = "Shop / stores"
 	)
 	default boolean getSwapSellFive()
@@ -811,7 +819,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "sellFiveItems",
 		name = "Items",
 		description = "",
-		position = 59,
+		position = 11,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapSellFive"
@@ -825,7 +833,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSellTen",
 		name = "Swappable Sell Ten",
 		description = "",
-		position = 60,
+		position = 12,
 		group = "Shop / stores"
 	)
 	default boolean getSwapSellTen()
@@ -837,7 +845,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "sellTenItems",
 		name = "Items",
 		description = "",
-		position = 61,
+		position = 13,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapSellTen"
@@ -851,7 +859,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSellFifty",
 		name = "Swappable Sell Fifty",
 		description = "",
-		position = 62,
+		position = 14,
 		group = "Shop / stores"
 	)
 	default boolean getSwapSellFifty()
@@ -863,7 +871,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "sellFiftyItems",
 		name = "Items",
 		description = "",
-		position = 63,
+		position = 15,
 		group = "Shop / stores",
 		hidden = true,
 		unhide = "swapSellFifty"
@@ -874,6 +882,8 @@ public interface MenuEntrySwapperConfig extends Config
 	}
 
 	//------------------------------------------------------------//
+	// Skilling
+	//------------------------------------------------------------//
 
 /*	@ConfigItem(
 			keyName = "easyConstruction",
@@ -905,7 +915,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "getTempConstruction",
 		name = "Easy Construction",
 		description = "Makes 'Remove'/'Build' the default option for listed items.",
-		position = 64,
+		position = 0,
 		group = "Skilling"
 	)
 
@@ -918,7 +928,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "getTempConstructionItems",
 		name = "Build Items",
 		description = "",
-		position = 65,
+		position = 1,
 		group = "Skilling",
 		hidden = true,
 		unhide = "getTempConstruction"
@@ -932,7 +942,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSmithing",
 		name = "Swap Smithing",
 		description = "Enables swapping of 'Smith-1' and 'Smith-all' options.",
-		position = 66,
+		position = 2,
 		group = "Skilling"
 	)
 	default boolean getSwapSmithing()
@@ -944,7 +954,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapTanning",
 		name = "Swap Tanning",
 		description = "Enables swapping of 'Tan-1' and 'Tan-all' options.",
-		position = 67,
+		position = 3,
 		group = "Skilling"
 	)
 	default boolean getSwapTanning()
@@ -956,7 +966,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSawmill",
 		name = "Swap Sawmill Operator",
 		description = "Makes 'Buy-plank' the default option on the Sawmill Operator.",
-		position = 68,
+		position = 4,
 		group = "Skilling"
 	)
 	default boolean getSwapSawmill()
@@ -968,7 +978,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSawmillPlanks",
 		name = "Swap Buy Planks",
 		description = "Makes 'Buy All' the default option when buying planks.",
-		position = 69,
+		position = 5,
 		group = "Skilling"
 	)
 	default boolean getSwapSawmillPlanks()
@@ -980,7 +990,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPuroPuro",
 		name = "Swap Puro-Puro Wheat",
 		description = "",
-		position = 70,
+		position = 6,
 		group = "Skilling"
 	)
 	default boolean getSwapPuro()
@@ -988,13 +998,15 @@ public interface MenuEntrySwapperConfig extends Config
 		return false;
 	}
 
+	//------------------------------------------------------------//
+	// Talk-To
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "swapAssignment",
 		name = "Assignment",
 		description = "Swap 'Talk-to' with 'Assignment' for Slayer Masters. This will take priority over swapping Trade.",
-		position = 71,
+		position = 0,
 		group = "Talk-To"
 	)
 	default boolean swapAssignment()
@@ -1006,7 +1018,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapBankExchange",
 		name = "Bank/Exchange",
 		description = "Swap Talk-to with Bank or Exchange on NPC<br>Example: Banker, Grand Exchange Clerk, Tool Leprechaun, Void Knight",
-		position = 72,
+		position = 1,
 		group = "Talk-To"
 	)
 	default boolean swapBankExchange()
@@ -1018,7 +1030,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapContract",
 		name = "Contract",
 		description = "Swap 'Talk-to' with 'Contract' on Guildmaster Jane.",
-		position = 73,
+		position = 2,
 		group = "Talk-To"
 	)
 	default boolean swapContract()
@@ -1031,7 +1043,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapInteract",
 		name = "Interact",
 		description = "Swap options for generic interactions on NPCs<br>Example: Decant for Bob Barter, Repairs for Dark Mage, Claim Slime for Robin, Claim Dynamite",
-		position = 74,
+		position = 3,
 		group = "Talk-To"
 	)
 	default boolean swapInteract()
@@ -1043,7 +1055,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPickpocket",
 		name = "Pickpocket",
 		description = "Swap Talk-to with Pickpocket on NPC<br>Example: Man, Woman",
-		position = 75,
+		position = 4,
 		group = "Talk-To"
 	)
 	default boolean swapPickpocket()
@@ -1055,7 +1067,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPay",
 		name = "Pay",
 		description = "Swap 'Talk-to' with 'Pay' on various NPCs.<br>Example: Elstan, Heskel, Fayeth.",
-		position = 76,
+		position = 5,
 		group = "Talk-To"
 	)
 	default boolean swapPay()
@@ -1067,7 +1079,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapAbyssTeleport",
 		name = "Teleport to Abyss",
 		description = "Swap 'Talk-to' with 'Teleport' for the Mage of Zamorak.",
-		position = 77,
+		position = 6,
 		group = "Talk-To"
 	)
 	default boolean swapAbyssTeleport()
@@ -1079,7 +1091,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapTrade",
 		name = "Trade",
 		description = "Swap 'Talk-to' with 'Trade' on various NPCs.<br>Example: Shop keeper, Shop assistant.",
-		position = 78,
+		position = 7,
 		group = "Talk-To"
 	)
 	default boolean swapTrade()
@@ -1088,11 +1100,11 @@ public interface MenuEntrySwapperConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "swapTravel",
-			name = "Travel",
-			description = "Swap 'Talk-to' with 'Travel', 'Take-boat', 'Pay-fare', 'Charter' on various NPCs.<br>Example: Squire, Monk of Entrana, Customs officer, Trader Crewmember.",
-			position = 79,
-			group = "Talk-To"
+		keyName = "swapTravel",
+		name = "Travel",
+		description = "Swap 'Talk-to' with 'Travel', 'Take-boat', 'Pay-fare', 'Charter' on various NPCs.<br>Example: Squire, Monk of Entrana, Customs officer, Trader Crewmember.",
+		position = 8,
+		group = "Talk-To"
 	)
 	default boolean swapTravel()
 	{
@@ -1100,11 +1112,11 @@ public interface MenuEntrySwapperConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "swapMinigame",
-			name = "Minigames",
-			description = "Swap Talk-to with Start-Minigame, Story, Dream on NPC<br>Example: Guardian mummy, Juna, Dominic Onion",
-			position = 80,
-			group = "Talk-To"
+		keyName = "swapMinigame",
+		name = "Minigames",
+		description = "Swap Talk-to with Start-Minigame, Story, Dream on NPC<br>Example: Guardian mummy, Juna, Dominic Onion",
+		position = 9,
+		group = "Talk-To"
 	)
 	default boolean swapMinigame()
 	{
@@ -1115,7 +1127,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPlank",
 		name = "Buy Planks",
 		description = "Swap 'Talk-to' with 'Buy-planks' at the Lumber Yard.",
-		position = 81,
+		position = 10,
 		group = "Talk-To"
 	)
 	default boolean swapPlank()
@@ -1127,7 +1139,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapMetamorphosis",
 		name = "Metamorphosis",
 		description = "Swap 'Talk-to' with 'Metamorphosis' for Baby Chinchompa pet.",
-		position = 82,
+		position = 11,
 		group = "Talk-To"
 	)
 	default boolean swapMetamorphosis()
@@ -1139,7 +1151,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapEnchant",
 		name = "Enchant",
 		description = "Swap Talk-to with Enchant for Eluned",
-		position = 82,
+		position = 12,
 		group = "Talk-To"
 	)
 	default boolean swapEnchant()
@@ -1147,13 +1159,15 @@ public interface MenuEntrySwapperConfig extends Config
 		return true;
 	}
 
+	//------------------------------------------------------------//
+	// Teleportation
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "swapFairyRing",
 		name = "Fairy Ring",
 		description = "Swap 'Zanaris' with 'Last-destination' or 'Configure' on Fairy rings.",
-		position = 83,
+		position = 0,
 		group = "Teleportation"
 	)
 	default boolean swapFairyRing()
@@ -1165,7 +1179,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "fairyring",
 		name = "Mode",
 		description = "",
-		position = 84,
+		position = 1,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapFairyRing"
@@ -1179,7 +1193,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapObelisk",
 		name = "Obelisk",
 		description = "Swap the options on wilderness obelisks between 'Activate', 'Set destination' or 'Teleport to destination'.",
-		position = 85,
+		position = 2,
 		group = "Teleportation"
 	)
 	default boolean swapObelisk()
@@ -1191,7 +1205,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "obelisk",
 		name = "Mode",
 		description = "",
-		position = 86,
+		position = 3,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapObelisk"
@@ -1205,7 +1219,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapTeleportItem",
 		name = "Teleport Items",
 		description = "Swap 'Wear' or 'Wield' with 'Rub' or 'Teleport' on teleport items.<br>Example: Amulet of glory, Explorer's ring, Chronicle.",
-		position = 87,
+		position = 4,
 		group = "Teleportation"
 	)
 	default boolean swapTeleportItem()
@@ -1217,7 +1231,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapWildernessLever",
 		name = "Wilderness Lever",
 		description = "Swap the wilderness lever left click to be Edgeville/Ardougne.",
-		position = 88,
+		position = 5,
 		group = "Teleportation"
 	)
 	default boolean swapWildernessLever()
@@ -1229,7 +1243,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapNexus",
 		name = "Portal Nexus",
 		description = "Makes the teleport menu have priority over the left click destination on the portal nexus.",
-		position = 99,
+		position = 6,
 		group = "Teleportation"
 	)
 	default boolean swapNexus()
@@ -1241,7 +1255,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapGamesNecklace",
 		name = "Swap Games Necklace",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Games Necklace.",
-		position = 100,
+		position = 7,
 		group = "Teleportation"
 	)
 	default boolean getGamesNecklace()
@@ -1253,7 +1267,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "gamesNecklaceMode",
 		name = "Mode",
 		description = "",
-		position = 101,
+		position = 8,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapGamesNecklace"
@@ -1267,7 +1281,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapDuelingRing",
 		name = "Swap Dueling Ring",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Ring of Dueling.",
-		position = 102,
+		position = 9,
 		group = "Teleportation"
 	)
 	default boolean getDuelingRing()
@@ -1279,7 +1293,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "duelingRingMode",
 		name = "Mode",
 		description = "",
-		position = 103,
+		position = 10,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapDuelingRing"
@@ -1293,7 +1307,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapGlory",
 		name = "Swap Glory",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Amulet of Glory / Amulet of Eternal Glory.",
-		position = 104,
+		position = 11,
 		group = "Teleportation"
 	)
 	default boolean getGlory()
@@ -1305,7 +1319,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "gloryMode",
 		name = "Mode",
 		description = "",
-		position = 105,
+		position = 12,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapGlory"
@@ -1319,7 +1333,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapSkill",
 		name = "Swap Skill",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Skills Necklace.",
-		position = 106,
+		position = 13,
 		group = "Teleportation"
 	)
 	default boolean getSkillsNecklace()
@@ -1331,7 +1345,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "skillsnecklacemode",
 		name = "Mode",
 		description = "",
-		position = 107,
+		position = 14,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapSkill"
@@ -1345,7 +1359,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapPassage",
 		name = "Swap Passage",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Necklace of Passage.",
-		position = 108,
+		position = 15,
 		group = "Teleportation"
 	)
 	default boolean getNecklaceofPassage()
@@ -1357,7 +1371,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "necklaceofpassagemode",
 		name = "Mode",
 		description = "",
-		position = 109,
+		position = 16,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapPassage"
@@ -1371,7 +1385,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapDigsite",
 		name = "Swap Digsite",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Digsite Pendant.",
-		position = 110,
+		position = 17,
 		group = "Teleportation"
 	)
 	default boolean getDigsitePendant()
@@ -1383,7 +1397,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "digsitependantmode",
 		name = "Mode",
 		description = "",
-		position = 111,
+		position = 18,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapDigsite"
@@ -1397,7 +1411,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapCombat",
 		name = "Swap Combat",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Combat Bracelet.",
-		position = 112,
+		position = 19,
 		group = "Teleportation"
 	)
 	default boolean getCombatBracelet()
@@ -1409,7 +1423,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "combatbraceletmode",
 		name = "Mode",
 		description = "",
-		position = 113,
+		position = 20,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapCombat"
@@ -1423,7 +1437,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapburning",
 		name = "Swap Burning",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Burning Amulet.",
-		position = 114,
+		position = 21,
 		group = "Teleportation"
 	)
 	default boolean getBurningAmulet()
@@ -1435,7 +1449,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "burningamuletmode",
 		name = "Mode",
 		description = "",
-		position = 115,
+		position = 22,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapburning"
@@ -1449,7 +1463,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapxeric",
 		name = "Swap Xeric's",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Xeric's Talisman.",
-		position = 116,
+		position = 23,
 		group = "Teleportation"
 	)
 	default boolean getXericsTalisman()
@@ -1461,7 +1475,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "xericstalismanmode",
 		name = "Mode",
 		description = "",
-		position = 117,
+		position = 24,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapxeric"
@@ -1475,7 +1489,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "swapwealth",
 		name = "Swap Wealth",
 		description = "Swap the left click 'remove' option with the desired teleport location on a worn Ring of Wealth.",
-		position = 118,
+		position = 25,
 		group = "Teleportation"
 	)
 	default boolean getRingofWealth()
@@ -1487,7 +1501,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "ringofwealthmode",
 		name = "Mode",
 		description = "",
-		position = 119,
+		position = 26,
 		group = "Teleportation",
 		hidden = true,
 		unhide = "swapwealth"
@@ -1497,13 +1511,41 @@ public interface MenuEntrySwapperConfig extends Config
 		return RingOfWealthMode.GRAND_EXCHANGE;
 	}
 
+	@ConfigItem(
+		keyName = "swapslayer",
+		name = "Swap Slayer Ring",
+		description = "",
+		position = 27,
+		group = "Teleportation"
+	)
+	default boolean getSlayerRing()
+	{
+		return false;
+	}
+
+	@ConfigItem(
+		keyName = "slayerringmode",
+		name = "Mode",
+		description = "",
+		position = 28,
+		group = "Teleportation",
+		hidden = true,
+		unhide = "swapslayer"
+	)
+	default SlayerRingMode getSlayerRingMode()
+	{
+		return SlayerRingMode.CHECK;
+	}
+
+	//------------------------------------------------------------//
+	// Right Click Options
 	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "hideExamine",
 		name = "Hide Examine",
 		description = "Hides the 'Examine' option from the right click menu.",
-		position = 120,
+		position = 0,
 		group = "Right Click Options"
 	)
 	default boolean hideExamine()
@@ -1515,7 +1557,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideTradeWith",
 		name = "Hide Trade With",
 		description = "Hides the 'Trade with' option from the right click menu.",
-		position = 121,
+		position = 1,
 		group = "Right Click Options"
 	)
 	default boolean hideTradeWith()
@@ -1527,7 +1569,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideReport",
 		name = "Hide Report",
 		description = "Hides the 'Report' option from the right click menu.",
-		position = 122,
+		position = 2,
 		group = "Right Click Options"
 	)
 	default boolean hideReport()
@@ -1539,7 +1581,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideLookup",
 		name = "Hide Lookup",
 		description = "Hides the 'Lookup' option from the right click menu.",
-		position = 123,
+		position = 3,
 		group = "Right Click Options"
 	)
 	default boolean hideLookup()
@@ -1551,7 +1593,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideNet",
 		name = "Hide Net",
 		description = "Hides the 'Net' option from the right click menu.",
-		position = 124,
+		position = 4,
 		group = "Right Click Options"
 	)
 	default boolean hideNet()
@@ -1563,7 +1605,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideBait",
 		name = "Hide Bait",
 		description = "Hides the 'Bait' option from the right click menu.",
-		position = 125,
+		position = 5,
 		group = "Right Click Options"
 	)
 	default boolean hideBait()
@@ -1571,13 +1613,15 @@ public interface MenuEntrySwapperConfig extends Config
 		return false;
 	}
 
-	//----------------------Untradeables---------------------------//
+	//------------------------------------------------------------//
+	// Untradeables
+	//------------------------------------------------------------//
 
 	@ConfigItem(
 		keyName = "hideDestroyRunepouch",
 		name = "Hide Destroy on Rune Pouch",
 		description = "Hides the 'Destroy' option when right clicking a Rune pouch.",
-		position = 126,
+		position = 0,
 		group = "Untradeables"
 	)
 	default boolean hideDestroyRunepouch()
@@ -1589,7 +1633,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideDestroyCoalbag",
 		name = "Hide Destroy on Coal bag",
 		description = "Hides the 'Destroy' option when right clicking a Coal bag.",
-		position = 127,
+		position = 1,
 		group = "Untradeables"
 	)
 	default boolean hideDestroyCoalbag()
@@ -1601,7 +1645,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideDestroyHerbsack",
 		name = "Hide Destroy on Herb sack",
 		description = "Hides the 'Destroy' option when right clicking a Herb sack.",
-		position = 128,
+		position = 2,
 		group = "Untradeables"
 	)
 	default boolean hideDestroyHerbsack()
@@ -1613,7 +1657,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideDestroyBoltpouch",
 		name = "Hide Destroy on Bolt pouch",
 		description = "Hides the 'Destroy' option when right clicking a Bolt pouch.",
-		position = 129,
+		position = 3,
 		group = "Untradeables"
 	)
 	default boolean hideDestroyBoltpouch()
@@ -1625,7 +1669,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideDestroyGembag",
 		name = "Hide Destroy on Gem bag",
 		description = "Hides the 'Destroy' option when right clicking a Gem bag.",
-		position = 130,
+		position = 4,
 		group = "Untradeables"
 	)
 	default boolean hideDestroyGembag()
@@ -1637,7 +1681,7 @@ public interface MenuEntrySwapperConfig extends Config
 		keyName = "hideDropRunecraftingPouch",
 		name = "Hide Drop on RC pouches",
 		description = "Hides the 'Drop' option when right clicking a Small, Medium, Large, or Giant pouch.",
-		position = 131,
+		position = 5,
 		group = "Untradeables"
 	)
 	default boolean hideDropRunecraftingPouch()
@@ -1646,30 +1690,30 @@ public interface MenuEntrySwapperConfig extends Config
 	}
 
 	//------------------------------------------------------------//
-
-	@ConfigItem(
-		keyName = "swapImps",
-		name = "Impling Jars",
-		description = "Don't open implings if bank has a clue.",
-		position = 132,
-		group = "Miscellaneous"
-	)
-	default boolean swapImps()
-	{
-		return false;
-	}
-
-	@ConfigItem(
-		keyName = "charterOption",
-		name = "Trader Crew",
-		description = "Configure whether you want Charter or Trade to be the first option of Trader Crewmembers.",
-		position = 133,
-		group = "Miscellaneous"
-	)
-	default CharterOption charterOption()
-	{
-		return CharterOption.TRADE;
-	}
-
+	// PVM
 	//------------------------------------------------------------//
+
+	@ConfigItem(
+		keyName = "removeFreezePlayerToB",
+		name = "Remove freeze in ToB",
+		description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in ToB",
+		position = 0
+	)
+
+	default boolean getRemoveFreezePlayerToB()
+		{
+			return true;
+		}
+
+	@ConfigItem(
+		keyName = "removeFreezePlayerCoX",
+		name = "Remove freeze in CoX",
+		description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in CoX",
+		position = 1
+	)
+
+	default boolean getRemoveFreezePlayerCoX()
+		{
+			return true;
+		}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index 7619f61394..c1ce4311b5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -53,6 +53,7 @@ import static net.runelite.api.MenuAction.WALK;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
+import net.runelite.api.Varbits;
 import static net.runelite.api.Varbits.BUILDING_MODE;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.ConfigChanged;
@@ -105,6 +106,14 @@ public class MenuEntrySwapperPlugin extends Plugin
 	private static final String CONFIG_GROUP = "shiftclick";
 	private static final String ITEM_KEY_PREFIX = "item_";
 	private static final int PURO_PURO_REGION_ID = 10307;
+	private static final String WALK_HERE = "WALK HERE";
+	private static final String CANCEL = "CANCEL";
+	private static final String CAST_OPTIONS_ATTACK = "CAST";
+	public static final HashSet<String> CAST_OPTIONS_KEYWORDS = new HashSet<>();
+		static
+		{
+			CAST_OPTIONS_KEYWORDS.add(CAST_OPTIONS_ATTACK);
+		}
 
 	private MenuEntry[] entries;
 	private final Set<Integer> leftClickConstructionIDs = new HashSet<>();
@@ -537,6 +546,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}
 
+		final String pOptionToReplace = Text.removeTags(event.getOption()).toUpperCase();
 		final int eventId = event.getIdentifier();
 		final String option = Text.standardize(event.getOption());
 		final String target = Text.standardize(event.getTarget());
@@ -901,6 +911,19 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
+		//If the option is already to walk there, or cancel we don't need to swap it with anything
+		if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE))
+			{
+				return;
+			}
+
+		if (((config.getRemoveFreezePlayerCoX() &&  client.getVar(Varbits.IN_RAID) == 1)
+		|| (config.getRemoveFreezePlayerToB() &&  client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
+		&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
+			{
+				addswap(pOptionToReplace);
+			}
+
 		if (option.equals("talk-to"))
 		{
 			if (config.swapPickpocket())
@@ -1554,4 +1577,47 @@ public class MenuEntrySwapperPlugin extends Plugin
 	{
 		menuManager.removePriorityEntry("climb-down");
 	}
+
+/**
+ * Swaps menu entries if the entries could be found. This places Walk Here where the top level menu option was.
+ * @param pOptionToReplace The String containing the Menu Option that needs to be replaced. IE: "Attack", "Chop Down".
+ */
+	private void addswap(String pOptionToReplace)
+	{
+		MenuEntry[] entries = client.getMenuEntries();
+		Integer walkHereEntry = searchIndex(entries, WALK_HERE);
+		Integer entryToReplace = searchIndex(entries, pOptionToReplace);
+
+		if (walkHereEntry != null
+				&& entryToReplace != null)
+			{
+			MenuEntry walkHereMenuEntry = entries[walkHereEntry];
+			entries[walkHereEntry] = entries[entryToReplace];
+			entries[entryToReplace] = walkHereMenuEntry;
+			client.setMenuEntries(entries);
+			}
+	}
+
+/**
+ * Finds the index of the menu that contains the verbiage we are looking for.
+ * @param pMenuEntries The list of {@link MenuEntry}s.
+ * @param pMenuEntryToSearchFor The Option in the menu to search for.
+ * @return The index location or null if it was not found.
+ */
+	private Integer searchIndex(MenuEntry[] pMenuEntries, String pMenuEntryToSearchFor)
+	{
+		Integer indexLocation = 0;
+
+		for (MenuEntry menuEntry : pMenuEntries)
+			{
+			String entryOption = Text.removeTags(menuEntry.getOption()).toUpperCase();
+
+			if (entryOption.equals(pMenuEntryToSearchFor))
+				{
+				return indexLocation;
+				}
+			indexLocation++;
+			}
+		return null;
+	}
 }