diff --git a/data/src/pack/inv.pack b/data/src/pack/inv.pack
index c8c5dfb671..5f81fcb8c1 100644
--- a/data/src/pack/inv.pack
+++ b/data/src/pack/inv.pack
@@ -141,4 +141,3 @@
 140=trail_puzzleinv
 141=trail_rewardinv
 142=duelarrows
-143=shrimp_and_parrot
diff --git a/data/src/scripts/_unpack/all.inv b/data/src/scripts/_unpack/all.inv
index 4f5f2e75e8..1073cf5055 100644
--- a/data/src/scripts/_unpack/all.inv
+++ b/data/src/scripts/_unpack/all.inv
@@ -3,21 +3,6 @@ size=40
 stackall=yes
 protect=no
 
-[fishrestaurant]
-size=1
-
-[silvershop]
-size=1
-
-[gemshop3]
-size=1
-
-[spiceshop]
-size=1
-
-[furstall]
-size=1
-
 [trail_puzzleinv]
 scope=temp
 size=25
diff --git a/data/src/scripts/areas/area_alkharid/configs/alkharid.inv b/data/src/scripts/areas/area_alkharid/configs/alkharid.inv
index b2a705c19a..849e181aea 100644
--- a/data/src/scripts/areas/area_alkharid/configs/alkharid.inv
+++ b/data/src/scripts/areas/area_alkharid/configs/alkharid.inv
@@ -1,17 +1,15 @@
-[skirtshop]
-// https://classic.runescape.wiki/w/Ranael%27s_Plateskirt_Shop
-// https://storage.googleapis.com/tannerdino/images/rsal5.gif (full stocks)
+[scimitarshop]
+// https://classic.runescape.wiki/w/Zeke%27s_Scimitar_Shop
+// https://web.archive.org/web/20040928001706im_/http://runevillage.com/images/rsal2.gif
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_plateskirt,5,100
-stock2=iron_plateskirt,3,400
-stock3=steel_plateskirt,2,900
-stock4=black_plateskirt,1,1200
-stock5=mithril_plateskirt,1,2000
-stock6=adamant_plateskirt,1,13000
+stock1=bronze_scimitar,5,100
+stock2=iron_scimitar,3,200
+stock3=steel_scimitar,2,600
+stock4=mithril_scimitar,1,4000
 
 [legsshop]
 // https://classic.runescape.wiki/w/Louie%27s_Legs
@@ -28,6 +26,36 @@ stock4=black_platelegs,1,1200
 stock5=mithril_platelegs,1,2000
 stock6=adamant_platelegs,1,13000
 
+[generalshop3]
+// https://classic.runescape.wiki/w/Al_Kharid_General_Store
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=pot_empty,3,100
+stock2=jug_empty,2,100
+stock3=shears,2,100
+stock4=bucket_empty,2,100
+stock5=tinderbox,2,100
+stock6=chisel,2,100
+stock7=hammer,5,100
+
+[skirtshop]
+// https://classic.runescape.wiki/w/Ranael%27s_Plateskirt_Shop
+// https://storage.googleapis.com/tannerdino/images/rsal5.gif (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bronze_plateskirt,5,100
+stock2=iron_plateskirt,3,400
+stock3=steel_plateskirt,2,900
+stock4=black_plateskirt,1,1200
+stock5=mithril_plateskirt,1,2000
+stock6=adamant_plateskirt,1,13000
+
 [gemshop2]
 // https://classic.runescape.wiki/w/Al_Kharid_gem_stall
 // https://storage.googleapis.com/tannerdino/images/AlKharid2.png
@@ -45,36 +73,6 @@ stock6=emerald,1,35000
 stock7=ruby,0,2000
 stock8=diamond,0,4000
 
-[scimitarshop]
-// https://classic.runescape.wiki/w/Zeke%27s_Scimitar_Shop
-// https://web.archive.org/web/20040928001706im_/http://runevillage.com/images/rsal2.gif
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bronze_scimitar,5,100
-stock2=iron_scimitar,3,200
-stock3=steel_scimitar,2,600
-stock4=mithril_scimitar,1,4000
-
-[generalshop3]
-// https://classic.runescape.wiki/w/Al_Kharid_General_Store
-// recheck
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=jug_empty,2,100
-stock3=shears,2,100
-stock4=bucket_empty,2,100
-stock5=tinderbox,2,100
-stock6=chisel,2,100
-stock7=hammer,5,100
-// recheck
-
 [craftingshop2]
 // https://classic.runescape.wiki/w/Dommik%27s_Crafting_Equipment_Shop
 // https://storage.googleapis.com/tannerdino/images/AlKharid4.png (full stocks)
diff --git a/data/src/scripts/areas/area_ardougne_east/configs/ardougne_east.inv b/data/src/scripts/areas/area_ardougne_east/configs/ardougne_east.inv
index ec7a46e0cc..468e06a703 100644
--- a/data/src/scripts/areas/area_ardougne_east/configs/ardougne_east.inv
+++ b/data/src/scripts/areas/area_ardougne_east/configs/ardougne_east.inv
@@ -1,25 +1,16 @@
-[spicestall]
-// https://classic.runescape.wiki/w/Spices_Stall
-// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne4.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=spicespot,1,100
-
-[ardougnegemstall]
-// https://classic.runescape.wiki/w/Gems_Stall
-// https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne7.jpg
+[topshop]
+// https://classic.runescape.wiki/w/Zenesha%27s_Plate_Mail_Top_Shop
+// https://web.archive.org/web/20120207054639im_/http://runehq.com/images/cityguides/Ardougne_East/platebodyshop.png (full stocks)
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=sapphire,2,15000
-stock2=emerald,1,35000
-stock3=ruby,1,60000
-stock4=diamond,0,4000
+stock1=bronze_platebody,3,100
+stock2=iron_platebody,1,200
+stock3=steel_platebody,1,400
+stock4=black_platebody,1,3000
+stock5=mithril_platebody,1,3000
 
 [bakery]
 // https://classic.runescape.wiki/w/Bakers_Stall
@@ -34,31 +25,9 @@ stock1=bread,10,100
 stock2=cake,3,800
 stock3=chocolate_slice,8,200
 // stock4=chocolate_bar,7,200
+//TODO Try to find out when the Chocolate bar was added to the store.
 
