diff --git a/src/dusk/randomizer/data/locations.yaml b/src/dusk/randomizer/data/locations.yaml
index c0db360736..83fd0ecbf3 100644
--- a/src/dusk/randomizer/data/locations.yaml
+++ b/src/dusk/randomizer/data/locations.yaml
@@ -61,6 +61,118 @@
   - Ordona Province
   - ARC
 
+- Name: Ordon Bo Cliff Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Bo Roof Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Bo Window Rupee 1
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Bo Window Rupee 2
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Hidden Rusl House Rupee
+  Original Item: Orange Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee In Grass By Bo
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee In River 1
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee In River 2
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee Under Bridge
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee Under Tall Tree 1
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rupee Under Tall Tree 2
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rusl House Roof Rupee 1
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Rusl House Roof Rupee 2
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Shield House Ledge Grass Rupee
+  Original Item: Purple Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Tree Long Branch Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
+- Name: Ordon Tree Short Branch Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Ordona Province
+  - Rupee - Freestanding
+
 - Name: Herding Goats Reward
   Original Item: Piece of Heart
   Categories:
@@ -207,6 +319,34 @@
   - Faron Woods
   - ARC
 
+- Name: Faron Woods Coro Boulder Rupee 1
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Rupee - Hidden
+
+- Name: Faron Woods Coro Boulder Rupee 2
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Rupee - Hidden
+
+- Name: Faron Woods Coro Boulder Rupee 3
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Rupee - Hidden
+
+- Name: Faron Woods Coro Boulder Rupee 4
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Faron Woods
+  - Rupee - Hidden
+
 - Name: South Faron Cave Chest
   Original Item: Yellow Rupee
   Categories:
@@ -601,6 +741,13 @@
   - Hyrule Field - Eldin Province
   - Sky Book
 
+- Name: Kakariko Gorge Owl Statue Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Eldin
+  - Rupee - Hidden
+
 - Name: Kakariko Gorge Poe
   Original Item: Poe Soul
   Categories:
@@ -623,6 +770,13 @@
   - Hyrule Field - Eldin Province
   - ARC
 
+- Name: Kakariko Gorge Spire Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Eldin
+  - Rupee - Hidden
+
 - Name: Eldin Lantern Cave First Chest
   Original Item: Red Rupee
   # HD Original Item: Stamp (O)
@@ -663,6 +817,13 @@
   - Kakariko Village
   - ARC
 
+- Name: Eldin Spring Underwater Boulder Rupee
+  Original Item: Orange Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
 - Name: Kakariko Village Bomb Rock Spire Heart Piece
   Original Item: Piece of Heart
   Categories:
@@ -671,6 +832,34 @@
   - Kakariko Village
   - DZX
 
+- Name: Kakariko Village Bell Rupee
+  Original Item: Silver Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
+- Name: Kakariko Village Hot Spring Ledge Box Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
+- Name: Kakariko Village Spring Shortcut Box Rupee 1
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
+- Name: Kakariko Village Spring Shortcut Box Rupee 2
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
 - Name: Kakariko Village Malo Mart Hawkeye
   Original Item: Hawkeye
   Categories:
@@ -719,6 +908,13 @@
   - Kakariko Village
   - DZX
 
+- Name: Kakariko Village Ant House Ledge Box Rupee
+  Original Item: Red Rupee
+  Categories:
+  - Overworld
+  - Kakariko Village
+  - Rupee - Hidden
+
 - Name: Barnes Bomb Bag
   Original Item: Bomb Bag
   Categories:
@@ -813,6 +1009,13 @@
   - Kakariko Graveyard
   - DZX
 
+- Name: Kakariko Graveyard Underwater Boulder Rupee
+  Original Item: Red Rupee
+  Categories:
+  - Overworld
+  - Kakariko Graveyard
+  - Rupee - Hidden
+
 - Name: Kakariko Graveyard Golden Wolf
   Original Item: Progressive Hidden Skill
   Categories:
@@ -842,6 +1045,34 @@
   - Death Mountain
   - ARC
 
