diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index bf72c10..62c4508 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -9,11 +9,11 @@ on:
       mc_version:
         description: 'Minecraft version(s) the data pack runs in (human readable)'
         required: true
-        default: '1.17x-1.20x'
+        default: '1.17x-1.21x'
       mc_version_range:
         description: 'Minecraft version(s) the data pack runs in (encoded in version range spec)'
         required: true
-        default: '>=1.17 <=1.20.4'
+        default: '>=1.17 <=1.21'
 
 jobs:
   deploy:
@@ -91,6 +91,7 @@ jobs:
           modrinth-id: 7YjclEGc
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "[DP] Release v${{ github.event.inputs.tag }}"
@@ -109,6 +110,7 @@ jobs:
           modrinth-id: 7YjclEGc
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "[Mod] Release v${{ github.event.inputs.tag }}"
@@ -134,6 +136,7 @@ jobs:
           curseforge-id: 831385
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "Release v${{ github.event.inputs.tag }}"
@@ -152,6 +155,7 @@ jobs:
           curseforge-id: 910095
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           game-versions: ${{ github.event.inputs.mc_version_range }}
+          game-version-filter: any
           fail-mode: skip
 
           name: "Release v${{ github.event.inputs.tag }}"
@@ -163,6 +167,7 @@ jobs:
             catalogue-fabric(optional){curseforge:667377}
             midnightlib(optional){curseforge:488090}
           java: |
+            Java 21
             Java 17
             Java 18
           loaders: |
diff --git a/data/dynamiclights/function/install.mcfunction b/data/dynamiclights/function/install.mcfunction
index 1b13d40..91df6e1 100644
--- a/data/dynamiclights/function/install.mcfunction
+++ b/data/dynamiclights/function/install.mcfunction
@@ -59,6 +59,7 @@ execute unless score $rain_sensitive ts.dl.settings matches -1..2 run scoreboard
 execute unless score $unlimited ts.dl.settings matches -1..2 run scoreboard players set $unlimited ts.dl.settings 0
 
 scoreboard objectives add tschipcraft.menu trigger
+scoreboard players enable @a tschipcraft.menu
 
 scoreboard objectives add tvc_ignore dummy
 
diff --git a/data/dynamiclights/function/internal/sources/parse/main.mcfunction b/data/dynamiclights/function/internal/sources/parse/main.mcfunction
index 68b2454..37b5a28 100644
--- a/data/dynamiclights/function/internal/sources/parse/main.mcfunction
+++ b/data/dynamiclights/function/internal/sources/parse/main.mcfunction
@@ -5,6 +5,7 @@ summon armor_stand ~ ~ ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115]
 # Copy NBT data
 execute as @s[type=minecraft:falling_block] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0].id set from entity @s BlockState.Name
 execute as @s[type=minecraft:block_display] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0].id set from entity @s block_state.Name
+execute as @s[type=minecraft:ominous_item_spawner] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0] set from entity @s item
 
 execute as c295ddee-4c15-4e5b-83ba-2fbce873a1d5 run function dynamiclights:internal/sources/parse/main_exec
 
diff --git a/data/dynamiclights/function/reset.mcfunction b/data/dynamiclights/function/reset.mcfunction
index 86bdb4b..1fc6361 100644
--- a/data/dynamiclights/function/reset.mcfunction
+++ b/data/dynamiclights/function/reset.mcfunction
@@ -10,6 +10,7 @@ function dynamiclights:internal/explosion_detection/reset
 
 # Reset advancement
 advancement revoke @a only tschipcraft:menu
+scoreboard players enable @a tschipcraft.menu
 
 # Reschedule main function
 schedule function dynamiclights:internal/main 5t
diff --git a/data/dynamiclights/tags/entity_type/parse.json b/data/dynamiclights/tags/entity_type/parse.json
index ceaec6f..f76dca1 100644
--- a/data/dynamiclights/tags/entity_type/parse.json
+++ b/data/dynamiclights/tags/entity_type/parse.json
@@ -4,6 +4,7 @@
   "replace": false,
   "values": [
     "minecraft:falling_block",
-    {"id": "minecraft:block_display", "required": false}
+    {"id": "minecraft:block_display", "required": false},
+    {"id": "minecraft:ominous_item_spawner", "required": false}
   ]
 }
diff --git a/data/dynamiclights/tags/entity_type/single_slot_entities.json b/data/dynamiclights/tags/entity_type/single_slot_entities.json
index 1038209..9467ed1 100644
--- a/data/dynamiclights/tags/entity_type/single_slot_entities.json
+++ b/data/dynamiclights/tags/entity_type/single_slot_entities.json
@@ -7,7 +7,6 @@
     "minecraft:item",
     "minecraft:item_display",
     "minecraft:item_frame",
-    "minecraft:glow_item_frame",
-    {"id": "minecraft:ominous_item_spawner", "required": false}
+    "minecraft:glow_item_frame"
   ]
 }
diff --git a/overlay_35/data/dynamiclights/functions/internal/sources/parse/main.mcfunction b/overlay_35/data/dynamiclights/functions/internal/sources/parse/main.mcfunction
index 68b2454..37b5a28 100644
--- a/overlay_35/data/dynamiclights/functions/internal/sources/parse/main.mcfunction
+++ b/overlay_35/data/dynamiclights/functions/internal/sources/parse/main.mcfunction
@@ -5,6 +5,7 @@ summon armor_stand ~ ~ ~ {UUID:[I;-1030365714,1276464731,-2084950084,-395075115]
 # Copy NBT data
 execute as @s[type=minecraft:falling_block] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0].id set from entity @s BlockState.Name
 execute as @s[type=minecraft:block_display] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0].id set from entity @s block_state.Name
+execute as @s[type=minecraft:ominous_item_spawner] run data modify entity c295ddee-4c15-4e5b-83ba-2fbce873a1d5 HandItems[0] set from entity @s item
 
 execute as c295ddee-4c15-4e5b-83ba-2fbce873a1d5 run function dynamiclights:internal/sources/parse/main_exec
 
diff --git a/overlay_35/data/dynamiclights/tags/entity_types/parse.json b/overlay_35/data/dynamiclights/tags/entity_types/parse.json
index 3504c26..5d891a4 100644
--- a/overlay_35/data/dynamiclights/tags/entity_types/parse.json
+++ b/overlay_35/data/dynamiclights/tags/entity_types/parse.json
@@ -4,6 +4,7 @@
   "replace": false,
   "values": [
     "minecraft:falling_block",
-    {"id": "minecraft:block_display", "required": false}
+    {"id": "minecraft:block_display", "required": false},
+    {"id": "minecraft:ominous_item_spawner", "required": false}
   ]
 }
diff --git a/overlay_35/data/dynamiclights/tags/entity_types/single_slot_entities.json b/overlay_35/data/dynamiclights/tags/entity_types/single_slot_entities.json
index 1038209..9467ed1 100644
--- a/overlay_35/data/dynamiclights/tags/entity_types/single_slot_entities.json
+++ b/overlay_35/data/dynamiclights/tags/entity_types/single_slot_entities.json
@@ -7,7 +7,6 @@
     "minecraft:item",
     "minecraft:item_display",
     "minecraft:item_frame",
-    "minecraft:glow_item_frame",
-    {"id": "minecraft:ominous_item_spawner", "required": false}
+    "minecraft:glow_item_frame"
   ]
 }