-// [ardougne_baker_east]
-// https://oldschool.runescape.wiki/w/Ardougne_Baker%27s_Stall. (Trivia)
-// scope=shared
-// size=40
-// restock=yes
-// stackall=yes
-// allstock=no
-// stock1=bread,10,150
-// stock2=cake,3,1000
-// stock3=chocolate_slice,6,400
-// stock4=chocolate_bar,9,250
-
-[furshop]
-// https://classic.runescape.wiki/w/Fur_Stall
-// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne3.jpg
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bear_fur,3,100
-stock2=grey_wolf_fur,3,100
-
-[silverstall]
+[silvershop]
 // https://classic.runescape.wiki/w/Silver_Stall
 // https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne9.jpg (full stocks)
 scope=shared
@@ -69,20 +38,19 @@ allstock=no
 stock1=nostringstar,2,100
 stock2=silver_ore,1,2000
 stock3=silver_bar,1,1000
+//This information has been confirmed via rsproxy
+//that some accounts are using the ardougne silver merchant shop id 55 or 72
+//depending on something x that I don't know.
+//ID 72 is used at least by new characters who haven't done anything in the game yet.
 
-[topshop]
-// https://classic.runescape.wiki/w/Zenesha%27s_Plate_Mail_Top_Shop
-// https://web.archive.org/web/20120207054639im_/http://runehq.com/images/cityguides/Ardougne_East/platebodyshop.png (full stocks)
+[gemshop3]
+// https://oldschool.runescape.wiki/w/Unused_shops
 scope=shared
-size=40
+size=8
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_platebody,3,100
-stock2=iron_platebody,1,200
-stock3=steel_platebody,1,400
-stock4=black_platebody,1,3000
-stock5=mithril_platebody,1,3000
+//unused
 
 [adventurershop]
 // empty vials could be a default stock of 300
@@ -102,4 +70,91 @@ stock6=tinderbox,2,100
 stock7=ball_of_wool,30,100
 stock8=bronze_arrow,500,10
 stock9=rope,20,100
-stock10=papyrus,50,1000
\ No newline at end of file
+stock10=papyrus,50,1000
+
+[spiceshop]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=1
+restock=yes
+stackall=yes
+allstock=no
+stock1=spicespot,1,100
+//unused
+
+[furshop]
+// https://classic.runescape.wiki/w/Fur_Stall
+// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne3.jpg
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bear_fur,3,100
+stock2=grey_wolf_fur,3,100
+
+[silverstall]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=nostringstar,2,100
+stock2=silver_ore,1,2000
+stock3=silver_bar,1,1000
+//This information has been confirmed via rsproxy
+//that some accounts are using the ardougne silver merchant shop id 55 or 72
+//depending on something x that I don't know.
+//ID 72 is used at least by new characters who haven't done anything in the game yet.
+
+[ardougnegemstall]
+// https://classic.runescape.wiki/w/Gems_Stall
+// https://web.archive.org/web/20120207054638im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne7.jpg
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=sapphire,2,15000
+stock2=emerald,1,35000
+stock3=ruby,1,60000
+stock4=diamond,0,4000
+//This store uses 2025 in the osrs side ID 429.
+
+[spicestall]
+// https://classic.runescape.wiki/w/Spices_Stall
+// https://web.archive.org/web/20120207054637im_/http://runehq.com/images/cityguides/Ardougne_East/ardougne4.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=spicespot,1,100
+//stock2=knife,1,2
+//stock3=garlic,2,5
+//TODO Try to find out when the knife and garlic was added to the store.
+
+[furstall]
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=2
+restock=yes
+stackall=yes
+allstock=no
+stock1=bear_fur,3,100
+stock2=grey_wolf_fur,3,100
+//unused
+
+//inv_346 Added in a hidden update on December 5, 2005??.
+//[bakery2]
+// https://oldschool.runescape.wiki/w/Ardougne_Baker%27s_Stall. (Trivia)
+//scope=shared
+//size=40
+//restock=yes
+//stackall=yes
+//allstock=no
+//stock1=bread,10,150
+//stock2=cake,3,1000
+//stock3=chocolate_slice,6,400
+//stock4=chocolate_bar,9,250
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_ardougne_east/configs/legends_guild/legends_guild.inv b/data/src/scripts/areas/area_ardougne_east/configs/legends_guild/legends_guild.inv
index 90280c25c9..17d8c79b53 100644
--- a/data/src/scripts/areas/area_ardougne_east/configs/legends_guild/legends_guild.inv
+++ b/data/src/scripts/areas/area_ardougne_east/configs/legends_guild/legends_guild.inv
@@ -25,4 +25,4 @@ stock2=dusty_key,5,100
 stock3=silverlight,4,100
 stock3=melzarkey,3,300
 stock4=dragonshield_b,1,500
-stock5=cape_of_legends,3,500
+stock5=cape_of_legends,3,500
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_brimhaven/configs/brimhaven.inv b/data/src/scripts/areas/area_brimhaven/configs/brimhaven.inv
index a66b8be6e8..93ab310e9b 100644
--- a/data/src/scripts/areas/area_brimhaven/configs/brimhaven.inv
+++ b/data/src/scripts/areas/area_brimhaven/configs/brimhaven.inv
@@ -1,3 +1,18 @@
+[fishrestaurant]
+// https://classic.runescape.wiki/w/The_Shrimp_and_Parrot
+// https://storage.googleapis.com/tannerdino/images/brimhaven7.jpg
+// https://oldschool.runescape.wiki/w/Unused_shops
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=herring,5,900
+stock2=cod,5,1100
+stock3=tuna,5,2300
+stock4=lobster,3,2600
+stock5=swordfish,2,2900
+
 [amuletshop]
 // https://oldschool.runescape.wiki/w/Davon%27s_Amulet_Store.#Default
 // https://storage.googleapis.com/tannerdino/images/brimhaven6.jpg
@@ -12,17 +27,18 @@ stock3=amulet_of_defence,0,200
 stock4=amulet_of_strength,0,200
 stock5=amulet_of_power,0,200
 