+- Name: Death Mountain Volcano Ledge Rupee 1
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Death Mountain
+  - Rupee - Freestanding
+
+- Name: Death Mountain Volcano Ledge Rupee 2
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Death Mountain
+  - Rupee - Freestanding
+
+- Name: Death Mountain Volcano Ledge Rupee 3
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Death Mountain
+  - Rupee - Freestanding
+
+- Name: Death Mountain Volcano Pipe Ledge Rock Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Death Mountain
+  - Rupee - Hidden
+
 - Name: Death Mountain Trail Poe
   Original Item: Poe Soul
   Categories:
@@ -938,6 +1169,13 @@
   - Hyrule Field - Eldin Province
   - Sky Book
 
+- Name: Bridge of Eldin Boulder Rupee
+  Original Item: Red Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Eldin
+  - Rupee - Hidden
+
 - Name: Eldin Stockcave Upper Chest
   Original Item: Red Rupee
   Categories:
@@ -1141,6 +1379,27 @@
   - Hyrule Field - Lanayru Province
   - ARC
 
+- Name: Lanayru Field North Underwater Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
+- Name: Lanayru Field South Underwater Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
+- Name: Lanayru Field Tree Boulder Rupee
+  Original Item: Purple Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: Lanayru Field Bridge Poe
   Original Item: Poe Soul
   Categories:
@@ -1212,6 +1471,20 @@
   - Hyrule Field - Lanayru Province
   - ARC
 
+- Name: Lanayru Field North Spinner Track Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
+- Name: Lanayru Field South Spinner Track Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: West Hyrule Field Female Butterfly
   Original Item: Female Butterfly
   Categories:
@@ -1228,6 +1501,20 @@
   - Hyrule Field - Lanayru Province
   - DZX
 
+- Name: West Hyrule Field Northern Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
+- Name: West Hyrule Field Southern Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: West Hyrule Field Helmasaur Grotto Chest
   Original Item: Orange Rupee
   # HD Original Item: Stamp (Angry Link)
@@ -1636,6 +1923,13 @@
   - Hyrule Field - Lanayru Province
   - ARC
 
+- Name: Outside South Castle Town Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: Wooden Statue
   Original Item: Wooden Statue
   Categories:
@@ -1659,6 +1953,13 @@
   - Hyrule Field - Lanayru Province
   - Sky Book
 
+- Name: Lake Hylia Bridge Owl Statue Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: Lake Hylia Bridge Vines Chest
   Original Item: Orange Rupee
   Categories:
@@ -1707,6 +2008,13 @@
   - Hyrule Field - Lanayru Province
   - DZX
 
+- Name: Lake Hylia Bridge Faron Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Hyrule Field - Lanayru
+  - Rupee - Hidden
+
 - Name: Auru Gift To Fyer
   Original Item: Aurus Memo
   Categories:
@@ -1883,6 +2191,34 @@
   - Lake Hylia
   - DZX
 
+- Name: Lake Hylia Left Underwater Boulder Rupee
+  Original Item: Purple Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Hidden
+
+- Name: Lake Hylia Left Underwater Pillar Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Freestanding
+
+- Name: Lake Hylia Right Underwater Boulder Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Hidden
+
+- Name: Lake Hylia Right Underwater Pillar Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Freestanding
+
 - Name: Lake Hylia Alcove Poe
   Original Item: Poe Soul
   Categories:
@@ -1931,7 +2267,6 @@
   - Lake Hylia
   - DZX
 
-
 - Name: Isle of Riches Poe
   Original Item: Poe Soul
   Categories:
@@ -2033,6 +2368,20 @@
   - Lake Hylia
   - ARC
 
+- Name: Lanayru Spring Lower Underwater Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Hidden
+
+- Name: Lanayru Spring Upper Underwater Boulder Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Lake Hylia
+  - Rupee - Hidden
+
 - Name: Plumm Fruit Balloon Minigame
   Original Item: Piece of Heart
   Categories:
@@ -2049,6 +2398,34 @@
   - Upper Zoras River
   - DZX
 
