diff --git a/.gitmodules b/.gitmodules
index a0bdeab..12a5f3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Z3DR"]
 	path = Z3DR
 	url = https://github.com/Z3DR/mm3dr.git
-	branch = dev
\ No newline at end of file
+	branch = dev
diff --git a/Z3DR b/Z3DR
index fb27ac2..2ec4b39 160000
--- a/Z3DR
+++ b/Z3DR
@@ -1 +1 @@
-Subproject commit fb27ac2d80c4c6c348ef98e23fed41c0821bbb0f
+Subproject commit 2ec4b39b0189eea05618032152b26bf07643f07e
diff --git a/source/item_location.cpp b/source/item_location.cpp
index f59a39c..fcfc23c 100644
--- a/source/item_location.cpp
+++ b/source/item_location.cpp
@@ -271,7 +271,7 @@ void LocationTable_Init() {
 
  //Woodfall Temple
  locationTable[WOODFALL_TEMPLE_HEROS_BOW_CHEST]                    = ItemLocation::Chest      (0x1B, 0x1B, true,  "Woodfall Temple Hero's Bow Chest",                         WOODFALL_TEMPLE_HEROS_BOW_CHEST,                PROGRESSIVE_BOW,              {Category::cWoodfall, Category::cWoodfallTemple,Category::cChest ,Category::cDayOne, Category::cMainInventory},                                                        SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
- locationTable[WOODFALL_TEMPLE_MAP_CHEST]                          = ItemLocation::Chest      (0x1B, 0x1D, true,  "Woodfall Temple Map Chest",                                WOODFALL_TEMPLE_MAP_CHEST,                      WOODFALL_MAP,                 {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaMap,Category::cDayOne},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
+ locationTable[WOODFALL_TEMPLE_MAP_CHEST]                          = ItemLocation::Chest      (0x1B, 0x1D, true,  "Woodfall Temple Map Chest",                                WOODFALL_TEMPLE_MAP_CHEST,                      WOODFALL_TEMPLE_MAP,          {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaMap,Category::cDayOne},                                                                              SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
  locationTable[WOODFALL_TEMPLE_COMPASS_CHEST]                      = ItemLocation::Chest      (0x1B, 0x1C, true,  "Woodfall Temple Compass Chest",                            WOODFALL_TEMPLE_COMPASS_CHEST,                  WOODFALL_TEMPLE_COMPASS,      {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaCompass,Category::cDayOne},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
  locationTable[WOODFALL_TEMPLE_BOSS_KEY_CHEST]                     = ItemLocation::Chest      (0x1B, 0x1E, true,  "Woodfall Temple Boss Key Chest",                           WOODFALL_TEMPLE_BOSS_KEY_CHEST,                 WOODFALL_TEMPLE_BOSS_KEY,     {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaBossKey,Category::cDayOne},                                                                          SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
  locationTable[WOODFALL_TEMPLE_SMALL_KEY_CHEST]                    = ItemLocation::Chest      (0x1B, 0x01, true,  "Woodfall Temple Small Key Chest",                          WOODFALL_TEMPLE_SMALL_KEY_CHEST,                WOODFALL_TEMPLE_SMALL_KEY,    {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaSmallKey,Category::cDayOne},                                                                         SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
@@ -302,7 +302,7 @@ void LocationTable_Init() {
  locationTable[STONE_TOWER_TEMPLE_BRIDGE_SWITCH_CHEST]             = ItemLocation::Chest      (0x16, 0x01, true,  "Stone Tower Temple Bridge Switch Chest",                   STONE_TOWER_TEMPLE_BRIDGE_SWITCH_CHEST,         STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne},                                                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
  locationTable[STONE_TOWER_TEMPLE_UPDRAFT_ROOM_CHEST]              = ItemLocation::Chest      (0x18, 0x04, true,  "Stone Tower Temple Updraft Room Chest",                    STONE_TOWER_TEMPLE_UPDRAFT_ROOM_CHEST,          STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne},                                                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
  locationTable[STONE_TOWER_TEMPLE_DEATH_ARMOS_ROOM_CHEST]          = ItemLocation::Chest      (0x18, 0x05, true,  "Stone Tower Temple Death Armos Room Chest",                STONE_TOWER_TEMPLE_DEATH_ARMOS_ROOM_CHEST,      STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne},                                                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
- locationTable[STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST]  = ItemLocation::Chest      (0x16, 0x05, true,  "Stone Tower Temple Upright Death Armos Room Chest",        STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cNull},                                                                                                                                                  SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
+ locationTable[STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST]  = ItemLocation::Chest      (0x16, 0x05, true,  "Stone Tower Temple Upright Death Armos Room Chest",        STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne},                                                                                                                                                  SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
  locationTable[STONE_TOWER_TEMPLE_LIGHT_ARROW_CHEST]               = ItemLocation::Chest      (0x16, 0x1B, true,  "Stone Tower Temple Light Arrow Chest",                     STONE_TOWER_TEMPLE_LIGHT_ARROW_CHEST,           LIGHT_ARROWS,                 {Category::cStoneTowerTemple,Category::cChest ,Category::cDayOne, Category::cMainInventory},                                                                           SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
  locationTable[STONE_TOWER_TEMPLE_GIANTS_MASK_CHEST]               = ItemLocation::Chest      (0x36, 0x00, false, "Stone Tower Temple Giant's Mask Chest",                    STONE_TOWER_TEMPLE_GIANTS_MASK_CHEST,           GIANTS_MASK,                  {Category::cStoneTowerTemple,Category::cChest, Category::cVanillaMask ,Category::cDayOne},                                                                             SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
  
diff --git a/source/settings.cpp b/source/settings.cpp
index 708cf9b..c73d63f 100644
--- a/source/settings.cpp
+++ b/source/settings.cpp
@@ -419,7 +419,7 @@ namespace Settings {
       &HintDistribution,
       &CompassShowWoTH,
       &DamageMultiplier,
-      //&ChestAnimations,
+      &ChestAnimations,
       &ChestSize,
       //&ChangeOverworldItems,
       //&MenuOpeningButton,