-// todo: real inv name? surely this should exist right?
-[shrimp_and_parrot]
+//inv_157 released 14 September 2004.
+// [karamja_fishrestaurant]
 // https://classic.runescape.wiki/w/The_Shrimp_and_Parrot
 // https://storage.googleapis.com/tannerdino/images/brimhaven7.jpg
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=herring,5,900
-stock2=cod,5,1100
-stock3=tuna,5,2300
-stock4=lobster,3,2600
-stock5=swordfish,2,2900
\ No newline at end of file
+//scope=shared
+//size=40
+//restock=yes
+//stackall=yes
+//allstock=no
+//stock1=herring,5,900
+//stock2=cod,5,1100
+//stock3=tuna,5,2300
+//stock4=lobster,3,2600
+//stock5=swordfish,2,2900
+//stock6=tbwt_cooked_karambwan,3,900
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_brimhaven/configs/brimhaven.npc b/data/src/scripts/areas/area_brimhaven/configs/brimhaven.npc
index 31e9245ca5..3f194c6073 100644
--- a/data/src/scripts/areas/area_brimhaven/configs/brimhaven.npc
+++ b/data/src/scripts/areas/area_brimhaven/configs/brimhaven.npc
@@ -52,7 +52,7 @@ head2=model_79_idk_head
 hitpoints=7
 param=damagetype,^crush_style
 category=shop_keeper
-param=owned_shop,shrimp_and_parrot
+param=owned_shop,fishrestaurant
 param=shop_sell_multiplier,1300
 param=shop_buy_multiplier,750
 param=shop_delta,30
diff --git a/data/src/scripts/areas/area_falador/configs/dwarven_mine.inv b/data/src/scripts/areas/area_falador/configs/dwarven_mine.inv
index ab4cf95a50..d7fd81a25f 100644
--- a/data/src/scripts/areas/area_falador/configs/dwarven_mine.inv
+++ b/data/src/scripts/areas/area_falador/configs/dwarven_mine.inv
@@ -16,21 +16,6 @@ stock7=bronze_bar,0,4000
 stock8=iron_bar,0,4000
 stock9=gold_bar,0,3000
 
-[pickaxeshop]
-// https://classic.runescape.wiki/w/Nurmof%27s_Pickaxe_Shop
-// https://storage.googleapis.com/tannerdino/images/nurmof1.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bronze_pickaxe,6,50
-stock2=iron_pickaxe,5,100
-stock3=steel_pickaxe,4,200
-stock4=mithril_pickaxe,3,300
-stock5=adamant_pickaxe,2,500
-stock6=rune_pickaxe,1,700
-
 [generaldwarf]
 // https://oldschool.runescape.wiki/w/Dwarven_shopping_store
 // https://storage.googleapis.com/tannerdino/images/ShopsgeneralDwarf.png (date 2006-11-06)
@@ -45,4 +30,19 @@ stock3=shears,2,100
 stock4=bucket_empty,2,100
 stock5=tinderbox,2,100
 stock6=chisel,2,100
-stock7=hammer,5,100
\ No newline at end of file
+stock7=hammer,5,100
+
+[pickaxeshop]
+// https://classic.runescape.wiki/w/Nurmof%27s_Pickaxe_Shop
+// https://storage.googleapis.com/tannerdino/images/nurmof1.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bronze_pickaxe,6,50
+stock2=iron_pickaxe,5,100
+stock3=steel_pickaxe,4,200
+stock4=mithril_pickaxe,3,300
+stock5=adamant_pickaxe,2,500
+stock6=rune_pickaxe,1,700
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_gnome/configs/gnome.inv b/data/src/scripts/areas/area_gnome/configs/gnome.inv
index c5ce7f8b4e..1363289252 100644
--- a/data/src/scripts/areas/area_gnome/configs/gnome.inv
+++ b/data/src/scripts/areas/area_gnome/configs/gnome.inv
@@ -1,3 +1,23 @@
+[gnomeshop]
+// dated July 05, 2005
+// https://classic.runescape.wiki/w/Tree_Gnome_Village_General_Store
+// http://web.archive.org/web/20120213031926im_/http://runehq.com/images/cityguides/treegnomevillage/shop.png (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=pot_empty,3,100
+stock2=bronze_pickaxe,5,100
+stock3=jug_empty,2,100
+stock4=shears,2,100
+stock5=bucket_empty,2,100
+stock6=tinderbox,2,100
+stock7=chisel,2,100
+stock8=hammer,5,100
+stock9=bronze_arrow,30,100
+stock10=cooked_meat,2,100
+
 [gnomeshop_rometti]
 // https://classic.runescape.wiki/w/Rometti%27s_fashion_outlet
 // https://storage.googleapis.com/tannerdino/images/rsgnome13.gif (full stocks)
@@ -27,6 +47,39 @@ stock18=gnome_boots_blue,5,200
 stock19=gnome_boots_cream,5,200
 stock20=gnome_boots_turqoise,5,200
 
+[gnomeshop_gulluck]
+// https://classic.runescape.wiki/w/Gulluck_and_Sons
+// https://web.archive.org/web/20110722115315im_/http://www.runevillage.com/images/rs2Cities/rsgnome17.gif (full stocks)
+// https://web.archive.org/web/20111216182054im_/http://www.runehq.com/images/cityguides/Sggulluck.jpg
+// https://www.spookspring.com/noobsquad/imagegif/spookart/gnome.GIF
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=bronze_arrow,200,10
+stock2=bolt,150,10
+stock3=pearl_bolt,1,1500
+stock4=shortbow,4,100
+stock5=longbow,2,200
+stock6=crossbow,2,400
+stock7=bronze_arrowheads,200,10
+stock8=iron_arrowheads,180,20
+stock9=steel_arrowheads,160,40
+stock10=mithril_arrowheads,140,80
+stock11=iron_axe,5,200
+stock12=steel_axe,3,400
+stock13=iron_battleaxe,5,100
+stock14=steel_battleaxe,2,200
+stock15=mithril_battleaxe,1,3000
+stock16=bronze_2h_sword,4,200
+stock17=iron_2h_sword,3,300
+stock18=steel_2h_sword,2,500
+stock19=black_2h_sword,1,700
+stock20=mithril_2h_sword,1,1000
+stock21=adamant_2h_sword,1,15000
+
+
 [gnomeshop_heck]
 // https://classic.runescape.wiki/w/Heckel_funch%27s_grocery_store
 // https://storage.googleapis.com/tannerdino/images/rsgnome16.gif (full stocks)
@@ -99,58 +152,6 @@ stock5=premade_pineapple_punch,10,100
 stock6=premade_sgg,10,100
 stock7=premade_wizard_blizzard,10,100
 