+- Name: Upper Zoras River Central Underwater Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Upper Zoras River
+  - Rupee - Hidden
+
+- Name: Upper Zoras River East Underwater Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Upper Zoras River
+  - Rupee - Hidden
+
+- Name: Upper Zoras River Ledge Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Upper Zoras River
+  - Rupee - Hidden
+
+- Name: Upper Zoras River West Underwater Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Upper Zoras River
+  - Rupee - Hidden
+
 - Name: Upper Zoras River Poe
   Original Item: Poe Soul
   Categories:
@@ -2126,6 +2503,69 @@
   - Poe
   - Zoras Domain
 
+- Name: Zoras Domain Behind Waterfall Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Central Underwater Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Hidden
+
+- Name: Zoras Domain North Underwater Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Hidden
+
+- Name: Zoras Domain Shortcut Ledge Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Shortcut Lower Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Hidden
+
+- Name: Zoras Domain Shortcut Upper Boulder Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Hidden
+
+- Name: Zoras Domain Top Ledge Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Vine Ledge Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Waterfall Ledge Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
 - Name: Zoras Domain Extinguish All Torches Chest
   Original Item: Purple Rupee
   Categories:
@@ -2150,6 +2590,48 @@
   - Zoras Domain
   - ARC
 
+- Name: Zoras Domain Throne East Gate Underwater Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Throne East Underwater Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Throne Northwest Underwater Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Throne South Underwater Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Throne West Gate Underwater Rupee
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
+- Name: Zoras Domain Throne West Underwater Rupee
+  Original Item: Yellow Rupee
+  Categories:
+  - Overworld
+  - Zoras Domain
+  - Rupee - Freestanding
+
 # SNOWPEAK PROVINCE
 
 - Name: Ashei Sketch
@@ -2219,6 +2701,139 @@
   - Snowpeak Province
   - ARC
 
+- Name: Snowboarding Bridge Ledge Bottom Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Bridge Ledge Middle Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Bridge Ledge Upper Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 1
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 2
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 3
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 4
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 5
+  Original Item: Red Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 6
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 7
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 8
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 9
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 10
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Shortcut Rupee 11
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Snowy Tree Top Rupee 1
+  Original Item: Blue Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Snowy Tree Top Rupee 2
+  Original Item: Red Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Snowy Tree Top Rupee 3
+  Original Item: Purple Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Top Left Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
+- Name: Snowboarding Top Right Rupee
+  Original Item: Green Rupee
+  Categories:
+  - Overworld
+  - Snowpeak
+  - Rupee - Freestanding
+
 # DESERT PROVINCE
 
 - Name: Gerudo Desert East Poe
diff --git a/src/dusk/randomizer/data/settings_list.yaml b/src/dusk/randomizer/data/settings_list.yaml
index de880d5605..995c47d591 100644
--- a/src/dusk/randomizer/data/settings_list.yaml
+++ b/src/dusk/randomizer/data/settings_list.yaml
@@ -73,6 +73,18 @@
     - "Off": description
     - "On": description
 
+- Name: Hidden Rupees
+  Default Option: "Off"
+  Options:
+    - "Off": description
+    - "On": description
+
+- Name: Freestanding Rupees
+  Default Option: "Off"
+  Options:
+    - "Off": description
+    - "On": description
+
 - Name: Poe Souls
   Default Option: Vanilla
   Options:
