diff --git a/Items.py b/Items.py
index c896e483..cac7db1e 100644
--- a/Items.py
+++ b/Items.py
@@ -169,6 +169,12 @@ item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher cla
               'Small Key (Universal)': (False, True, None, 0xAF, 'A small key for any door', 'and the key', 'the unlocking kid', 'keys for sale', 'unlock the fungus', 'key boy opens door again', 'a small key'),
               'Nothing': (False, False, None, 0x5A, 'Some Hot Air', 'and the Nothing', 'the zen kid', 'outright theft', 'shroom theft', 'empty boy is bored again', 'nothing'),
               'Bee Trap': (False, False, None, 0xB0, 'We will sting your face a whole lot!', 'and the sting buddies', 'the beekeeper kid', 'insects for sale', 'shroom pollenation', 'bottle boy has mad bees again', 'Friendship'),
+              'Faerie': (False, False, None, 0xB1, 'Save me and I will revive you', 'and the captive', 'the tingle kid','hostage for sale', 'fairy dust and shrooms', 'bottle boy has friend again', 'a faerie'),
+              'Good Bee': (False, False, None, 0xB2, 'Save me and I will sting you (sometimes)', 'and the captive', 'the tingle kid','hostage for sale', 'good dust and shrooms', 'bottle boy has friend again', 'a bee'),
+              'Magic Jar': (False, False, None, 0xB3, '', '', '','', '', '', ''),
+              'Apple': (False, False, None, 0xB4, '', '', '','', '', '', ''),
+               #   'Hint': (False, False, None, 0xB5, '', '', '','', '', '', ''),
+               #   'Bomb Trap': (False, False, None, 0xB6, '', '', '','', '', '', ''),
               'Red Potion': (False, False, None, 0x2E, 'Hearty red goop!', 'and the red goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has red goo again', 'a red potion'),
               'Green Potion': (False, False, None, 0x2F, 'Refreshing green goop!', 'and the green goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has green goo again', 'a green potion'),
               'Blue Potion': (False, False, None, 0x30, 'Delicious blue goop!', 'and the blue goo', 'the liquid kid', 'potion for sale', 'free samples', 'bottle boy has blue goo again', 'a blue potion'),
diff --git a/Rom.py b/Rom.py
index 0e9b5220..e67d6226 100644
--- a/Rom.py
+++ b/Rom.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '0954a778832b76ba4f96b10eb527ee83'
+RANDOMIZERBASEHASH = 'ccedf643d582a89d2c80269e58535cda'
 
 import io
 import json
diff --git a/Shops.py b/Shops.py
index 912e4a84..12c585a8 100644
--- a/Shops.py
+++ b/Shops.py
@@ -215,12 +215,13 @@ def create_shops(world, player: int):
     world.random.shuffle(single_purchase_slots)
 
     if 'g' in option or 'f' in option:
-        new_basic_shop = world.random.sample(shop_generation_types['default'], k=3)
-        new_dark_shop = world.random.sample(shop_generation_types['default'], k=3)
+        default_shop_table = [i for l in [shop_generation_types[x] for x in ['arrows', 'bombs', 'potions', 'shields', 'bottle'] if not world.retro[player] or x is not 'arrows'] for i in l]
+        new_basic_shop = world.random.sample(default_shop_table, k=3)
+        new_dark_shop = world.random.sample(default_shop_table, k=3)
         for name, shop in player_shop_table.items():
             typ, shop_id, keeper, custom, locked, items = shop
             if not locked:
-                new_items = world.random.sample(shop_generation_types['default'], k=3)
+                new_items = world.random.sample(default_shop_table, k=3)
                 if 'f' not in option:
                     if items == _basic_shop_defaults:
                         new_items = new_basic_shop
@@ -296,11 +297,11 @@ shop_table_by_location_id[(SHOP_ID_START + total_shop_slots + 4)] = "Take-Any #4
 shop_table_by_location = {y: x for x, y in shop_table_by_location_id.items()}
 
 shop_generation_types = {
-    'default': _basic_shop_defaults + [('Bombs (3)', 20), ('Green Potion', 90), ('Blue Potion', 190), ('Bee', 10),
-                                       ('Single Arrow', 5), ('Single Bomb', 10)] + [('Red Shield', 500),
-                                                                                    ('Blue Shield', 50)],
-    'potion': [('Red Potion', 150), ('Green Potion', 90), ('Blue Potion', 190)],
-    'discount_potion': [('Red Potion', 120), ('Green Potion', 60), ('Blue Potion', 160)],
-    'bottle': [('Bee', 10)],
+    'arrows': [('Single Arrow', 5), ('Arrows (10)', 50)],
+    'bombs': [('Single Bomb', 10), ('Bombs (3)', 30), ('Bombs (10)', 50)],
+    'shields': [('Red Shield', 500), ('Blue Shield', 50)],
+    'potions': [('Red Potion', 150), ('Green Potion', 90), ('Blue Potion', 190)],
+    'discount_potions': [('Red Potion', 120), ('Green Potion', 60), ('Blue Potion', 160)],
+    'bottle': [('Small Heart', 10), ('Apple', 50), ('Bee', 10), ('Good Bee', 100), ('Faerie', 100), ('Magic Jar', 100)],
     'time': [('Red Clock', 100), ('Blue Clock', 200), ('Green Clock', 300)],
 }
diff --git a/data/basepatch.bmbp b/data/basepatch.bmbp
index 6cba8ef7..6f582b3f 100644
Binary files a/data/basepatch.bmbp and b/data/basepatch.bmbp differ