-[gnomeshop_gulluck]
-// https://classic.runescape.wiki/w/Gulluck_and_Sons
-// https://web.archive.org/web/20110722115315im_/http://www.runevillage.com/images/rs2Cities/rsgnome17.gif (full stocks)
-// https://web.archive.org/web/20111216182054im_/http://www.runehq.com/images/cityguides/Sggulluck.jpg
-// https://www.spookspring.com/noobsquad/imagegif/spookart/gnome.GIF
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=bronze_arrow,200,10
-stock2=bolt,150,10
-stock3=pearl_bolt,1,1500
-stock4=shortbow,4,100
-stock5=longbow,2,200
-stock6=crossbow,2,400
-stock7=bronze_arrowheads,200,10
-stock8=iron_arrowheads,180,20
-stock9=steel_arrowheads,160,40
-stock10=mithril_arrowheads,140,80
-stock11=iron_axe,5,200
-stock12=steel_axe,3,400
-stock13=iron_battleaxe,5,100
-stock14=steel_battleaxe,2,200
-stock15=mithril_battleaxe,1,3000
-stock16=bronze_2h_sword,4,200
-stock17=iron_2h_sword,3,300
-stock18=steel_2h_sword,2,500
-stock19=black_2h_sword,1,700
-stock20=mithril_2h_sword,1,1000
-stock21=adamant_2h_sword,1,15000
-
-[gnomeshop]
-// dated July 05, 2005
-// https://classic.runescape.wiki/w/Tree_Gnome_Village_General_Store
-// http://web.archive.org/web/20120213031926im_/http://runehq.com/images/cityguides/treegnomevillage/shop.png (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=bronze_pickaxe,5,100
-stock3=jug_empty,2,100
-stock4=shears,2,100
-stock5=bucket_empty,2,100
-stock6=tinderbox,2,100
-stock7=chisel,2,100
-stock8=hammer,5,100
-stock9=bronze_arrow,30,100
-stock10=cooked_meat,2,100
-
 [giannerestaurant]
 // https://oldschool.runescape.wiki/w/Gianne%27s_Restaurant
 // https://storage.googleapis.com/tannerdino/images/rsgnome10.gif (full stocks)
diff --git a/data/src/scripts/areas/area_karamja/configs/karamja.inv b/data/src/scripts/areas/area_karamja/configs/karamja.inv
index 26f3251e89..e58374dea0 100644
--- a/data/src/scripts/areas/area_karamja/configs/karamja.inv
+++ b/data/src/scripts/areas/area_karamja/configs/karamja.inv
@@ -1,3 +1,31 @@
+[boozeshop]
+// https://oldschool.runescape.wiki/w/Karamja_Wines,_Spirits,_and_Beers.
+// https://storage.googleapis.com/tannerdino/images/KaramjaRum.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=beer,3,100
+stock2=karamja_rum,3,100
+stock3=jug_wine,1,15000
+
+[generalshop7]
+// https://web.archive.org/web/20120411154205im_/http://www.runehq.com/images/cityguides/karamjacity/karamjageneralstock.gif
+// https://storage.googleapis.com/tannerdino/images/karamja7.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=pot_empty,3,100
+stock2=jug_empty,2,100
+stock3=shears,2,100
+stock4=bucket_empty,2,100
+stock5=tinderbox,2,100
+stock6=chisel,2,100
+stock7=hammer,5,100
+
 [junglestore]
 // https://oldschool.runescape.wiki/w/Jiminua%27s_Jungle_Store.
 // https://web.archive.org/web/20060525181155im_/http://www.runehq.com/images/cityguides/Tai_Bwo_Wannai/taibwowannaigeneralstore.png
@@ -30,32 +58,4 @@ stock21=spade,10,500
 stock22=bronze_axe,2,500
 stock23=bronze_pickaxe,2,500
 stock24=iron_axe,5,700
-stock25=bronze_bar,10,500
-
-[boozeshop]
-// https://oldschool.runescape.wiki/w/Karamja_Wines,_Spirits,_and_Beers.
-// https://storage.googleapis.com/tannerdino/images/KaramjaRum.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=beer,3,100
-stock2=karamja_rum,3,100
-stock3=jug_wine,1,15000
-
-[generalshop7]
-// https://web.archive.org/web/20120411154205im_/http://www.runehq.com/images/cityguides/karamjacity/karamjageneralstock.gif
-// https://storage.googleapis.com/tannerdino/images/karamja7.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=jug_empty,2,100
-stock3=shears,2,100
-stock4=bucket_empty,2,100
-stock5=tinderbox,2,100
-stock6=chisel,2,100
-stock7=hammer,5,100
\ No newline at end of file
+stock25=bronze_bar,10,500
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_lostcity/configs/lostcity.inv b/data/src/scripts/areas/area_lostcity/configs/lostcity.inv
index b7ee68e27b..9615092d2f 100644
--- a/data/src/scripts/areas/area_lostcity/configs/lostcity.inv
+++ b/data/src/scripts/areas/area_lostcity/configs/lostcity.inv
@@ -1,23 +1,23 @@
-[cheapringshop]
-// https://classic.runescape.wiki/w/Ruby_Ring_Shop
-// http://web.archive.org/web/20060523095208im_/http://www.runehq.com/images/cityguides/irksolrubyrings.png (full stocks)
+[dragonswordshop]
+// https://oldschool.runescape.wiki/w/Jukat_(shop)
+// http://web.archive.org/web/20060523095020im_/http://www.runehq.com/images/cityguides/jakutsdragsale.png (full stocks)
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=ruby_ring,5,500
+stock1=dragon_longsword,2,500
+stock2=dragon_dagger,2,500
 
-[dragonswordshop]
-// https://oldschool.runescape.wiki/w/Jukat_(shop)
-// http://web.archive.org/web/20060523095020im_/http://www.runehq.com/images/cityguides/jakutsdragsale.png (full stocks)
+[cheapringshop]
+// https://classic.runescape.wiki/w/Ruby_Ring_Shop
+// http://web.archive.org/web/20060523095208im_/http://www.runehq.com/images/cityguides/irksolrubyrings.png (full stocks)
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=dragon_longsword,2,500
-stock2=dragon_dagger,2,500
+stock1=ruby_ring,5,500
 
 [generalshop8]
 // https://classic.runescape.wiki/w/Zanaris_General_Store
diff --git a/data/src/scripts/areas/area_port_sarim/configs/port_sarim.inv b/data/src/scripts/areas/area_port_sarim/configs/port_sarim.inv
index 3be59ff900..13611edf6c 100644
--- a/data/src/scripts/areas/area_port_sarim/configs/port_sarim.inv
+++ b/data/src/scripts/areas/area_port_sarim/configs/port_sarim.inv
@@ -1,53 +1,36 @@
-[fishingshop]
-// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/fishyshop.jpg
-// https://classic.runescape.wiki/w/Gerrant%27s_Fishing_Supplies
-// https://web.archive.org/web/20130122003100im_/http://www.runehq.com/image/cityguides/portsarim/fishshop.png
+[foodshop]
+// https://oldschool.runescape.wiki/w/Unused_shops
 scope=shared