diff --git a/src/dusk/randomizer/data/tests/logic/freestanding rupees/settings.yaml b/src/dusk/randomizer/data/tests/logic/freestanding rupees/settings.yaml
new file mode 100644
index 0000000000..e2e8aaaee7
--- /dev/null
+++ b/src/dusk/randomizer/data/tests/logic/freestanding rupees/settings.yaml	
@@ -0,0 +1,2 @@
+Seed: TESTTESTTEST
+Freestanding Rupees: On
diff --git a/src/dusk/randomizer/data/tests/logic/hidden rupees/settings.yaml b/src/dusk/randomizer/data/tests/logic/hidden rupees/settings.yaml
new file mode 100644
index 0000000000..af6525cebb
--- /dev/null
+++ b/src/dusk/randomizer/data/tests/logic/hidden rupees/settings.yaml	
@@ -0,0 +1,2 @@
+Seed: TESTTESTTEST
+Hidden Rupees: On
diff --git a/src/dusk/randomizer/data/world/overworld/Eldin Province.yaml b/src/dusk/randomizer/data/world/overworld/Eldin Province.yaml
index 944fdff1ef..8a50a39ce6 100644
--- a/src/dusk/randomizer/data/world/overworld/Eldin Province.yaml	
+++ b/src/dusk/randomizer/data/world/overworld/Eldin Province.yaml	
@@ -10,6 +10,8 @@
     Kakariko Gorge Owl Statue Chest: Restored_Dominion_Rod
     Kakariko Gorge Double Clawshot Chest: Double_Clawshots
     Kakariko Gorge Spire Heart Piece: Clawshot or Gale_Boomerang
+    Kakariko Gorge Owl Statue Boulder Rupee: Can_Smash
+    Kakariko Gorge Spire Boulder Rupee: Can_Smash
     Kakariko Gorge Owl Statue Sky Character: Restored_Dominion_Rod
     Kakariko Gorge Male Pill Bug: Nothing
     Kakariko Gorge Female Pill Bug: Nothing
@@ -61,8 +63,14 @@
   Events:
     Can Start Springwater Rush: Can_Talk_to_Springwater_Goron
   Locations:
-    Eldin Spring Underwater Chest: Can_Smash
+    Eldin Spring Underwater Chest: Can_Smash and Iron_Boots
+    Eldin Spring Underwater Boulder Rupee: Water_Bombs and (Iron_Boots or Zora_Armor) and Can_Complete_Eldin_Twilight
     Kakariko Village Bomb Rock Spire Heart Piece: Bombs and Gale_Boomerang
+    Kakariko Village Bell Rupee: Shadow_Crystal and Can_Launch_Bombs and Can_Complete_Eldin_Twilight
+    Kakariko Village Hot Spring Ledge Box Rupee: (Shadow_Crystal or Gale_Boomerang) and Can_Complete_Eldin_Twilight
+    Kakariko Village Spring Shortcut Box Rupee 1: Can_Smash and Can_Complete_Eldin_Twilight
+    Kakariko Village Spring Shortcut Box Rupee 2: Can_Smash and Can_Complete_Eldin_Twilight
+    Kakariko Village Ant House Ledge Box Rupee: Gale_Boomerang and Can_Complete_Eldin_Twilight
     Kakariko Village Hint Sign: Nothing
   Exits:
     Renados Sanctuary Front West Door Exterior: Nothing
@@ -188,6 +196,7 @@
   Twilight: Eldin
   Can Warp: True
   Locations: 
+    Kakariko Graveyard Underwater Boulder Rupee: (Iron_Boots or Zora_Armor) and Water_Bombs
     Rutelas Blessing: "'Can_Follow_Rutella'"
     Gift From Ralis: Asheis_Sketch and 'Can_Follow_Rutella'
     Kakariko Graveyard Hint Sign: Nothing
@@ -391,11 +400,12 @@
   Twilight: Eldin
   Can Warp: True
   Locations:
+    Death Mountain Volcano Pipe Ledge Rock Rupee: Can_Complete_Eldin_Twilight and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines') 
     Death Mountain Trail Twilit Insect on Wall: Can_Defeat_Eldin_Twilit_Insect
     Death Mountain Trail Twilit Insect in Hot Spring: Can_Defeat_Eldin_Twilit_Insect
   Exits:
     Death Mountain Lower Elevator: Goron_Mines_Entrance == Open or 'Can_Access_Death_Mountain_Lower_Elevator'
-    Death Mountain Outside Sumo Hall: Iron_Boots and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines')
+    Death Mountain Outside Sumo Hall: Iron_Boots and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines') and Can_Complete_Eldin_Twilight
     Death Mountain Trail: Nothing
   
 - Name: Death Mountain Lower Elevator
@@ -412,6 +422,10 @@
   Region: Death Mountain
   Twilight: Eldin
   Can Warp: True
