diff --git a/oracle.org b/oracle.org
index 98d5669..1e2a0fd 100644
--- a/oracle.org
+++ b/oracle.org
@@ -169,46 +169,59 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village
 | Light Ring     | Sword beams work at -2 hearts    |
 | Blast Ring     | Higher bomb damage, bombos class |
 | Steadfast Ring | No knockback                     |
-* NPCs
-** Bean Vendor/Village Elder
-** Deku Scrub (Mask)
-** KaeporaGaebora/Eon Owl
-** Farore
-** Goron
-** Impa
-** Korok
-** Maku Tree
-** Happy Mask Salesman
-** Mermaid/Maple/Librarian
-** Piratian
-** Ranch Girl
-** Vasu
-** Village Dog
-** Zora Princess
-* Bosses
-** Manhandla
-** Advanced Arrghus
-** King Dodongo
-** Twinrova
-** Kydrog
-** Kydreeok
-* Enemies
-** Anti-Kirby
-** Booki
-** Business Scrub (Kaly/Eon)
-** Darknut (Eon)
-** Goriya
-** Helmet Chuchu
-** Octorok (Kaly/Eon)
-*** TODO Water Octorok
-** Pols Voice
-** Poltergeist
-** Puffstool
-** Sea Urchin (Kaly/Eon)
-** Thunder Ghost
-** Wolfos
-*** Castle Variant
-*** TODO Ice Variant
+* Sprites
+** NPCs
+*** Impa
+*** Maku Tree
+*** Ranch Girl
+*** TODO Garo
+*** [#0A] Kaepora Gaebora / Eon Owl
+*** [#0E] Piratian
+*** [#07] Bean Vendor / Village Elder
+*** [#22] Tingle
+*** [#25] Village Dog
+*** [#39] Sea Zora Baby
+*** [#73] Farore
+*** [#A0] Deku Scrub (Mask) and NPCs
+*** [#B8] Zora Princess and NPCs
+*** [#D7] Vasu
+*** [#E8] Happy Mask Salesman
+*** [#F0] Mermaid / Maple / Librarian
+*** [#F1] Korok
+*** [#F2] Goron
+** Bosses
+*** [#88] Manhandla
+*** Advanced Arrghus
+*** King Dodongo
+*** [#CE] Twinrova
+*** [#C1] Dark Link
+*** Kydrog
+*** [#7A] Kydreeok
+** Enemies
+*** [#05] Helmet Chuchu
+*** [#14] Business Scrub (Kaly/Eon)
+*** [#1D] Darknut (Eon)
+*** [#2C] Goriya
+*** Octorok (Kaly/Eon)
+**** TODO Water Octorok
+*** [#A4] Pols Voice
+*** [#A8] Anti-Kirby
+*** [#A9] Wolfos
+**** Castle Variant
+**** TODO Ice Variant
+*** [#AE] Sea Urchin (Kaly/Eon)
+*** [#B1] Puffstool
+*** [#EF] Poltergeist
+*** [#CC] Booki
+*** [#CD] Thunder Ghost
+** Objects
+*** Collectibles
+*** Deku Leaf
+*** [#D5] Ice Block
+*** Minecart
+*** Mineswitch
+*** Switch track
+*** Portal Sprite
 * Tasks
 ** DONE Add Librarian translations
 ** DONE Goron Mines Opening Animation [2/2]
@@ -219,7 +232,6 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village
 
 ** ACTIVE Fix Minecart mechanics
 ** ACTIVE Collectible Item Quests
-*** TODO Golden Fish
 *** TODO Deku Stick
 *** TODO Honeycomb
 ** ACTIVE Add Dungeon Maps [0/11]
@@ -235,15 +247,15 @@ Located in the Mushroom Grotto west of the Maku Tree and Wayward Village
 - [ ] Shrine of Power
 - [ ] Shrine of Courage
 
+** TODO Update Kydreeok boss [0/2]
+- [ ] Improve fireball attack
+- [ ] Improve head/neck rotation
+
 ** TODO Update Kydrog boss [0/3]
 - [ ] Track offspring sprites spawned, more dynamic spawns
 - [ ] Improve Kydrog movement, add additional stage in fight
 - [ ] Cinematic opening and ending cutscene with dialogue
 
-** TODO Update Kydreeok boss [0/2]
-- [ ] Improve fireball attack
-- [ ] Improve head/neck rotation
-
 ** TODO Fortress of Secrets Cutscene
 Should use the Ganons Tower Crystal Cutscene as the base.
 
@@ -258,26 +270,36 @@ Should use the Ganons Tower Crystal Cutscene as the base.
 
 ** TODO End Credits
 
-
 * Timeline
 
-- Farore Intro
-  - GameState 7EF3C5:02
-  - StoryState    B6:01
-- Kydrog Intro
-  - OosProg2  7EF3C6:04
-  - IntroFlag 7EF300:01
-- Maku Tree Return from Eon Abyss
-  - OosProg   7EF3D6:02
+- Beginning
+  - Farore Intro
+    - GameState 7EF3C5:02
+    - StoryState    B6:01
+  - Kydrog Intro
+    - OosProg2  7EF3C6:04
+    - IntroFlag 7EF300:01
+  - Maku Tree Return from Eon Abyss
+    - OosProg   7EF3D6:02
 
-- Impa Hall of Secrets
-  - OosProg   7EF3D6:04
+- Kalyxo General
+  - Impa Hall of Secrets
+    - OosProg   7EF3D6:04
+  - Village Elder
+    - MAPICON interaction
+  - Ranch Kid
+    - MAPICON interaction
 
-- Ranch Kid
-  - MAPICON interaction
+- Toadstool Woods Mushroom -> Magic Powder from Potion Shop
+- Magic Powder -> Ocarina from chicken at Toto Ranch
+- Ocarina -> Song of Healing from Mask Salesman near village
+- Song of Healing -> Deku Mask from Deku Scrub near Mask Shop
+- Song of Healing -> Running Boots from Sick Kid in village
+- Running Boots   -> Book of Secrets from village library
 
-- Village Elder
-  - MAPICON interaction
+
+- Book of Secrets
+  - Lifts the Kalyxo Castle gates
 
 * ROM Map
 Expanded space used by ZScream as of 1/16/2024