-size=40
+size=10
 restock=yes
 stackall=yes
 allstock=no
-stock1=net,5,100
-stock2=fishing_rod,5,100
-stock3=fly_fishing_rod,5,100
-stock4=harpoon,2,400
-stock5=lobster_pot,2,400
-stock6=fishing_bait,1500,1
-stock7=feather,1000,1
-stock8=raw_shrimp,0,300
-stock9=raw_sardine,200,1
-stock10=raw_herring,0,900
-stock11=raw_anchovies,0,1200
-stock12=raw_trout,0,1500
-stock13=raw_pike,0,1800
-stock14=raw_salmon,0,2100
-stock15=raw_tuna,0,2300
-stock16=raw_lobster,0,2600
-stock17=raw_swordfish,0,2900
+stock1=pot_flour,3,100
+stock2=raw_beef,1,100
+stock3=cabbage,3,100
+stock4=banana,3,100
+stock5=redberry,1,100
+stock6=bread,0,100
+stock7=chocolate_bar,1,95
+stock8=cheese,3,100
+stock9=tomato,3,100
+stock10=potato,1,100
+//unused
 
-[goldshop]
-// https://classic.runescape.wiki/w/Grum%27s_Jewellers
-// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/jewels.jpg
+[battleaxeshop]
+// https://classic.runescape.wiki/w/Brian%27s_Great_Axes
+// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/axes.jpg
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=gold_ring,0,1000
-stock2=sapphire_ring,0,1000
-stock3=emerald_ring,0,2000
-stock4=ruby_ring,0,2000
-stock5=diamond_ring,0,3000
-stock6=gold_necklace,0,1000
-stock7=sapphire_necklace,0,2000
-stock8=emerald_necklace,0,2000
-stock9=ruby_necklace,0,3000
-stock10=diamond_necklace,0,3000
-stock11=strung_gold_amulet,0,1000
-stock12=strung_sapphire_amulet,0,2000
-stock13=strung_emerald_amulet,0,3000
-stock14=strung_ruby_amulet,0,4000
-stock15=strung_diamond_amulet,0,5000
+stock1=bronze_battleaxe,4,200
+stock2=iron_battleaxe,3,300
+stock3=steel_battleaxe,2,500
+stock4=black_battleaxe,1,700
+stock5=mithril_battleaxe,1,1000
+stock6=adamant_battleaxe,1,15000
 
 [magicshop]
 // https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/sarimrunes.jpg
@@ -68,20 +51,56 @@ stock9=eye_of_newt,300,10
 stock10=bluewizhat,1,100
 stock11=blackwizhat,1,100
 
-[battleaxeshop]
-// https://classic.runescape.wiki/w/Brian%27s_Great_Axes
-// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/axes.jpg
+[goldshop]
+// https://classic.runescape.wiki/w/Grum%27s_Jewellers
+// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/jewels.jpg
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_battleaxe,4,200
-stock2=iron_battleaxe,3,300
-stock3=steel_battleaxe,2,500
-stock4=black_battleaxe,1,700
-stock5=mithril_battleaxe,1,1000
-stock6=adamant_battleaxe,1,15000
+stock1=gold_ring,0,1000
+stock2=sapphire_ring,0,1000
+stock3=emerald_ring,0,2000
+stock4=ruby_ring,0,2000
+stock5=diamond_ring,0,3000
+stock6=gold_necklace,0,1000
+stock7=sapphire_necklace,0,2000
+stock8=emerald_necklace,0,2000
+stock9=ruby_necklace,0,3000
+stock10=diamond_necklace,0,3000
+stock11=strung_gold_amulet,0,1000
+stock12=strung_sapphire_amulet,0,2000
+stock13=strung_emerald_amulet,0,3000
+stock14=strung_ruby_amulet,0,4000
+stock15=strung_diamond_amulet,0,5000
+
+[fishingshop]
+// https://web.archive.org/web/20111216182350im_/http://www.runehq.com/images/cityguides/fishyshop.jpg
+// https://classic.runescape.wiki/w/Gerrant%27s_Fishing_Supplies
+// https://web.archive.org/web/20130122003100im_/http://www.runehq.com/image/cityguides/portsarim/fishshop.png
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=net,5,100
+stock2=fishing_rod,5,100
+stock3=fly_fishing_rod,5,100
+stock4=harpoon,2,400
+stock5=lobster_pot,2,400
+stock6=fishing_bait,1500,1
+stock7=feather,1000,1
+stock8=raw_shrimp,0,300
+stock9=raw_sardine,200,1
+stock10=raw_herring,0,900
+stock11=raw_anchovies,0,1200
+stock12=raw_trout,0,1500
+stock13=raw_pike,0,1800
+stock14=raw_salmon,0,2100
+stock15=raw_tuna,0,2300
+stock16=raw_lobster,0,2600
+stock17=raw_swordfish,0,2900
 
 [wydinstore]
 // https://oldschool.runescape.wiki/w/Food_Store
diff --git a/data/src/scripts/areas/area_rimmington/configs/rimmington.inv b/data/src/scripts/areas/area_rimmington/configs/rimmington.inv
index acc75772ca..7d6f7148af 100644
--- a/data/src/scripts/areas/area_rimmington/configs/rimmington.inv
+++ b/data/src/scripts/areas/area_rimmington/configs/rimmington.inv
@@ -1,19 +1,3 @@
-[generalshop6]
-// https://classic.runescape.wiki/w/Rimmington_General_Store
-// https://web.archive.org/web/20070824001708im_/http://runehq.com/images/cityguides/Rimmington/r6.jpg (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=jug_empty,2,100
-stock3=shears,2,100
-stock4=bucket_empty,2,100
-stock5=tinderbox,2,100
-stock6=chisel,2,100
-stock7=hammer,5,100
-
 [craftingshop]
 // https://classic.runescape.wiki/w/Rommik%27s_Crafting_Equipment_Shop
 // https://web.archive.org/web/20070824001708im_/http://runehq.com/images/cityguides/Rimmington/rommik.png (full stocks)