+  Locations:
+    Death Mountain Volcano Ledge Rupee 1: Can_Complete_Eldin_Twilight and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines')
+    Death Mountain Volcano Ledge Rupee 2: Can_Complete_Eldin_Twilight and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines')
+    Death Mountain Volcano Ledge Rupee 3: Can_Complete_Eldin_Twilight and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines')
   Exits:
     Death Mountain Sumo Hall: Nothing
     Death Mountain Volcano: Nothing
@@ -495,6 +509,7 @@
   Twilight: Eldin
   Can Warp: True
   Locations:
+    Bridge of Eldin Boulder Rupee: Can_Smash
     Bridge of Eldin Owl Statue Sky Character: Restored_Dominion_Rod
     Bridge of Eldin Female Phasmid: Clawshot or Gale_Boomerang
   Exits:
diff --git a/src/dusk/randomizer/data/world/overworld/Faron Province.yaml b/src/dusk/randomizer/data/world/overworld/Faron Province.yaml
index 215cc575d7..9896ec2550 100644
--- a/src/dusk/randomizer/data/world/overworld/Faron Province.yaml	
+++ b/src/dusk/randomizer/data/world/overworld/Faron Province.yaml	
@@ -10,6 +10,10 @@
   Events:
     Can Refill Lantern Oil: "'Can_Farm_Rupees'"
   Locations:
+    Faron Woods Coro Boulder Rupee 1: Can_Smash
+    Faron Woods Coro Boulder Rupee 2: Can_Smash
+    Faron Woods Coro Boulder Rupee 3: Can_Smash
+    Faron Woods Coro Boulder Rupee 4: Can_Smash
     Coro Bottle: Can_Complete_Prologue
     South Faron Woods Twilit Insect in Tunnel 1: Can_Defeat_Faron_Twilit_Insect
     South Faron Woods Twilit Insect in Tunnel 2: Can_Defeat_Faron_Twilit_Insect
diff --git a/src/dusk/randomizer/data/world/overworld/Lanayru Province.yaml b/src/dusk/randomizer/data/world/overworld/Lanayru Province.yaml
index 3e44ddbab0..1e6ee0a768 100644
--- a/src/dusk/randomizer/data/world/overworld/Lanayru Province.yaml	
+++ b/src/dusk/randomizer/data/world/overworld/Lanayru Province.yaml	
@@ -8,6 +8,9 @@
   Can Warp: True
   Locations:
     Lanayru Field Behind Gate Underwater Chest: Iron_Boots
+    Lanayru Field Tree Boulder Rupee: Can_Smash
+    Lanayru Field North Underwater Boulder Rupee: Iron_Boots and Water_Bombs
+    Lanayru Field South Underwater Boulder Rupee: Iron_Boots and Water_Bombs
     Lanayru Field Male Stag Beetle: Clawshot or Gale_Boomerang
     Lanayru Field Female Stag Beetle: Clawshot or Gale_Boomerang
     Lanayru Field Bridge Poe: Night and Can_Use_Senses and Can_Complete_MDH and Can_Complete_All_Twilight
@@ -73,6 +76,8 @@
   Can Warp: True
   Locations:
     Lanayru Field Spinner Track Chest: Spinner
+    Lanayru Field North Spinner Track Boulder Rupee: Can_Smash
+    Lanayru Field South Spinner Track Boulder Rupee: Can_Smash
   Exits:
     Lake Hylia Bridge: Can_Smash
     Lanayru Field: Can_Smash
@@ -87,6 +92,8 @@
   Locations:
     Hyrule Field Amphitheater Owl Statue Chest: Restored_Dominion_Rod
     Hyrule Field Amphitheater Owl Statue Sky Character: Restored_Dominion_Rod
+    West Hyrule Field Northern Boulder Rupee: Can_Smash
+    West Hyrule Field Southern Boulder Rupee: Can_Smash
     West Hyrule Field Male Butterfly: Nothing
     West Hyrule Field Female Butterfly: Gale_Boomerang
     Hyrule Field Amphitheater Poe: Can_Use_Senses and Night
@@ -399,6 +406,7 @@
     Outside South Castle Town Tightrope Chest: Clawshot and Can_Use_Tightrope
     Outside South Castle Town Fountain Chest: Spinner and Clawshot
     Outside South Castle Town Double Clawshot Chasm Chest: Double_Clawshots
+    Outside South Castle Town Boulder Rupee: Can_Smash
     Outside South Castle Town Male Ladybug: Nothing
     Outside South Castle Town Female Ladybug: Nothing
     Outside South Castle Town Poe: Night and Can_Use_Senses
@@ -446,6 +454,8 @@
   Locations:
     Lake Hylia Bridge Vines Chest: Clawshot
     Lake Hylia Bridge Owl Statue Chest: Clawshot and Restored_Dominion_Rod
+    Lake Hylia Bridge Faron Boulder Rupee: Can_Smash
+    Lake Hylia Bridge Owl Statue Boulder Rupee: Can_Smash
     Lake Hylia Bridge Owl Statue Sky Character: Clawshot and Restored_Dominion_Rod
     Lake Hylia Bridge Male Mantis: Clawshot or Gale_Boomerang
     Lake Hylia Bridge Female Mantis: Clawshot or Gale_Boomerang
@@ -487,6 +497,10 @@
     Can Farm Lots of Rupees: Nothing
   Locations:
     Lake Hylia Underwater Chest: Iron_Boots
+    Lake Hylia Left Underwater Boulder Rupee: Zora_Armor and Iron_Boots and Water_Bombs and Can_Complete_Lanayru_Twilight
+    Lake Hylia Left Underwater Pillar Rupee: Zora_Armor and Can_Complete_Lanayru_Twilight
+    Lake Hylia Right Underwater Boulder Rupee: Zora_Armor and Iron_Boots and Water_Bombs and Can_Complete_Lanayru_Twilight
+    Lake Hylia Right Underwater Pillar Rupee: Zora_Armor and Can_Complete_Lanayru_Twilight
     Lake Hylia Alcove Poe: Night and Can_Use_Senses
     Lake Hylia Dock Poe: Night and Can_Use_Senses
     Plumm Fruit Balloon Minigame: Can_Howl
@@ -613,6 +627,8 @@
     Lanayru Spring Back Room Lantern Chest: Clawshot and Lantern
     Lanayru Spring East Double Clawshot Chest: Double_Clawshots
     Lanayru Spring West Double Clawshot Chest: Double_Clawshots
+    Lanayru Spring Lower Underwater Boulder Rupee: Iron_Boots and Water_Bombs
+    Lanayru Spring Upper Underwater Boulder Rupee: Iron_Boots and Water_Bombs
     Lanayru Spring Hint Sign: Iron_Boots or (Can_Do_Niche_Stuff and Magic_Armor)
   Exits:
     Lake Hylia: Nothing
@@ -636,9 +652,13 @@
   Events:
     Howl at Upper Zoras River Howling Stone: Can_Howl
   Locations:
-    Upper Zoras River Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
+    Upper Zoras River Ledge Boulder Rupee: Can_Smash
+    Upper Zoras River East Underwater Boulder Rupee: Iron_Boots and Water_Bombs
+    Upper Zoras River West Underwater Boulder Rupee: Iron_Boots and Water_Bombs
+    Upper Zoras River Central Underwater Boulder Rupee: Iron_Boots and Water_Bombs
     Upper Zoras River Female Dragonfly: Nothing
     Upper Zoras River Poe: Can_Use_Senses
+    Upper Zoras River Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
   Exits:
     Upper Zoras River Izas House: Can_Open_Doors and Upper_Zoras_River_Warp_Portal
     Fishing Hole: Can_Open_Doors
@@ -683,6 +703,8 @@
   Locations:
     Zoras Domain Chest By Mother and Child Isles: Nothing
     Zoras Domain Chest Behind Waterfall: Can_Midna_Jump