@@ -28,4 +12,20 @@ stock3=necklace_mould,2,100
 stock4=amulet_mould,2,100
 stock5=needle,3,100
 stock6=thread,100,5
-stock7=holy_symbol_mould,3,100
\ No newline at end of file
+stock7=holy_symbol_mould,3,100
+
+[generalshop6]
+// https://classic.runescape.wiki/w/Rimmington_General_Store
+// https://web.archive.org/web/20070824001708im_/http://runehq.com/images/cityguides/Rimmington/r6.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=pot_empty,3,100
+stock2=jug_empty,2,100
+stock3=shears,2,100
+stock4=bucket_empty,2,100
+stock5=tinderbox,2,100
+stock6=chisel,2,100
+stock7=hammer,5,100
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_taverly/configs/taverly.inv b/data/src/scripts/areas/area_taverly/configs/taverly.inv
index 2cbe779465..da6b6b7e44 100644
--- a/data/src/scripts/areas/area_taverly/configs/taverly.inv
+++ b/data/src/scripts/areas/area_taverly/configs/taverly.inv
@@ -1,17 +1,3 @@
-[herbloreshop]
-// https://classic.runescape.wiki/w/Jatix%27s_Olde_Herbalist
-// https://web.archive.org/web/20111226165417im_/http://www.runehq.com/images/cityguides/Taverley/taverley_herb.png 
-// Should this store have 800 empty vial and 800 eye of newt in its selection?
-// It's hard to tell based on the picture. The picture is dated September 11, 2005.
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=vial_empty,800,100
-stock3=pestle_and_mortar,3,100
-stock4=eye_of_newt,800,20
-
 [2handedshop]
 // https://classic.runescape.wiki/w/Gaius%27_Two_Handed_Sword_Shop
 // https://web.archive.org/web/20111226165420im_/http://www.runehq.com/images/cityguides/Taverley/taverley_sword.png
@@ -25,4 +11,18 @@ stock2=iron_2h_sword,3,300
 stock3=steel_2h_sword,2,500
 stock4=black_2h_sword,1,700
 stock5=mithril_2h_sword,1,1000
-stock6=adamant_2h_sword,1,15000
\ No newline at end of file
+stock6=adamant_2h_sword,1,15000
+
+[herbloreshop]
+// https://classic.runescape.wiki/w/Jatix%27s_Olde_Herbalist
+// https://web.archive.org/web/20111226165417im_/http://www.runehq.com/images/cityguides/Taverley/taverley_herb.png 
+// Should this store have 800 empty vial and 800 eye of newt in its selection?
+// It's hard to tell based on the picture. The picture is dated September 11, 2005.
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=vial_empty,800,100
+stock3=pestle_and_mortar,3,100
+stock4=eye_of_newt,800,20
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_varrock/configs/champions_guild.inv b/data/src/scripts/areas/area_varrock/configs/champions_guild.inv
index f39b487708..e1b198f9e3 100644
--- a/data/src/scripts/areas/area_varrock/configs/champions_guild.inv
+++ b/data/src/scripts/areas/area_varrock/configs/champions_guild.inv
@@ -1,3 +1,16 @@
+[championshop]
+// https://classic.runescape.wiki/w/Champion%27s_Store
+// https://web.archive.org/web/20111107025524im_/http://runevillage.com/images/rs2Cities/rsVarrock16.gif (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=yes
+stock1=blue_cape,2,1000
+stock2=black_full_helm,1,1000
+stock3=black_platelegs,1,20000
+stock4=adamant_platebody,1,8000
+
 [runiteshop]
 // https://oldschool.runescape.wiki/w/Scavvo%27s_Rune_Store.
 // https://web.archive.org/web/20111107025524im_/http://runevillage.com/images/rs2Cities/rsVarrock15.gif
@@ -14,17 +27,4 @@ stock5=rune_longsword,1,14000
 stock6=rune_sword,1,10000
 stock7=dragonhide_chaps,1,500
 stock8=dragon_vambraces,1,500
-stock9=coif,2,1000
-
-[championshop]
-// https://classic.runescape.wiki/w/Champion%27s_Store
-// https://web.archive.org/web/20111107025524im_/http://runevillage.com/images/rs2Cities/rsVarrock16.gif (full stocks)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=yes
-stock1=blue_cape,2,1000
-stock2=black_full_helm,1,1000
-stock3=black_platelegs,1,20000
-stock4=adamant_platebody,1,14000
\ No newline at end of file
+stock9=coif,2,1000
\ No newline at end of file
diff --git a/data/src/scripts/areas/area_varrock/configs/varrock.inv b/data/src/scripts/areas/area_varrock/configs/varrock.inv
index 64b55d221b..7f3f816661 100644
--- a/data/src/scripts/areas/area_varrock/configs/varrock.inv
+++ b/data/src/scripts/areas/area_varrock/configs/varrock.inv
@@ -1,80 +1,39 @@
-[fancyclothesstore]
-// https://classic.runescape.wiki/w/Tailor%27s_fancy_dress
-// https://storage.googleapis.com/tannerdino/images/varrock14.png
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=chefshat,0,100
-stock2=bluewizhat,3,100
-stock3=yellow_cape,1,100
-stock4=grey_wolf_fur,3,100
-stock5=bear_fur,3,100
-stock6=needle,3,100
-stock7=thread,100,5
-stock8=leather_gloves,10,100
-stock9=leather_boots,10,100
-stock10=priest_robe,3,100
-stock11=priest_gown,3,100
-stock12=brown_apron,1,100
-stock13=pink_skirt,5,100
-stock14=black_skirt,3,100
-stock15=blue_skirt,2,100
-stock16=red_cape,4,100
-stock17=eye_patch,3,2000
-
-[staffshop]
-// https://classic.runescape.wiki/w/Zaff%27s_staff_shop (differences no battlestaves.)
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=plainstaff,5,100
-stock2=magicstaff,5,200
-stock3=staff_of_air,2,1000
-stock4=staff_of_water,2,1000
-stock5=staff_of_earth,2,1000
-stock6=staff_of_fire,2,1000
-
-[memberstaffshop]
-// https://classic.runescape.wiki/w/Zaff%27s_staff_shop
-// https://storage.googleapis.com/tannerdino/images/varrock6.png
-// https://storage.googleapis.com/tannerdino/images/rsMagicVARROCKstaffs.gif (full stocks)
+[armourshop]
+// https://classic.runescape.wiki/w/Horvik%27s_Armour_Shop
+// https://storage.googleapis.com/tannerdino/images/varrock10.png
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=battlestaff,5,100
-stock2=plainstaff,5,100
-stock3=magicstaff,5,200
-stock4=staff_of_air,2,1000
-stock5=staff_of_water,2,1000
-stock6=staff_of_earth,2,1000
-stock7=staff_of_fire,2,1000
+stock1=bronze_chainbody,5,100
+stock2=iron_chainbody,3,200
+stock3=steel_chainbody,3,400
+stock4=mithril_chainbody,1,3000
+stock5=bronze_platebody,3,100
+stock6=iron_platebody,1,200
+stock7=steel_platebody,1,400
+stock8=mithril_platebody,1,3000
+stock9=black_platebody,1,3000
+stock10=iron_platelegs,1,100
+stock11=studded_body,1,700
+stock12=studded_chaps,1,700
 