+    Zoras Domain Central Underwater Boulder Rupee: Can_Complete_Lanayru_Twilight and Iron_Boots and Water_Bombs
+    Zoras Domain North Underwater Boulder Rupee: Can_Complete_Lanayru_Twilight and Iron_Boots and Water_Bombs
     Zoras Domain Male Dragonfly: Nothing
     Zoras Domain Mother and Child Isle Poe: Can_Use_Senses
     Zoras Domain Waterfall Poe: Can_Midna_Jump and Can_Use_Senses
@@ -713,6 +735,14 @@
   Region: Zoras Domain
   Twilight: Lanayru
   Can Warp: True
+  Locations:
+    Zoras Domain Behind Waterfall Rupee: Can_Complete_Lanayru_Twilight
+    Zoras Domain Top Ledge Rupee: Can_Complete_Lanayru_Twilight
+    Zoras Domain Vine Ledge Rupee: Can_Complete_Lanayru_Twilight
+    Zoras Domain Waterfall Ledge Rupee: Can_Complete_Lanayru_Twilight
+    Zoras Domain Shortcut Ledge Rupee: Can_Complete_Lanayru_Twilight
+    Zoras Domain Shortcut Lower Boulder Rupee: Can_Smash
+    Zoras Domain Shortcut Upper Boulder Rupee: Can_Smash
   Exits:
     Zoras Throne Room: Nothing
     Zoras Domain West Ledge: Can_Smash
@@ -724,9 +754,15 @@
   Twilight: Lanayru
   Can Warp: True
   Locations:
-    Zoras Domain Throne Room Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
     Zoras Domain Light All Torches Chest: Can_Light_Torches and Iron_Boots
     Zoras Domain Extinguish All Torches Chest: Can_Extinguish_Torches and Iron_Boots
+    Zoras Domain Throne East Gate Underwater Rupee: Can_Complete_Lanayru_Twilight and Iron_Boots
+    Zoras Domain Throne East Underwater Rupee: Can_Complete_Lanayru_Twilight and (Iron_Boots or Zora_Armor)
+    Zoras Domain Throne Northwest Underwater Rupee: Can_Complete_Lanayru_Twilight and (Iron_Boots or Zora_Armor)
+    Zoras Domain Throne South Underwater Rupee: Can_Complete_Lanayru_Twilight and (Iron_Boots or Zora_Armor)
+    Zoras Domain Throne West Gate Underwater Rupee: Can_Complete_Lanayru_Twilight and Iron_Boots
+    Zoras Domain Throne West Underwater Rupee: Can_Complete_Lanayru_Twilight and (Iron_Boots or Zora_Armor)
     Zoras Domain Underwater Goron: Water_Bombs and Iron_Boots and Zora_Armor
+    Zoras Domain Throne Room Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
   Exits:
     Zoras Domain Top of Waterfall: Nothing
diff --git a/src/dusk/randomizer/data/world/overworld/Ordona Province.yaml b/src/dusk/randomizer/data/world/overworld/Ordona Province.yaml
index 1c2527545d..11230eb1e8 100644
--- a/src/dusk/randomizer/data/world/overworld/Ordona Province.yaml	
+++ b/src/dusk/randomizer/data/world/overworld/Ordona Province.yaml	
@@ -62,6 +62,22 @@
     Can Refill Slingshot Seeds: Nothing # Can break pumpkins
     Fish for Ordon Cat: Day and Fishing_Rod
   Locations:
+    Ordon Rupee Under Tall Tree 1: Nothing
+    Ordon Rupee Under Tall Tree 2: Nothing
+    Ordon Tree Long Branch Rupee: Nothing
+    Ordon Tree Short Branch Rupee: Nothing
+    Ordon Bo Cliff Rupee: Nothing
+    Ordon Bo Roof Rupee: Nothing
+    Ordon Bo Window Rupee 1: Nothing
+    Ordon Bo Window Rupee 2: Nothing
+    Ordon Rupee In Grass By Bo: Nothing
+    Ordon Rusl House Roof Rupee 1: Nothing
+    Ordon Rusl House Roof Rupee 2: Nothing
+    Ordon Hidden Rusl House Rupee: Gale_Boomerang or Clawshot
+    Ordon Rupee In River 1: Nothing
+    Ordon Rupee In River 2: Nothing
+    Ordon Rupee Under Bridge: Nothing
+    Ordon Shield House Ledge Grass Rupee: Gale_Boomerang or Clawshot
     Uli Cradle Delivery: Day and Human_Link
   Exits:
     Ordon Seras Shop: Day and Can_Open_Doors
diff --git a/src/dusk/randomizer/data/world/overworld/Snowpeak Province.yaml b/src/dusk/randomizer/data/world/overworld/Snowpeak Province.yaml
index ae5edeb475..4fcbefa122 100644
--- a/src/dusk/randomizer/data/world/overworld/Snowpeak Province.yaml	
+++ b/src/dusk/randomizer/data/world/overworld/Snowpeak Province.yaml	
@@ -50,7 +50,30 @@
   Map Sector: Snowpeak Province
   Region: Snowpeak Mountain
   Can Warp: True
+  Events:
+    Snowboarding Rupees: "(Snowpeak_Warp_Portal or Can_Defeat_Shadow_Beast)
+                           and ((Bonks_Do_Damage == Off or (Bonks_Do_Damage == On
+                            and (Damage_Multiplier != OHKO or Can_Use_Bottled_Fairy))) or 'Can_Complete_Snowpeak_Ruins')"
   Locations:
+    Snowboarding Bridge Ledge Bottom Rupee: "'Snowboarding_Rupees'"
+    Snowboarding Bridge Ledge Middle Rupee: "'Snowboarding_Rupees'"
+    Snowboarding Bridge Ledge Upper Rupee: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 1: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 2: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 3: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 4: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 5: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 6: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 7: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 8: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 9: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 10: "'Snowboarding_Rupees'"
+    Snowboarding Shortcut Rupee 11: "'Snowboarding_Rupees'"
+    Snowboarding Snowy Tree Top Rupee 1: "'Snowboarding_Rupees'"
+    Snowboarding Snowy Tree Top Rupee 2: "'Snowboarding_Rupees'"
+    Snowboarding Snowy Tree Top Rupee 3: "'Snowboarding_Rupees'"
+    Snowboarding Top Left Rupee: "'Snowboarding_Rupees'"
+    Snowboarding Top Right Rupee: "'Snowboarding_Rupees'"
     Snowboard Racing Prize: Can_Defeat_Shadow_Beast and 'Can_Complete_Snowpeak_Ruins'
   Exits:
     Snowpeak Summit Lower: Can_Defeat_Shadow_Beast and Can_Survive_One_Bonk
@@ -87,4 +110,4 @@
   Can Transform: Never
   Exits:
     Snowpeak Ruins West Door Exterior: Can_Open_Doors
-    Snowpeak Ruins Entrance: Nothing
\ No newline at end of file
+    Snowpeak Ruins Entrance: Nothing
diff --git a/src/dusk/randomizer/logic/world.cpp b/src/dusk/randomizer/logic/world.cpp
index 02848583aa..b2825c8973 100644
--- a/src/dusk/randomizer/logic/world.cpp
+++ b/src/dusk/randomizer/logic/world.cpp
@@ -560,6 +560,10 @@ namespace randomizer::logic::world
                 (this->Setting("Shop Items") == "Off" && location->HasCategories("Shop")) ||
                 // Hidden Skills
                 (this->Setting("Hidden Skills") == "Off" && location->HasCategories("Hidden Skill")) ||
+                // Hidden Rupees
+                (this->Setting("Hidden Rupees") == "Off" && location->HasCategories("Rupee - Hidden")) ||
+                // Freestanding Rupees
+                (this->Setting("Freestanding Rupees") == "Off" && location->HasCategories("Rupee - Freestanding")) ||
                 // North Faron Woods Gate Key
                 (this->Setting("Skip Prologue") == "Off" && locationName == "Faron Mist Cave Open Chest") ||
                 // Some locations which will always be vanilla for the time being