-[clotheshop]
-// https://classic.runescape.wiki/w/The_Clothes_Shop
-// https://web.archive.org/web/20060912044934im_/http://img34.imageshack.us/img34/5558/WhiteApron.jpg (full stocks)
+[generalshop2]
+// https://classic.runescape.wiki/w/Varrock_General_Store
+// https://web.archive.org/web/20111107025524im_/http://runevillage.com/images/rs2Cities/rsVarrock10.gif
 scope=shared
 size=40
 restock=yes
 stackall=yes
-allstock=no
-stock1=white_apron,3,100
-stock2=leather_body,12,100
-stock3=leather_gloves,10,100
-stock4=leather_boots,10,100
-stock5=brown_apron,1,100
-stock6=pink_skirt,5,100
-stock7=black_skirt,3,100
-stock8=blue_skirt,2,100
-stock9=red_cape,4,100
-stock10=silk,5,500
-stock11=priest_robe,3,100
-stock12=priest_gown,3,100
+allstock=yes
+stock1=pot_empty,3,100
+stock2=jug_empty,2,100
+stock3=shears,2,100
+stock4=bucket_empty,2,100
+stock5=tinderbox,2,100
+stock6=chisel,2,100
+stock7=hammer,5,100
 
 [runeshop]
 // https://storage.googleapis.com/tannerdino/images/varrock12.png
@@ -139,42 +98,83 @@ stock7=oak_shortbow,2,200
 stock8=oak_longbow,2,200
 stock9=crossbow,2,400
 
-[armourshop]
-// https://classic.runescape.wiki/w/Horvik%27s_Armour_Shop
-// https://storage.googleapis.com/tannerdino/images/varrock10.png
+[fancyclothesstore]
+// https://classic.runescape.wiki/w/Tailor%27s_fancy_dress
+// https://storage.googleapis.com/tannerdino/images/varrock14.png
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_chainbody,5,100
-stock2=iron_chainbody,3,200
-stock3=steel_chainbody,3,400
-stock4=mithril_chainbody,1,3000
-stock5=bronze_platebody,3,100
-stock6=iron_platebody,1,200
-stock7=steel_platebody,1,400
-stock8=mithril_platebody,1,3000
-stock9=black_platebody,1,3000
-stock10=iron_platelegs,1,100
-stock11=studded_body,1,700
-stock12=studded_chaps,1,700
+stock1=chefshat,0,100
+stock2=bluewizhat,3,100
+stock3=yellow_cape,1,100
+stock4=grey_wolf_fur,3,100
+stock5=bear_fur,3,100
+stock6=needle,3,100
+stock7=thread,100,5
+stock8=leather_gloves,10,100
+stock9=leather_boots,10,100
+stock10=priest_robe,3,100
+stock11=priest_gown,3,100
+stock12=brown_apron,1,100
+stock13=pink_skirt,5,100
+stock14=black_skirt,3,100
+stock15=blue_skirt,2,100
+stock16=red_cape,4,100
+stock17=eye_patch,3,2000
 
-[generalshop2]
-// https://classic.runescape.wiki/w/Varrock_General_Store
-// https://web.archive.org/web/20111107025524im_/http://runevillage.com/images/rs2Cities/rsVarrock10.gif
+[staffshop]
+// https://classic.runescape.wiki/w/Zaff%27s_staff_shop (differences no battlestaves.)
 scope=shared
 size=40
 restock=yes
 stackall=yes
-allstock=yes
-stock1=pot_empty,3,100
-stock2=jug_empty,2,100
-stock3=shears,2,100
-stock4=bucket_empty,2,100
-stock5=tinderbox,2,100
-stock6=chisel,2,100
-stock7=hammer,5,100
+allstock=no
+stock1=plainstaff,5,100
+stock2=magicstaff,5,200
+stock3=staff_of_air,2,1000
+stock4=staff_of_water,2,1000
+stock5=staff_of_earth,2,1000
+stock6=staff_of_fire,2,1000
+
+[memberstaffshop]
+// https://classic.runescape.wiki/w/Zaff%27s_staff_shop
+// https://storage.googleapis.com/tannerdino/images/varrock6.png
+// https://storage.googleapis.com/tannerdino/images/rsMagicVARROCKstaffs.gif (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=battlestaff,5,100
+stock2=plainstaff,5,100
+stock3=magicstaff,5,200
+stock4=staff_of_air,2,1000
+stock5=staff_of_water,2,1000
+stock6=staff_of_earth,2,1000
+stock7=staff_of_fire,2,1000
+
+[clotheshop]
+// https://classic.runescape.wiki/w/The_Clothes_Shop
+// https://web.archive.org/web/20060912044934im_/http://img34.imageshack.us/img34/5558/WhiteApron.jpg (full stocks)
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=white_apron,3,100
+stock2=leather_body,12,100
+stock3=leather_gloves,10,100
+stock4=leather_boots,10,100
+stock5=brown_apron,1,100
+stock6=pink_skirt,5,100
+stock7=black_skirt,3,100
+stock8=blue_skirt,2,100
+stock9=red_cape,4,100
+stock10=silk,5,500
+stock11=priest_robe,3,100
+stock12=priest_gown,3,100
 
 [teashop]
 // https://oldschool.runescape.wiki/w/Tea_Seller
diff --git a/data/src/scripts/areas/area_wilderness/configs/bandic_camp.inv b/data/src/scripts/areas/area_wilderness/configs/bandic_camp.inv
index 2a77713f10..e6ae369553 100644
--- a/data/src/scripts/areas/area_wilderness/configs/bandic_camp.inv
+++ b/data/src/scripts/areas/area_wilderness/configs/bandic_camp.inv
@@ -1,13 +1,3 @@
-[pizzabaseshop]
-// https://classic.runescape.wiki/w/Pizza_Base_Shop
-// https://storage.googleapis.com/tannerdino/images/rsbandit5.gif
-scope=shared
-size=40
-restock=yes
-stackall=yes
-allstock=no
-stock1=pizza_base,30,100
-
 [taxfree]
 // https://classic.runescape.wiki/w/Bandit_Camp_General_Store
 // https://storage.googleapis.com/tannerdino/images/rsbandit4.gif
@@ -22,4 +12,14 @@ stock3=tinderbox,2,100
 stock4=chisel,2,100
 stock5=hammer,5,100
 stock6=bronze_pickaxe,5,100
-stock7=bronze_axe,10,100
\ No newline at end of file
+stock7=bronze_axe,10,100
+
+[pizzabaseshop]
+// https://classic.runescape.wiki/w/Pizza_Base_Shop
+// https://storage.googleapis.com/tannerdino/images/rsbandit5.gif
+scope=shared
+size=40
+restock=yes
+stackall=yes
+allstock=no
+stock1=pizza_base,30,100
\ No newline at end of file
diff --git a/data/src/scripts/minigames/game_gnomeball/configs/gnomeball.inv b/data/src/scripts/minigames/game_gnomeball/configs/gnomeball.inv
deleted file mode 100644
index 97c8143703..0000000000
--- a/data/src/scripts/minigames/game_gnomeball/configs/gnomeball.inv
+++ /dev/null
@@ -1,2 +0,0 @@
-[foodshop]
-size=1
\ No newline at end of file
diff --git a/data/src/scripts/minigames/game_ranging/configs/ranging.inv b/data/src/scripts/minigames/game_ranging/configs/ranging.inv
index c8a270d76a..a0ce943f1a 100644
--- a/data/src/scripts/minigames/game_ranging/configs/ranging.inv
+++ b/data/src/scripts/minigames/game_ranging/configs/ranging.inv
@@ -1,24 +1,31 @@
-[ranging_guild_tribalshop]
-// https://oldschool.runescape.wiki/w/Authentic_Throwing_Weapons.
-// https://storage.googleapis.com/tannerdino/images/Throwing_weapons.jpg (full stocks)
-// https://www.spookspring.com/noobsquad/imagegif/spookart/jungle.GIF
+[ranging_guild_bowshop]
+// https://oldschool.runescape.wiki/w/Dargaud%27s_Bow_and_Arrows.
+// https://storage.googleapis.com/tannerdino/images/dargaudsbowandarrows.png (2006)
+// https://www.spookspring.com/noobsquad/imagegif/spookart/arch.GIF
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=bronze_javelin,900,20
-stock2=iron_javelin,800,20
-stock3=steel_javelin,700,40
-stock4=mithril_javelin,600,60
-stock5=adamant_javelin,500,80
-stock6=rune_javelin,400,100
-stock7=bronze_thrownaxe,900,20
-stock8=iron_thrownaxe,800,20
-stock9=steel_thrownaxe,700,40
-stock10=mithril_thrownaxe,600,60
-stock11=adamnt_thrownaxe,500,80
-stock12=rune_thrownaxe,400,100
+stock1=arrow_shaft,1000,50
+stock2=bronze_arrowheads,500,10
+stock3=iron_arrowheads,400,20
+stock4=steel_arrowheads,300,30
+stock5=mithril_arrowheads,200,40
+stock6=adamant_arrowheads,200,50
+stock7=rune_arrowheads,150,60
+stock8=bronze_arrow,1000,10
+stock9=iron_arrow,500,20
+stock10=steel_arrow,500,40
+stock11=mithril_arrow,500,60
+stock12=adamant_arrow,450,120
+stock13=rune_arrow,400,130
+stock14=shortbow,20,50
+stock15=oak_shortbow,20,60
+stock16=willow_shortbow,20,70
+stock17=longbow,20,50
+stock18=oak_longbow,20,60
+stock19=willow_longbow,20,70
 
 [ranging_guild_armourshop]
 // https://oldschool.runescape.wiki/w/Aaron%27s_Archery_Appendages.
@@ -38,31 +45,24 @@ stock6=coif,10,50
 stock7=leather_cowl,10,70
 stock8=leather_vambraces,10,150
 
-[ranging_guild_bowshop]
-// https://oldschool.runescape.wiki/w/Dargaud%27s_Bow_and_Arrows.
-// https://storage.googleapis.com/tannerdino/images/dargaudsbowandarrows.png (2006)
-// https://www.spookspring.com/noobsquad/imagegif/spookart/arch.GIF
+[ranging_guild_tribalshop]
+// https://oldschool.runescape.wiki/w/Authentic_Throwing_Weapons.
+// https://storage.googleapis.com/tannerdino/images/Throwing_weapons.jpg (full stocks)
+// https://www.spookspring.com/noobsquad/imagegif/spookart/jungle.GIF
 scope=shared
 size=40
 restock=yes
 stackall=yes
 allstock=no
-stock1=arrow_shaft,1000,50
-stock2=bronze_arrowheads,500,10
-stock3=iron_arrowheads,400,20
-stock4=steel_arrowheads,300,30
-stock5=mithril_arrowheads,200,40
-stock6=adamant_arrowheads,200,50
-stock7=rune_arrowheads,150,60
-stock8=bronze_arrow,1000,10
-stock9=iron_arrow,500,20
-stock10=steel_arrow,500,40
-stock11=mithril_arrow,500,60
-stock12=adamant_arrow,450,120
-stock13=rune_arrow,400,130
-stock14=shortbow,20,50
-stock15=oak_shortbow,20,60
-stock16=willow_shortbow,20,70
-stock17=longbow,20,50
-stock18=oak_longbow,20,60
-stock19=willow_longbow,20,70
\ No newline at end of file
+stock1=bronze_javelin,900,20
+stock2=iron_javelin,800,20
+stock3=steel_javelin,700,40
+stock4=mithril_javelin,600,60
+stock5=adamant_javelin,500,80
+stock6=rune_javelin,400,100
+stock7=bronze_thrownaxe,900,20
+stock8=iron_thrownaxe,800,20
+stock9=steel_thrownaxe,700,40
+stock10=mithril_thrownaxe,600,60
+stock11=adamnt_thrownaxe,500,80
+stock12=rune_thrownaxe,400,100
\ No newline at end of file