diff --git a/documentation/Addons.html b/documentation/Addons.html
index 0c15e5889..8ed235a39 100644
--- a/documentation/Addons.html
+++ b/documentation/Addons.html
@@ -1,4 +1,4 @@
-<h1>ADDONS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ADDONS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Animations.html b/documentation/Animations.html
index 8af877699..7b459aade 100644
--- a/documentation/Animations.html
+++ b/documentation/Animations.html
@@ -1,4 +1,4 @@
-<h1>ANIMATIONS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ANIMATIONS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Biomes.html b/documentation/Biomes.html
index 4509010b8..27f20f262 100644
--- a/documentation/Biomes.html
+++ b/documentation/Biomes.html
@@ -1,4 +1,4 @@
-<h1>BIOMES DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>BIOMES DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Blocks.html b/documentation/Blocks.html
index 02f9689c9..8fa5e1ca2 100644
--- a/documentation/Blocks.html
+++ b/documentation/Blocks.html
@@ -1,4 +1,4 @@
-<h1>BLOCKS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>BLOCKS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Entities.html b/documentation/Entities.html
index c461a803f..cbba8121b 100644
--- a/documentation/Entities.html
+++ b/documentation/Entities.html
@@ -1,4 +1,4 @@
-<h1>ENTITIES DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ENTITIES DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
@@ -13207,7 +13207,7 @@ <h2><p id="minecraft:behavior.follow_mob">minecraft:behavior.follow_mob</p></h2>
 
 <h2><p id="minecraft:behavior.follow_owner">minecraft:behavior.follow_owner</p></h2>
 
-Allows the mob to follow the player that owns them.</br><h3></h3>
+Allows a mob to follow the player that owns it.</br><h3></h3>
 
 <table border="1" style="width:100%; border-style:solid; border-collapse:collapse; border-width:2;">
 <tr> <th style="border-style:solid; border-width:2;">Name</th> <th style="border-style:solid; border-width:2;">Type</th> <th style="border-style:solid; border-width:2;">Default Value</th> <th style="border-style:solid; border-width:2;">Description</th> </tr>
@@ -13215,19 +13215,25 @@ <h2><p id="minecraft:behavior.follow_owner">minecraft:behavior.follow_owner</p><
 <td style="border-style:solid; border-width:2; padding:8px">can_teleport</td>
 <td style="border-style:solid; border-width:2; padding:8px">Boolean</td>
 <td style="border-style:solid; border-width:2; padding:8px">true</td>
-<td style="border-style:solid; border-width:2; padding:8px">Specify if the mob can teleport to the player if it is too far away</br></td>
+<td style="border-style:solid; border-width:2; padding:8px">Defines if the mob will teleport to its owner when too far away.</br></td>
 </tr>
 <tr>
 <td style="border-style:solid; border-width:2; padding:8px">ignore_vibration</td>
 <td style="border-style:solid; border-width:2; padding:8px">Boolean</td>
 <td style="border-style:solid; border-width:2; padding:8px">true</td>
-<td style="border-style:solid; border-width:2; padding:8px">Specify if the mob will follow the owner if it has heard a vibration lately</br></td>
+<td style="border-style:solid; border-width:2; padding:8px">Defines if the mob should disregard following its owner after detecting a recent vibration.</br></td>
 </tr>
 <tr>
 <td style="border-style:solid; border-width:2; padding:8px">max_distance</td>
 <td style="border-style:solid; border-width:2; padding:8px">Decimal</td>
 <td style="border-style:solid; border-width:2; padding:8px">60.0</td>
-<td style="border-style:solid; border-width:2; padding:8px">The maximum distance in blocks this mob can be from its owner to start following, only used when canTeleport is false</br></td>
+<td style="border-style:solid; border-width:2; padding:8px">The maximum distance the mob can be from its owner to start following it. Applicable only when "can_teleport" is set to false.</br></td>
+</tr>
+<tr>
+<td style="border-style:solid; border-width:2; padding:8px">post_teleport_distance</td>
+<td style="border-style:solid; border-width:2; padding:8px">Boolean</td>
+<td style="border-style:solid; border-width:2; padding:8px">"stop_distance" + 1</td>
+<td style="border-style:solid; border-width:2; padding:8px">Defines how far (in blocks) the entity will be from its owner after teleporting. If not specified, it defaults to "stop_distance" + 1, allowing the entity to seamlessly resume navigation.</br></td>
 </tr>
 <tr>
 <td style="border-style:solid; border-width:2; padding:8px">speed_multiplier</td>
@@ -13239,13 +13245,13 @@ <h2><p id="minecraft:behavior.follow_owner">minecraft:behavior.follow_owner</p><
 <td style="border-style:solid; border-width:2; padding:8px">start_distance</td>
 <td style="border-style:solid; border-width:2; padding:8px">Decimal</td>
 <td style="border-style:solid; border-width:2; padding:8px">10.0</td>
-<td style="border-style:solid; border-width:2; padding:8px">The distance in blocks that the owner can be away from this mob before it starts following it</br></td>
+<td style="border-style:solid; border-width:2; padding:8px">The minimum distance the mob must be from its owner to start following it.</br></td>
 </tr>
 <tr>
 <td style="border-style:solid; border-width:2; padding:8px">stop_distance</td>
 <td style="border-style:solid; border-width:2; padding:8px">Decimal</td>
 <td style="border-style:solid; border-width:2; padding:8px">2.0</td>
-<td style="border-style:solid; border-width:2; padding:8px">The distance in blocks this mob will stop from its owner while following it</br></td>
+<td style="border-style:solid; border-width:2; padding:8px">The distance at which the mob will stop following its owner.</br></td>
 </tr>
 </table>
 <a href="#Index">Back to top</a><br><br>
diff --git a/documentation/Entity Events.html b/documentation/Entity Events.html
index 242149a11..49f8005cf 100644
--- a/documentation/Entity Events.html	
+++ b/documentation/Entity Events.html	
@@ -1,4 +1,4 @@
-<h1>ENTITY EVENTS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ENTITY EVENTS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Entity Timeline Events.html b/documentation/Entity Timeline Events.html
index 264f8a090..3d2f023bb 100644
--- a/documentation/Entity Timeline Events.html	
+++ b/documentation/Entity Timeline Events.html	
@@ -1,4 +1,4 @@
-<h1>ENTITY TIMELINE EVENTS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ENTITY TIMELINE EVENTS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Features.html b/documentation/Features.html
index 369240cc7..8661130e0 100644
--- a/documentation/Features.html
+++ b/documentation/Features.html
@@ -1,4 +1,4 @@
-<h1>FEATURES DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>FEATURES DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Fogs.html b/documentation/Fogs.html
index e7bc58d04..cccefaa72 100644
--- a/documentation/Fogs.html
+++ b/documentation/Fogs.html
@@ -1,4 +1,4 @@
-<h1>FOGS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>FOGS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Index.html b/documentation/Index.html
index 0d1aa7e77..ea60a2d3f 100644
--- a/documentation/Index.html
+++ b/documentation/Index.html
@@ -1,4 +1,4 @@
-<html><head><title>DOCUMENTATION</title></head><body><h1>DOCUMENTATION</br>Version: 1.21.20.22
+<html><head><title>DOCUMENTATION</title></head><body><h1>DOCUMENTATION</br>Version: 1.21.20.23
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <ol>
 <li><a href="Addons.html">Addons</a>
diff --git a/documentation/Item.html b/documentation/Item.html
index 0e8cc7f08..785ed51ed 100644
--- a/documentation/Item.html
+++ b/documentation/Item.html
@@ -1,4 +1,4 @@
-<h1>ITEM DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>ITEM DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Molang.html b/documentation/Molang.html
index 630636b5b..7ba9829e9 100644
--- a/documentation/Molang.html
+++ b/documentation/Molang.html
@@ -1,4 +1,4 @@
-<h1>MOLANG DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>MOLANG DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Particles.html b/documentation/Particles.html
index 9ad7a7941..a4bda2eeb 100644
--- a/documentation/Particles.html
+++ b/documentation/Particles.html
@@ -1,4 +1,4 @@
-<h1>PARTICLES DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>PARTICLES DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Recipes.html b/documentation/Recipes.html
index 89abc9608..de29708c2 100644
--- a/documentation/Recipes.html
+++ b/documentation/Recipes.html
@@ -1,4 +1,4 @@
-<h1>RECIPES DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>RECIPES DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Schemas.html b/documentation/Schemas.html
index f4f12f7b6..6662d134f 100644
--- a/documentation/Schemas.html
+++ b/documentation/Schemas.html
@@ -1,4 +1,4 @@
-<h1>SCHEMAS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>SCHEMAS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/documentation/Texture Sets.html b/documentation/Texture Sets.html
index 86af2fc0d..65c18c12a 100644
--- a/documentation/Texture Sets.html	
+++ b/documentation/Texture Sets.html	
@@ -1,4 +1,4 @@
-<h1>TEXTURE SETS DOCUMENTATION </br>Version: 1.21.20.22</h1>
+<h1>TEXTURE SETS DOCUMENTATION </br>Version: 1.21.20.23</h1>
 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.<br/>Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.<br/>
 <h2><p id="Index">Index</p></h2>
 <table border="1">
diff --git a/metadata/command_modules/mojang-commands.json b/metadata/command_modules/mojang-commands.json
index 3ec947597..00f13fdf6 100644
--- a/metadata/command_modules/mojang-commands.json
+++ b/metadata/command_modules/mojang-commands.json
@@ -37905,7 +37905,7 @@
          "requires_cheats" : true
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "commands",
    "name" : "mojang-commands"
 }
diff --git a/metadata/engine_modules/engine-after-events-ordering.json b/metadata/engine_modules/engine-after-events-ordering.json
index f40322f99..69b9f3a46 100644
--- a/metadata/engine_modules/engine-after-events-ordering.json
+++ b/metadata/engine_modules/engine-after-events-ordering.json
@@ -1726,7 +1726,7 @@
          "version" : "0.1.0-beta"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "after_events_ordering",
    "name" : "engine-after_events_ordering"
 }
diff --git a/metadata/json_schemas/Component v1.20.50.json b/metadata/json_schemas/Component v1.20.50.json
index edda80aec..4ac23973d 100644
--- a/metadata/json_schemas/Component v1.20.50.json	
+++ b/metadata/json_schemas/Component v1.20.50.json	
@@ -608,7 +608,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
diff --git a/metadata/json_schemas/Component v1.20.60.json b/metadata/json_schemas/Component v1.20.60.json
index 9652f2c0f..aa4d76814 100644
--- a/metadata/json_schemas/Component v1.20.60.json	
+++ b/metadata/json_schemas/Component v1.20.60.json	
@@ -613,7 +613,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
diff --git a/metadata/json_schemas/Components v1.20.80.json b/metadata/json_schemas/Components v1.20.80.json
index d6e87fc81..8132e4e25 100644
--- a/metadata/json_schemas/Components v1.20.80.json	
+++ b/metadata/json_schemas/Components v1.20.80.json	
@@ -613,7 +613,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
diff --git a/metadata/json_schemas/Components v1.21.10.json b/metadata/json_schemas/Components v1.21.10.json
index a0fb652bd..8c03ab39c 100644
--- a/metadata/json_schemas/Components v1.21.10.json	
+++ b/metadata/json_schemas/Components v1.21.10.json	
@@ -652,7 +652,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
@@ -1540,7 +1539,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
diff --git a/metadata/json_schemas/DurabilitySensor v1.21.10.json b/metadata/json_schemas/DurabilitySensor v1.21.10.json
index 5ca4eaf4b..7b05d804b 100644
--- a/metadata/json_schemas/DurabilitySensor v1.21.10.json	
+++ b/metadata/json_schemas/DurabilitySensor v1.21.10.json	
@@ -277,7 +277,6 @@
                         "imitate.evocation_illager",
                         "imitate.ghast",
                         "imitate.husk",
-                        "imitate.illusion_illager",
                         "imitate.magma_cube",
                         "imitate.polar_bear",
                         "imitate.shulker",
diff --git a/metadata/json_schemas/DurabilityThreshold v1.21.10.json b/metadata/json_schemas/DurabilityThreshold v1.21.10.json
index 96037b937..46890ea91 100644
--- a/metadata/json_schemas/DurabilityThreshold v1.21.10.json	
+++ b/metadata/json_schemas/DurabilityThreshold v1.21.10.json	
@@ -275,7 +275,6 @@
                 "imitate.evocation_illager",
                 "imitate.ghast",
                 "imitate.husk",
-                "imitate.illusion_illager",
                 "imitate.magma_cube",
                 "imitate.polar_bear",
                 "imitate.shulker",
diff --git a/metadata/json_schemas/JigsawStructureSet v1.20.80.json b/metadata/json_schemas/JigsawStructureSet v1.20.80.json
new file mode 100644
index 000000000..dbe5bb0ab
--- /dev/null
+++ b/metadata/json_schemas/JigsawStructureSet v1.20.80.json	
@@ -0,0 +1,124 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "1183708975",
+    "definitions": {
+        "1291913506": {
+            "title": "struct SharedTypes::v1_20_80::JigsawStructureSet::Contents::Structure",
+            "type": "object",
+            "properties": {
+                "structure": {
+                    "description": "Identifier of the Jigsaw Structure.",
+                    "type": "string"
+                },
+                "weight": {
+                    "description": "Weight of the Jigsaw Structure in the set. Higher weights are more likely to be selected.",
+                    "type": "integer",
+                    "minimum": 1.0,
+                    "maximum": 200.0
+                }
+            },
+            "required": [
+                "structure",
+                "weight"
+            ]
+        },
+        "1733122864": {
+            "title": "struct SharedTypes::v1_20_80::JigsawStructureSet::Contents::RandomSpreadPlacement",
+            "type": "object",
+            "properties": {
+                "salt": {
+                    "description": "Seed for the random spread placement.",
+                    "type": "integer"
+                },
+                "separation": {
+                    "description": "Padding (in chunks) within each grid cell. Structures will not generate within the padded area.",
+                    "type": "integer",
+                    "minimum": 0.0
+                },
+                "spacing": {
+                    "description": "Grid cell size (in chunks) to use when generating the structure. Structures will attempt to generate at a random position within each cell.",
+                    "type": "integer",
+                    "minimum": 1.0
+                },
+                "spread_type": {
+                    "title": "enum SharedTypes::v1_20_80::JigsawStructureSet::Contents::SpreadType",
+                    "description": "Type of spread for the Jigsaw Structure Set.",
+                    "type": "string",
+                    "enum": [
+                        "linear",
+                        "triangular"
+                    ]
+                },
+                "type": {
+                    "title": "enum SharedTypes::v1_20_80::JigsawStructureSet::Contents::PlacementType",
+                    "description": "Type of placement for the Jigsaw Structure Set.",
+                    "type": "string",
+                    "enum": [
+                        "minecraft:random_spread"
+                    ]
+                }
+            },
+            "required": [
+                "salt",
+                "separation",
+                "spacing",
+                "type"
+            ]
+        },
+        "199627185": {
+            "title": "struct SharedTypes::v1_20_80::JigsawStructureSet::Contents",
+            "type": "object",
+            "properties": {
+                "description": {
+                    "description": "Description of the Structure Set",
+                    "$ref": "#/definitions/4165405077"
+                },
+                "placement": {
+                    "description": "Placement settings for the Structure Set.",
+                    "$ref": "#/definitions/1733122864"
+                },
+                "structures": {
+                    "title": "sequence container",
+                    "description": "Weighted list of Jigsaw Structures in the set.",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/1291913506"
+                    }
+                }
+            },
+            "required": [
+                "description",
+                "placement",
+                "structures"
+            ]
+        },
+        "4165405077": {
+            "title": "struct SharedTypes::v1_20_80::JigsawStructureSet::Contents::Description",
+            "type": "object",
+            "properties": {
+                "identifier": {
+                    "description": "Identifier of the Jigsaw Structure Set.",
+                    "type": "string"
+                }
+            },
+            "required": [
+                "identifier"
+            ]
+        }
+    },
+    "title": "struct SharedTypes::v1_20_80::JigsawStructureSet",
+    "type": "object",
+    "properties": {
+        "format_version": {
+            "type": "string"
+        },
+        "minecraft:structure_set": {
+            "description": "A Jigsaw Structure Set is a collection of Jigsaw Structures that are placed according to a set of rules.",
+            "$ref": "#/definitions/199627185"
+        }
+    },
+    "required": [
+        "format_version",
+        "minecraft:structure_set"
+    ]
+}
\ No newline at end of file
diff --git a/metadata/json_schemas/Record v1.20.50.json b/metadata/json_schemas/Record v1.20.50.json
index f9def9143..52706816a 100644
--- a/metadata/json_schemas/Record v1.20.50.json	
+++ b/metadata/json_schemas/Record v1.20.50.json	
@@ -275,7 +275,6 @@
                 "imitate.evocation_illager",
                 "imitate.ghast",
                 "imitate.husk",
-                "imitate.illusion_illager",
                 "imitate.magma_cube",
                 "imitate.polar_bear",
                 "imitate.shulker",
diff --git a/metadata/script_modules/@minecraft/common_1.0.0.json b/metadata/script_modules/@minecraft/common_1.0.0.json
index 5fb7a7fc9..fa163521d 100644
--- a/metadata/script_modules/@minecraft/common_1.0.0.json
+++ b/metadata/script_modules/@minecraft/common_1.0.0.json
@@ -88,7 +88,7 @@
    ],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/common",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/common_1.1.0.json b/metadata/script_modules/@minecraft/common_1.1.0.json
index 377938d9c..03b7e9277 100644
--- a/metadata/script_modules/@minecraft/common_1.1.0.json
+++ b/metadata/script_modules/@minecraft/common_1.1.0.json
@@ -126,7 +126,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/common",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/common_1.2.0.json b/metadata/script_modules/@minecraft/common_1.2.0.json
index cc20ea25b..d9e489ba0 100644
--- a/metadata/script_modules/@minecraft/common_1.2.0.json
+++ b/metadata/script_modules/@minecraft/common_1.2.0.json
@@ -175,7 +175,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/common",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/debug-utilities_1.0.0-beta.json b/metadata/script_modules/@minecraft/debug-utilities_1.0.0-beta.json
index 021d33d9e..16a024faa 100644
--- a/metadata/script_modules/@minecraft/debug-utilities_1.0.0-beta.json
+++ b/metadata/script_modules/@minecraft/debug-utilities_1.0.0-beta.json
@@ -40,7 +40,7 @@
       }
    ],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/debug-utilities",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/server-admin_1.0.0-beta.json b/metadata/script_modules/@minecraft/server-admin_1.0.0-beta.json
index b0582f274..8619c131c 100644
--- a/metadata/script_modules/@minecraft/server-admin_1.0.0-beta.json
+++ b/metadata/script_modules/@minecraft/server-admin_1.0.0-beta.json
@@ -157,7 +157,7 @@
    "errors" : [],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-admin",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server-gametest_1.0.0-beta.json b/metadata/script_modules/@minecraft/server-gametest_1.0.0-beta.json
index edd8a3355..5318ce7bd 100644
--- a/metadata/script_modules/@minecraft/server-gametest_1.0.0-beta.json
+++ b/metadata/script_modules/@minecraft/server-gametest_1.0.0-beta.json
@@ -5673,7 +5673,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-gametest",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/server-net_1.0.0-beta.json b/metadata/script_modules/@minecraft/server-net_1.0.0-beta.json
index 3a195a32c..d7a732e06 100644
--- a/metadata/script_modules/@minecraft/server-net_1.0.0-beta.json
+++ b/metadata/script_modules/@minecraft/server-net_1.0.0-beta.json
@@ -566,7 +566,7 @@
    "errors" : [],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-net",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server-ui_1.0.0.json b/metadata/script_modules/@minecraft/server-ui_1.0.0.json
index 30babc13e..ed2b646eb 100644
--- a/metadata/script_modules/@minecraft/server-ui_1.0.0.json
+++ b/metadata/script_modules/@minecraft/server-ui_1.0.0.json
@@ -1068,7 +1068,7 @@
    ],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-ui",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/server-ui_1.1.0.json b/metadata/script_modules/@minecraft/server-ui_1.1.0.json
index 6033ba215..ba3daa4d2 100644
--- a/metadata/script_modules/@minecraft/server-ui_1.1.0.json
+++ b/metadata/script_modules/@minecraft/server-ui_1.1.0.json
@@ -1119,7 +1119,7 @@
    ],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-ui",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/server-ui_1.2.0.json b/metadata/script_modules/@minecraft/server-ui_1.2.0.json
index d0adeb07d..51e3412ff 100644
--- a/metadata/script_modules/@minecraft/server-ui_1.2.0.json
+++ b/metadata/script_modules/@minecraft/server-ui_1.2.0.json
@@ -1158,7 +1158,7 @@
    ],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-ui",
    "objects" : [],
diff --git a/metadata/script_modules/@minecraft/server-ui_1.3.0-beta.json b/metadata/script_modules/@minecraft/server-ui_1.3.0-beta.json
index a50e3009f..ee43b5c6b 100644
--- a/metadata/script_modules/@minecraft/server-ui_1.3.0-beta.json
+++ b/metadata/script_modules/@minecraft/server-ui_1.3.0-beta.json
@@ -1198,7 +1198,7 @@
    ],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server-ui",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.0.0.json b/metadata/script_modules/@minecraft/server_1.0.0.json
index 8873215c6..76a508576 100644
--- a/metadata/script_modules/@minecraft/server_1.0.0.json
+++ b/metadata/script_modules/@minecraft/server_1.0.0.json
@@ -321,7 +321,7 @@
    "errors" : [],
    "functions" : [],
    "interfaces" : [],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.1.0.json b/metadata/script_modules/@minecraft/server_1.1.0.json
index 76555c421..1e5ee9635 100644
--- a/metadata/script_modules/@minecraft/server_1.1.0.json
+++ b/metadata/script_modules/@minecraft/server_1.1.0.json
@@ -1847,7 +1847,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.10.0.json b/metadata/script_modules/@minecraft/server_1.10.0.json
index 0f85814c0..1258473b7 100644
--- a/metadata/script_modules/@minecraft/server_1.10.0.json
+++ b/metadata/script_modules/@minecraft/server_1.10.0.json
@@ -24031,7 +24031,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.11.0.json b/metadata/script_modules/@minecraft/server_1.11.0.json
index 35f352afb..860852050 100644
--- a/metadata/script_modules/@minecraft/server_1.11.0.json
+++ b/metadata/script_modules/@minecraft/server_1.11.0.json
@@ -28598,7 +28598,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.12.0.json b/metadata/script_modules/@minecraft/server_1.12.0.json
index 2ec7e5b80..c34f488fe 100644
--- a/metadata/script_modules/@minecraft/server_1.12.0.json
+++ b/metadata/script_modules/@minecraft/server_1.12.0.json
@@ -31639,7 +31639,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.13.0.json b/metadata/script_modules/@minecraft/server_1.13.0.json
index 7e56257ad..4f7476d11 100644
--- a/metadata/script_modules/@minecraft/server_1.13.0.json
+++ b/metadata/script_modules/@minecraft/server_1.13.0.json
@@ -31885,7 +31885,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.14.0-beta.json b/metadata/script_modules/@minecraft/server_1.14.0-beta.json
index 81d8ac60a..c6c24b870 100644
--- a/metadata/script_modules/@minecraft/server_1.14.0-beta.json
+++ b/metadata/script_modules/@minecraft/server_1.14.0-beta.json
@@ -36741,7 +36741,7 @@
             }
         }
     ],
-    "minecraft_version": "1.21.20-beta.0",
+    "minecraft_version": "1.21.20-beta.23",
     "module_type": "script",
     "name": "@minecraft/server",
     "objects": [
diff --git a/metadata/script_modules/@minecraft/server_1.2.0.json b/metadata/script_modules/@minecraft/server_1.2.0.json
index d082cb1e6..d3b5a0ddb 100644
--- a/metadata/script_modules/@minecraft/server_1.2.0.json
+++ b/metadata/script_modules/@minecraft/server_1.2.0.json
@@ -5105,7 +5105,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.3.0.json b/metadata/script_modules/@minecraft/server_1.3.0.json
index d07b522c3..1ae7c5509 100644
--- a/metadata/script_modules/@minecraft/server_1.3.0.json
+++ b/metadata/script_modules/@minecraft/server_1.3.0.json
@@ -6903,7 +6903,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.4.0.json b/metadata/script_modules/@minecraft/server_1.4.0.json
index 94810141c..f7bac2a62 100644
--- a/metadata/script_modules/@minecraft/server_1.4.0.json
+++ b/metadata/script_modules/@minecraft/server_1.4.0.json
@@ -12422,7 +12422,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.5.0.json b/metadata/script_modules/@minecraft/server_1.5.0.json
index 0e0900222..2f11e591a 100644
--- a/metadata/script_modules/@minecraft/server_1.5.0.json
+++ b/metadata/script_modules/@minecraft/server_1.5.0.json
@@ -13383,7 +13383,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.6.0.json b/metadata/script_modules/@minecraft/server_1.6.0.json
index 42e418e80..57dd6c807 100644
--- a/metadata/script_modules/@minecraft/server_1.6.0.json
+++ b/metadata/script_modules/@minecraft/server_1.6.0.json
@@ -16429,7 +16429,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.7.0.json b/metadata/script_modules/@minecraft/server_1.7.0.json
index ab1aef8d4..bb5174325 100644
--- a/metadata/script_modules/@minecraft/server_1.7.0.json
+++ b/metadata/script_modules/@minecraft/server_1.7.0.json
@@ -18295,7 +18295,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.8.0.json b/metadata/script_modules/@minecraft/server_1.8.0.json
index d0e41c467..12885432e 100644
--- a/metadata/script_modules/@minecraft/server_1.8.0.json
+++ b/metadata/script_modules/@minecraft/server_1.8.0.json
@@ -19099,7 +19099,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/script_modules/@minecraft/server_1.9.0.json b/metadata/script_modules/@minecraft/server_1.9.0.json
index 0f49f271e..a10a6e6e6 100644
--- a/metadata/script_modules/@minecraft/server_1.9.0.json
+++ b/metadata/script_modules/@minecraft/server_1.9.0.json
@@ -21870,7 +21870,7 @@
          }
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "script",
    "name" : "@minecraft/server",
    "objects" : [
diff --git a/metadata/vanilladata_modules/mojang-biomes.json b/metadata/vanilladata_modules/mojang-biomes.json
index b0e73056f..a8223d574 100644
--- a/metadata/vanilladata_modules/mojang-biomes.json
+++ b/metadata/vanilladata_modules/mojang-biomes.json
@@ -259,7 +259,7 @@
          "name" : "minecraft:warped_forest"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-biome",
    "vanilla_data_type" : "biome"
diff --git a/metadata/vanilladata_modules/mojang-blocks.json b/metadata/vanilladata_modules/mojang-blocks.json
index 0dd62927f..79ebeb8d7 100644
--- a/metadata/vanilladata_modules/mojang-blocks.json
+++ b/metadata/vanilladata_modules/mojang-blocks.json
@@ -11681,7 +11681,7 @@
          "properties" : []
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-block",
    "vanilla_data_type" : "block"
diff --git a/metadata/vanilladata_modules/mojang-camera-presets.json b/metadata/vanilladata_modules/mojang-camera-presets.json
index 1b632a403..9c2a4eec8 100644
--- a/metadata/vanilladata_modules/mojang-camera-presets.json
+++ b/metadata/vanilladata_modules/mojang-camera-presets.json
@@ -16,7 +16,7 @@
          "name" : "minecraft:third_person_front"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-cameraPresets",
    "vanilla_data_type" : "cameraPresets"
diff --git a/metadata/vanilladata_modules/mojang-cooldown-category.json b/metadata/vanilladata_modules/mojang-cooldown-category.json
index ae31ca480..7eee8b223 100644
--- a/metadata/vanilladata_modules/mojang-cooldown-category.json
+++ b/metadata/vanilladata_modules/mojang-cooldown-category.json
@@ -16,7 +16,7 @@
          "name" : "minecraft:wind_charge"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-cooldownCategory",
    "vanilla_data_type" : "cooldownCategory"
diff --git a/metadata/vanilladata_modules/mojang-dimensions.json b/metadata/vanilladata_modules/mojang-dimensions.json
index d421db048..135b2e583 100644
--- a/metadata/vanilladata_modules/mojang-dimensions.json
+++ b/metadata/vanilladata_modules/mojang-dimensions.json
@@ -10,7 +10,7 @@
          "name" : "minecraft:the_end"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-dimension",
    "vanilla_data_type" : "dimension"
diff --git a/metadata/vanilladata_modules/mojang-effects.json b/metadata/vanilladata_modules/mojang-effects.json
index 9d63f339c..8eade91c0 100644
--- a/metadata/vanilladata_modules/mojang-effects.json
+++ b/metadata/vanilladata_modules/mojang-effects.json
@@ -109,7 +109,7 @@
          "name" : "minecraft:wither"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-effect",
    "vanilla_data_type" : "effect"
diff --git a/metadata/vanilladata_modules/mojang-enchantments.json b/metadata/vanilladata_modules/mojang-enchantments.json
index d5ac73b13..4451f015c 100644
--- a/metadata/vanilladata_modules/mojang-enchantments.json
+++ b/metadata/vanilladata_modules/mojang-enchantments.json
@@ -125,7 +125,7 @@
          "name" : "minecraft:wind_burst"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-enchantment",
    "vanilla_data_type" : "enchantment"
diff --git a/metadata/vanilladata_modules/mojang-entities.json b/metadata/vanilladata_modules/mojang-entities.json
index bfa7be93a..014c06819 100644
--- a/metadata/vanilladata_modules/mojang-entities.json
+++ b/metadata/vanilladata_modules/mojang-entities.json
@@ -361,7 +361,7 @@
          "name" : "minecraft:zombie_villager_v2"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-entity",
    "vanilla_data_type" : "entity"
diff --git a/metadata/vanilladata_modules/mojang-features.json b/metadata/vanilladata_modules/mojang-features.json
index 3778b0601..1ad3c91b1 100644
--- a/metadata/vanilladata_modules/mojang-features.json
+++ b/metadata/vanilladata_modules/mojang-features.json
@@ -52,7 +52,7 @@
          "name" : "minecraft:village"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-feature",
    "vanilla_data_type" : "feature"
diff --git a/metadata/vanilladata_modules/mojang-items.json b/metadata/vanilladata_modules/mojang-items.json
index 9dc9832c7..0c6a17b99 100644
--- a/metadata/vanilladata_modules/mojang-items.json
+++ b/metadata/vanilladata_modules/mojang-items.json
@@ -3889,7 +3889,7 @@
          "name" : "minecraft:zombie_villager_spawn_egg"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-item",
    "vanilla_data_type" : "item"
diff --git a/metadata/vanilladata_modules/mojang-potion-effects.json b/metadata/vanilladata_modules/mojang-potion-effects.json
index 635f6864f..d602b3248 100644
--- a/metadata/vanilladata_modules/mojang-potion-effects.json
+++ b/metadata/vanilladata_modules/mojang-potion-effects.json
@@ -61,7 +61,7 @@
          "name" : "Wither"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-potionEffect",
    "vanilla_data_type" : "potionEffect"
diff --git a/metadata/vanilladata_modules/mojang-potion-modifiers.json b/metadata/vanilladata_modules/mojang-potion-modifiers.json
index 52724ad0b..00b60e9d1 100644
--- a/metadata/vanilladata_modules/mojang-potion-modifiers.json
+++ b/metadata/vanilladata_modules/mojang-potion-modifiers.json
@@ -10,7 +10,7 @@
          "name" : "Strong"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-potionModifier",
    "vanilla_data_type" : "potionModifier"
diff --git a/metadata/vanilladata_modules/mojang-potion-types.json b/metadata/vanilladata_modules/mojang-potion-types.json
index e0acf80a3..bb18a1f1f 100644
--- a/metadata/vanilladata_modules/mojang-potion-types.json
+++ b/metadata/vanilladata_modules/mojang-potion-types.json
@@ -10,7 +10,7 @@
          "name" : "Splash"
       }
    ],
-   "minecraft_version" : "1.21.20-beta.0",
+   "minecraft_version" : "1.21.20-beta.23",
    "module_type" : "vanilla_data",
    "name" : "mojang-potionLiquid",
    "vanilla_data_type" : "potionLiquid"
diff --git a/resource_pack/sounds.json b/resource_pack/sounds.json
index 0b788c226..85e212ce5 100644
--- a/resource_pack/sounds.json
+++ b/resource_pack/sounds.json
@@ -4271,11 +4271,6 @@
                   "sound" : "mob.husk.ambient",
                   "volume" : 0.60
                },
-               "imitate.illusion_illager" : {
-                  "pitch" : 1.80,
-                  "sound" : "mob.illusion_illager.ambient",
-                  "volume" : 0.70
-               },
                "imitate.magma_cube" : {
                   "pitch" : 1.80,
                   "sound" : "mob.magmacube.big",
diff --git a/resource_pack/texts/en_US.lang b/resource_pack/texts/en_US.lang
index 8829c17eb..8ec32897a 100644
--- a/resource_pack/texts/en_US.lang
+++ b/resource_pack/texts/en_US.lang
@@ -1895,8 +1895,6 @@ createWorldScreen.experimentalFocusTargetCamera=Creator Cameras: Focus Target Ca
 createWorldScreen.experimentalFocusTargetCameraDescription=Enables behavior for the existing free camera to target an entity
 createWorldScreen.recipeUnlocking=Recipe Unlocking
 createWorldScreen.recipeUnlockingDescription=Enable recipe unlocking
-createWorldScreen.experimentalholiday=Holiday Creator Features
-createWorldScreen.experimentalholidayDescription=Add data-driven blocks and item technology to customize block shape, rotation, damage and more
 createWorldScreen.experimentalGameTest=Beta APIs
 createWorldScreen.experimentalGameTestDescription=Use "-beta" versions of API modules in add-on packs
 createWorldScreen.experimentalMolangFeatures=Molang Features
@@ -3127,7 +3125,11 @@ feed.manage=Manage Feed
 feed.share=Share
 feed.addScreenshot=Add Screenshot
 feed.shareScreenshot=Screenshot captured. Go to Realms Stories to share it.
+feed.screenshotCaptured=Screenshot captured. You can view it in your screenshot gallery.
+feed.screenshotAlmostFull=Screenshot captured. Your gallery is almost full. (%d/%d)
+feed.screenshotReachedMax=Screenshot captured. Your gallery is full. (%d/%d)
 feed.screenshotFull=Your gallery is full. Delete screenshots to free up space.
+feed.screenshotFullShort=Screenshot gallery full
 feed.comments=Comments
 feed.edit=Edit
 feed.screenshots=Screenshots
diff --git a/resource_pack/textures/ui/Feedback.png b/resource_pack/textures/ui/Feedback.png
index a12f37f56..0cc064e63 100644
Binary files a/resource_pack/textures/ui/Feedback.png and b/resource_pack/textures/ui/Feedback.png differ
diff --git a/resource_pack/ui/_ui_defs.json b/resource_pack/ui/_ui_defs.json
index 68fc5fc3d..e69f0eea2 100644
--- a/resource_pack/ui/_ui_defs.json
+++ b/resource_pack/ui/_ui_defs.json
@@ -7,10 +7,6 @@
     "ui/adhoc_screen.json",
     "ui/anvil_screen.json",
     "ui/anvil_screen_pocket.json",
-    "ui/smithing_table_screen.json",
-    "ui/smithing_table_2_screen.json",
-    "ui/smithing_table_screen_pocket.json",
-    "ui/smithing_table_2_screen_pocket.json",
     "ui/authentication_modals.json",
     "ui/authentication_screen.json",
     "ui/auto_save_info_screen.json",
@@ -37,8 +33,23 @@
     "ui/content_log.json",
     "ui/content_log_history_screen.json",
     "ui/convert_purchases_to_xbl_screen.json",
+    "ui/crafter_screen_pocket.json",
     "ui/create_world_upsell_screen.json",
     "ui/credits_screen.json",
+    "ui/csb_purchase_error_screen.json",
+    "ui/csb_screen.json",
+    "ui/csb_sections/content_section.json",
+    "ui/csb_sections/csb_banner.json",
+    "ui/csb_sections/csb_buy_now_screen.json",
+    "ui/csb_sections/csb_common.json",
+    "ui/csb_sections/csb_purchase_amazondevicewarning_screen.json",
+    "ui/csb_sections/csb_purchase_warning_screen.json",
+    "ui/csb_sections/csb_subscription_panel.json",
+    "ui/csb_sections/csb_upsell_dialog.json",
+    "ui/csb_sections/csb_view_packs_screen.json",
+    "ui/csb_sections/csb_welcome_screen.json",
+    "ui/csb_sections/faq_section.json",
+    "ui/csb_sections/landing_section.json",
     "ui/custom_templates_screen.json",
     "ui/world_conversion_complete_screen.json",
     "ui/day_one_experience_intro_screen.json",
@@ -89,33 +100,12 @@
     "ui/loom_screen_pocket.json",
     "ui/manage_feed_screen.json",
     "ui/manifest_validation_screen.json",
-    "ui/csb_purchase_error_screen.json",
-    "ui/csb_screen.json",
-    "ui/csb_sections/content_section.json",
-    "ui/csb_sections/csb_banner.json",
-    "ui/csb_sections/csb_buy_now_screen.json",
-    "ui/csb_sections/csb_common.json",
-    "ui/csb_sections/csb_purchase_amazondevicewarning_screen.json",
-    "ui/csb_sections/csb_purchase_warning_screen.json",
-    "ui/csb_sections/csb_subscription_panel.json",
-    "ui/csb_sections/csb_upsell_dialog.json",
-    "ui/csb_sections/csb_view_packs_screen.json",
-    "ui/csb_sections/csb_welcome_screen.json",
-    "ui/csb_sections/faq_section.json",
-    "ui/csb_sections/landing_section.json",
-    "ui/online_safety_screen.json",
-    "ui/realms_invite_link_settings_screen.json",
-    "ui/realms_plus_ended_screen.json",
-    "ui/realmsPlus_screen.json",
-    "ui/realmsPlus_sections/content_section.json",
-    "ui/realmsPlus_sections/faq_section.json",
-    "ui/realmsPlus_sections/landing_section.json",
-    "ui/realmsPlus_sections/realmsPlus_buy_now_screen.json",
-    "ui/realmsPlus_sections/realmsPlus_view_packs_screen.json",
-    "ui/realmsPlus_sections/realmsPlus_purchase_warning_screen.json",
+    "ui/marketplace_sdl/sdl_label.json",
+    "ui/marketplace_sdl/sdl_dropdowns.json",
     "ui/mob_effect_screen.json",
     "ui/non_xbl_user_management_screen.json",
     "ui/npc_interact_screen.json",
+    "ui/online_safety_screen.json",
     "ui/pack_settings_screen.json",
     "ui/panorama_screen.json",
     "ui/patch_notes_screen.json",
@@ -128,14 +118,12 @@
     "ui/persona_sdl.json",
     "ui/persona_screen.json",
     "ui/play_screen.json",
-    "ui/tabbed_upsell_screen.json",
-    "ui/thanks_for_testing_screen.json",
-    "ui/win10_trial_conversion_screen.json",
     "ui/perf_turtle.json",
     "ui/pocket_containers.json",
     "ui/popup_dialog.json",
     "ui/portfolio_screen.json",
     "ui/post_rating_screen.json",
+    "ui/profile_card.json",
     "ui/profile_screen.json",
     "ui/progress_screen.json",
     "ui/rating_prompt.json",
@@ -145,7 +133,16 @@
     "ui/realms_slots_screen.json",
     "ui/realms_settings_screen.json",
     "ui/realms_allowlist.json",
+    "ui/realms_invite_link_settings_screen.json",
+    "ui/realms_plus_ended_screen.json",
     "ui/realmsplus_upgrade_notice_screen.json",
+    "ui/realmsPlus_screen.json",
+    "ui/realmsPlus_sections/content_section.json",
+    "ui/realmsPlus_sections/faq_section.json",
+    "ui/realmsPlus_sections/landing_section.json",
+    "ui/realmsPlus_sections/realmsPlus_buy_now_screen.json",
+    "ui/realmsPlus_sections/realmsPlus_view_packs_screen.json",
+    "ui/realmsPlus_sections/realmsPlus_purchase_warning_screen.json",
     "ui/redstone_screen.json",
     "ui/resource_packs_screen.json",
     "ui/safe_zone_screen.json",
@@ -154,8 +151,9 @@
     "ui/scoreboards.json",
     "ui/screenshot_screen.json",
     "ui/screenshot_picker_screen.json",
-    "ui/settings_screen.json",
+    "ui/select_world_screen.json",
     "ui/server_form.json",
+    "ui/settings_screen.json",    
     "ui/settings_sections/controls_section.json",
     "ui/settings_sections/general_section.json",
     "ui/settings_sections/realms_world_section.json",
@@ -166,6 +164,10 @@
     "ui/simple_inprogress_screen.json",
     "ui/skin_pack_purchase_screen.json",
     "ui/skin_picker_screen.json",
+    "ui/smithing_table_screen.json",
+    "ui/smithing_table_2_screen.json",
+    "ui/smithing_table_screen_pocket.json",
+    "ui/smithing_table_2_screen_pocket.json",
     "ui/smoker_screen.json",
     "ui/start_screen.json",
     "ui/stonecutter_screen.json",
@@ -184,13 +186,15 @@
     "ui/structure_editor_screen.json",
     "ui/submit_feedback_screen.json",
     "ui/sync_iaps_to_xbl_screen.json",
+    "ui/tabbed_upsell_screen.json",
+    "ui/thanks_for_testing_screen.json",
+    "ui/third_party_store_screen.json",
+    "ui/toast_screen.json",
+    "ui/token_faq_screen.json",
     "ui/trade_screen.json",
     "ui/trade_screen_pocket.json",
     "ui/trade_2_screen.json",
     "ui/trade_2_screen_pocket.json",
-    "ui/third_party_store_screen.json",
-    "ui/toast_screen.json",
-    "ui/token_faq_screen.json",
     "ui/trial_upsell_screen.json",
     "ui/ugc_viewer_screen.json",
     "ui/ui_art_assets_common.json",
@@ -207,15 +211,12 @@
     "ui/update_version.json",
     "ui/world_recovery_screen.json",
     "ui/world_templates_screen.json",
-    "ui/xbl_console_signin.json",
     "ui/xbl_console_qr_signin.json",
+    "ui/xbl_console_signin.json",
     "ui/xbl_console_signin_succeeded.json",
     "ui/xbl_friend_finder.json",
     "ui/xbl_immediate_signin.json",
     "ui/xbl_optional_signin.json",
-    "ui/profile_card.json",
-    "ui/crafter_screen_pocket.json",
-    "ui/redstone_screen.json",
-    "ui/select_world_screen.json"
+    "ui/win10_trial_conversion_screen.json"
   ]
 }
diff --git a/resource_pack/ui/file_upload_screen.json b/resource_pack/ui/file_upload_screen.json
index 1feca4b20..70e00162d 100644
--- a/resource_pack/ui/file_upload_screen.json
+++ b/resource_pack/ui/file_upload_screen.json
@@ -199,7 +199,8 @@
       {
         "center@file_upload.common_label": {
           "layer": 1,
-          "$label_binding_name": "#single_title_label"
+          "$label_binding_name": "#single_title_label",
+          "color": "$title_text_color"
         }
       }
     ]
@@ -213,7 +214,8 @@
           "layer": 1,
           "anchor_from": "top_left",
           "anchor_to": "top_left",
-          "$label_binding_name": "#dual_title_left_label"
+          "$label_binding_name": "#dual_title_left_label",
+          "color": "$title_text_color"
         }
       },
       {
@@ -221,7 +223,8 @@
           "layer": 1,
           "anchor_from": "top_right",
           "anchor_to": "top_right",
-          "$label_binding_name": "#dual_title_right_label"
+          "$label_binding_name": "#dual_title_right_label",
+          "color": "$title_text_color"
         }
       }
     ]
diff --git a/resource_pack/ui/marketplace_sdl/sdl_dropdowns.json b/resource_pack/ui/marketplace_sdl/sdl_dropdowns.json
new file mode 100644
index 000000000..da044c0fb
--- /dev/null
+++ b/resource_pack/ui/marketplace_sdl/sdl_dropdowns.json
@@ -0,0 +1,74 @@
+{
+  "namespace": "sdl_dropdowns",
+
+  "sdl_dropdown_rows": {
+    "type": "panel",
+    "size": [ "100%", "100%c" ],
+    "controls": [
+      {
+        "toggle@sdl_dropdowns.sdl_rows_toggle": {
+          "size": [ "100%", 24 ],
+          "$toggle_name": "toggle.sdl_rows_dropdown",
+          "bindings": [
+            {
+              "binding_type": "$store_factory_collection_details",
+              "binding_collection_name": "$store_factory_collection_name",
+              "binding_collection_prefix": "$store_factory_collection_prefix"
+            }
+          ]
+        }
+      }
+    ]
+  },
+
+  "sdl_rows_toggle@common_toggles.light_content_toggle": {
+    "$ignore_content_toggle_image": true,
+
+    "$default_checked_text_color": "$dropdown_radio_background_checked_color",
+    "$hover_texture": "textures/ui/button_borderless_lightpressednohover",
+
+    "$content_toggle_label_offset": [ 0, 0 ],
+    "$content_toggle_label_font_type": "Default",
+
+    "$content_toggle_icon_size": [ 11, 11 ],
+    "$checked_toggle_icon": "textures/ui/dropdown_chevron_up",
+    "$checked_hover_toggle_icon": "textures/ui/chevron_white_up",
+    "$unchecked_toggle_icon": "textures/ui/dropdown_chevron",
+    "$unchecked_hover_toggle_icon": "textures/ui/chevron_white_down",
+
+    "$toggle_binding_type": "$store_factory_binding_type",
+    "$toggle_binding_condition": "visible",
+    "$toggle_grid_collection_name": "$store_factory_collection_name",
+    "$toggle_state_binding_name": "#sdl_dropdown_row_expanded",
+    "$toggle_parent_collection_details_prefix": "$store_factory_collection_prefix",
+    "$toggle_parent_collection_details": "$store_factory_collection_details",
+    "$toggle_parent_collection_details_name": "$store_factory_collection_name",
+
+    "$sdl_factory_size": [ "fill", "100%" ],
+    "$sdl_label_max_size": [ "100%", "100% - 4px" ],
+
+    "$content_toggle_panel_content": "sdl_label.sdl_label_factory",
+
+    "$sdl_label_binding_name": "#header_label_from_style",
+    "$sdl_label_text_color": "#header_label_color",
+    "$sdl_label_font_type": "#header_label_font_type",
+    "$sdl_label_font_scalar": "#header_label_font_scale",
+    "$sdl_label_alignment": "#header_label_alignment",
+    "$sdl_label_binding_type": "collection",
+
+    "$content_image_binding_name": "textures/ui/chevron_white_down",
+    "$sdl_factory_bindings": [
+      {
+        "binding_type": "$store_factory_collection_details",
+        "binding_collection_name": "$store_factory_collection_name",
+        "binding_collection_prefix": "$store_factory_collection_prefix"
+      },
+      {
+        "binding_name": "#header_label_id",
+        "binding_type": "collection",
+        "binding_collection_name": "$store_factory_collection_name",
+        "binding_name_override": "#collection_length"
+      }
+    ]
+  }
+}
diff --git a/resource_pack/ui/marketplace_sdl/sdl_label.json b/resource_pack/ui/marketplace_sdl/sdl_label.json
new file mode 100644
index 000000000..2f00a6fad
--- /dev/null
+++ b/resource_pack/ui/marketplace_sdl/sdl_label.json
@@ -0,0 +1,114 @@
+{
+  "namespace": "sdl_label",
+
+  // The reason we use this is that MinecraftTen font has specific requirements for a backup font and offset on devices that are low memory
+  // so we unfortunately can't bind the font type directly. The factory creates an instance of the layout for MCTen based on this behavior and uses
+  // the SDLLabel for everything else
+  "sdl_label_factory": {
+    "type": "stack_panel",
+    "orientation": "horizontal",
+    "layer": 1,
+
+    "$sdl_factory_size|default": [ "100%", "100%" ],
+    "$sdl_factory_bindings|default": [], // You will want to implement this with a unique name for each instance
+    "$sdl_label_binding_name|default": "",
+    "$sdl_label_offset|default": [ 0, 0 ],
+    "$sdl_label_size|default": [ "100%", "default" ],
+    "$sdl_label_max_size|default": [ "100%", "100%" ],
+    "$sdl_label_collection_name|default": "sdl_label_factory",
+
+    "size": "$sdl_factory_size",
+
+    "$sdl_label_bindings|default": [
+      {
+        "binding_type": "$store_factory_collection_details",
+        "binding_collection_name": "$store_factory_collection_name",
+        "binding_collection_prefix": "$store_factory_collection_prefix"
+      },
+      {
+        "binding_type": "$sdl_label_binding_type",
+        "binding_collection_name": "$sdl_label_collection_name",
+        "binding_name": "$sdl_label_binding_name"
+      },
+      {
+        "binding_type": "$sdl_label_binding_type",
+        "binding_collection_name": "$sdl_label_collection_name",
+        "binding_name": "$sdl_label_text_color",
+        "binding_condition": "once",
+        "binding_name_override": "#color"
+      },
+      {
+        "binding_type": "$sdl_label_binding_type",
+        "binding_collection_name": "$sdl_label_collection_name",
+        "binding_name": "$sdl_label_font_type",
+        "binding_condition": "once",
+        "binding_name_override": "#font_type"
+      },
+      {
+        "binding_type": "$sdl_label_binding_type",
+        "binding_collection_name": "$sdl_label_collection_name",
+        "binding_name": "$sdl_label_font_scalar",
+        "binding_condition": "once",
+        "binding_name_override": "#font_scale_factor"
+      },
+      {
+        "binding_type": "$sdl_label_binding_type",
+        "binding_collection_name": "$sdl_label_collection_name",
+        "binding_name": "$sdl_label_alignment",
+        "binding_condition": "once",
+        "binding_name_override": "#text_alignment"
+      }
+    ],
+
+    "factory": {
+      "name": "sdl_label_factory",
+      "control_ids": {
+        "MinecraftTenLabel": "@sdl_label.sdl_mc_ten_label",
+        "SDLLabel": "@sdl_label.sdl_label"
+      },
+      "factory_variables": [
+        "$store_factory_collection_details",
+        "$store_factory_collection_name",
+        "$store_factory_collection_prefix",
+        "$sdl_label_size",
+        "$sdl_label_max_size",
+        "$sdl_label_offset",
+        "$sdl_label_bindings",
+        "$sdl_label_binding_type",
+        "$sdl_label_collection_name",
+        "$sdl_label_binding_name",
+        "$sdl_label_text_color",
+        "$sdl_label_font_type",
+        "$sdl_label_font_scalar",
+        "$sdl_label_alignment"
+      ]
+    },
+    "collection_name": "sdl_label_factory",
+    "bindings": "$sdl_factory_bindings"
+  },
+
+  "sdl_label": {
+    "type": "label",
+    "layer": 3,
+
+    "size": "$sdl_label_size",
+    "max_size": "$sdl_label_max_size",
+    "offset": "$sdl_label_offset",
+    "color": "$sdl_label_text_color",
+    "text": "$sdl_label_binding_name",
+    "bindings": "$sdl_label_bindings"
+  },
+
+  "sdl_mc_ten_label@common.minecraftTenLabel": {
+    "layer": 3,
+
+    "size": "$sdl_label_size",
+    "max_size": "$sdl_label_max_size",
+    "offset": "$sdl_label_offset",
+
+    "$sdl_label_font_binding_type": "none", // We aren't binding the font type as this is specified as MCTen
+
+    "text": "$sdl_label_binding_name",
+    "bindings": "$sdl_label_bindings"
+  }
+}
diff --git a/resource_pack/ui/pause_screen.json b/resource_pack/ui/pause_screen.json
index cc75df275..0f6bbdebb 100644
--- a/resource_pack/ui/pause_screen.json
+++ b/resource_pack/ui/pause_screen.json
@@ -788,7 +788,7 @@
     ]
   },
 
-  "take_screenshot_button@common_buttons.light_glyph_button": {
+  "take_screenshot_button@common_buttons.light_content_button": {
     "$pressed_button_name": "button.screenshot",
     "$focus_id": "icon_panel_main_focus",
     "$button_tts_header": "key.screenshot",
@@ -1039,7 +1039,7 @@
             },
             {
               "take_screenshot_btn": {
-                "type":  "input_panel",
+                "type": "input_panel",
                 "size": [ "100%c + 4px", 32 ],
                 "controls": [
                   { "take_screenshot_button@pause.take_screenshot_button": {} },
diff --git a/resource_pack/ui/pdp_screen.json b/resource_pack/ui/pdp_screen.json
index 8f0d66f64..fc7283129 100644
--- a/resource_pack/ui/pdp_screen.json
+++ b/resource_pack/ui/pdp_screen.json
@@ -2773,73 +2773,6 @@
     "texture": "textures/ui/store_play_button"
   },
 
-  "realms_plus_expiration": {
-    "type": "panel",
-    "size": [ "100%", "20% + 1px" ],
-    "offset": [ 0, 0.5 ],
-    "anchor_from": "bottom_middle",
-    "anchor_to": "bottom_middle",
-    "controls": [
-      {
-        "background": {
-          "type": "image",
-          "size": [ "100%", "100%" ],
-          "anchor_from": "bottom_middle",
-          "anchor_to": "bottom_middle",
-          "texture": "textures/ui/purple_gradient",
-          "tiled": "y",
-          "layer": 3
-        }
-      },
-      {
-        "icon": {
-          "type": "image",
-          "size": [ 11, 14 ],
-          "texture": "textures/ui/realmsIcon",
-          "anchor_from": "left_middle",
-          "anchor_to": "left_middle",
-          "offset": [ 2, 0 ],
-          "layer": 5
-        }
-      },
-      {
-        "text": {
-          "type": "label",
-          "size": [ "default", 10 ],
-          "color": "$body_text_color",
-          "anchor_from": "left_middle",
-          "anchor_to": "left_middle",
-          "offset": [ 18, 0 ],
-          "text": "#item_realms_expiration_label",
-          "layer": 6,
-          "bindings": [
-            {
-              "binding_name": "#item_realms_expiration_label",
-              "binding_type": "global"
-            }
-          ]
-        }
-      },
-      {
-        "particles": {
-          "type": "image",
-          "size": [ 20, 20 ],
-          "texture": "textures/ui/realms_particles",
-          "anchor_from": "right_middle",
-          "anchor_to": "right_middle",
-          "offset": [ -10, 0 ],
-          "layer": 4
-        }
-      }
-    ],
-    "bindings": [
-      {
-        "binding_name": "#realm_expiration_banner_visible",
-        "binding_name_override": "#visible"
-      }
-    ]
-  },
-
   "csb_expiration": {
     "type": "panel",
     "size": [ "100%", 14 ],
@@ -3693,71 +3626,9 @@
           ],
           "bindings": [
             { "binding_name": "#in_csb_button_visible" },
-            { "binding_name": "#in_realms_plus_button_visible" },
-            {
-              "binding_type": "view",
-              "source_property_name": "(#in_csb_button_visible and not #in_realms_plus_button_visible)",
-              "target_property_name": "#visible"
-            }
-          ]
-        }
-      },
-      {
-        "in_realms_plus_panel": {
-          "type": "panel",
-          "size": [ "100%", "100%c + 3px" ],
-          "controls": [
-            {
-              "in_realms_plus_button@pdp.in_realms_plus_button": {
-                "anchor_from": "bottom_middle",
-                "anchor_to": "bottom_middle",
-                "bindings": [
-                  {
-                    "binding_name": "(not #realms_incompatible_button_visible)",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
-            {
-              "realms_disabled_button@common_buttons.dynamic_tooltip_notification_panel": {
-                "size": [ "100% - 4px", "20px" ],
-                "button_mappings": [
-                  {
-                    "from_button_id": "button.menu_select",
-                    "to_button_id": "button.menu_store_error",
-                    "mapping_type": "pressed"
-                  },
-                  {
-                    "to_button_id": "button.is_hovered",
-                    "mapping_type": "pressed"
-                  }
-                ],
-                "consume_hover_events": true,
-                "focus_enabled": true,
-                "$dynamic_tooltip_button_visibility_binding_name": "#realms_incompatible_button_visible",
-                "$tooltip_popup_visible_binding": "#realms_incompatible_tooltip_visible",
-                "$tooltip_text_binding_name": "#marketplace_incompatable_popup_text",
-                "$override_tooltip_popup_image": true,
-                "$tooltip_popup_override_image_panel": "pdp.info_bulb_image",
-                "$tool_tip_text_max_size": [ "190px", "default" ],
-                "$tooltip_panel_offset": [ -40, -10 ],
-                "$tooltip_panel_content": "pdp.realms_incompatable_content",
-                "bindings": [
-                  {
-                    "binding_name": "#realms_incompatible_button_visible",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            }
-          ],
-          "bindings": [
-            { "binding_name": "#in_csb_button_visible" },
-            { "binding_name": "#in_realms_plus_button_visible" },
             {
               "binding_type": "view",
-              "source_property_name": "(#in_realms_plus_button_visible and not #in_csb_button_visible)",
+              "source_property_name": "#in_csb_button_visible",
               "target_property_name": "#visible"
             }
           ]
diff --git a/resource_pack/ui/persona_SDL.json b/resource_pack/ui/persona_SDL.json
index ce0094b56..d32317d9c 100644
--- a/resource_pack/ui/persona_SDL.json
+++ b/resource_pack/ui/persona_SDL.json
@@ -2120,11 +2120,6 @@
     "type": "panel",
     "size": [ "100%", 16 ],
     "controls": [
-      {
-        "realms_banner@pdp.realms_plus_expiration": {
-          "size": [ "100%", "100%" ]
-        }
-      },
       {
         "csub_banner@common_csb.csb_expiration_banner": {
           "size": [ "100%", "100%" ]
@@ -2160,32 +2155,12 @@
     "$realms_button_text|default": "",
 
     "controls": [
-      {
-        "realms_plus_icon@realmsPlus.markdown_background": {
-          "size": [ "100% + 4px", "100%  + 4px" ],
-          "$pack_icon_size": [ "100%", "100% - 2px" ],
-          "$banner_size": [ 14, "100%" ],
-          "offset": [ "-2px", "2px" ],
-          "bindings": [
-            {
-              "binding_name": "(not #csb_feature_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "csb_icon@common_csb.csb_icon_large": {
           "anchor_from": "left_middle",
           "anchor_to": "left_middle",
           "$pack_icon_size": [ "100%y", "100% + 10px" ],
-          "offset": [ "-2px", "0px" ],
-          "bindings": [
-            {
-              "binding_name": "#csb_feature_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "offset": [ "-2px", "0px" ]
         }
       },
       {
@@ -2984,30 +2959,6 @@
                 "layer": 9
               }
             },
-            {
-              "realms_plus_icon@realmsPlus.markdown_background": {
-                "layer": 10,
-                "size": [ 10, 10 ],
-                "$pack_icon_size": [ "100%", "100% - 1px" ],
-                "$banner_size": [ 9, "100%" ],
-                "anchor_from": "bottom_left",
-                "anchor_to": "bottom_left",
-
-                "bindings": [
-                  {
-                    "binding_type": "$piece_section_collection_details",
-                    "binding_collection_name": "$piece_section_collection_name",
-                    "binding_collection_prefix": "$piece_section_collection_prefix"
-                  },
-                  {
-                    "binding_type": "collection",
-                    "binding_collection_name": "$persona_piece_collection_name",
-                    "binding_name": "#is_piece_realms_plus",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
             {
               "csb_icon@common_csb.csb_icon_large": {
                 "layer": 10,
@@ -3554,48 +3505,13 @@
               "realms_plus_icon@common.empty_panel": {
                 "ignored": "$ignore_skin_realms_plus_icon",
                 "controls": [
-                  {
-                    "realms_banner_small@persona_sdl.realms_banner_small": {
-                      "layer": 3,
-                      "anchor_to": "bottom_left",
-                      "anchor_from": "bottom_left",
-                      "offset": [ 0, -1 ],
-                      "bindings": [
-                        {
-                          "binding_name": "(not #csb_feature_enabled)",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "realms_plus_icon@persona_sdl.realms_small_icon": {
-                      "layer": 4,
-                      "anchor_to": "bottom_left",
-                      "anchor_from": "bottom_left",
-                      "offset": [ 1, -2 ],
-                      "bindings": [
-                        {
-                          "binding_name": "(not #csb_feature_enabled)",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
                   {
                     "csb_icon@common_csb.csb_icon_large": {
                       "layer": 3,
                       "$pack_icon_size": [ 8, 10 ],
                       "offset": [ 1, 1 ],
                       "anchor_from": "bottom_left",
-                      "anchor_to": "bottom_left",
-
-                      "bindings": [
-                        {
-                          "binding_name": "#csb_feature_enabled",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
+                      "anchor_to": "bottom_left"
                     }
                   }
                 ],
diff --git a/resource_pack/ui/persona_screen.json b/resource_pack/ui/persona_screen.json
index c108483ab..0fe7d03ab 100644
--- a/resource_pack/ui/persona_screen.json
+++ b/resource_pack/ui/persona_screen.json
@@ -582,10 +582,6 @@
 
   /////////////////////////////////////////////
   //// Realms button controls ////
-  "realms_timer_banner@pdp.realms_plus_expiration": {
-    "size": [ "100%", 16 ]
-  },
-
   "csb_timer_banner@common_csb.csb_expiration_banner": {
     "size": [ "100%", 16 ]
   },
@@ -617,32 +613,12 @@
     "$realms_button_text|default": "",
 
     "controls": [
-      {
-        "realms_plus_icon@realmsPlus.markdown_background": {
-          "size": [ "100% + 4px", "100%  + 4px" ],
-          "$pack_icon_size": [ "100%", "100% - 2px" ],
-          "$banner_size": [ 14, "100%" ],
-          "offset": [ "-2px", "2px" ],
-          "bindings": [
-            {
-              "binding_name": "(not #csb_feature_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "csb_icon@common_csb.csb_icon_large": {
           "anchor_from": "left_middle",
           "anchor_to": "left_middle",
           "$pack_icon_size": [ "100%y", "100% + 10px" ],
-          "offset": [ "-2px", "0px" ],
-          "bindings": [
-            {
-              "binding_name": "#csb_feature_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "offset": [ "-2px", "0px" ]
         }
       },
       {
@@ -656,12 +632,7 @@
           "color": "$text_color",
           "$realms_button_text_offset|default": [ 0, 0 ],
           "offset": "$realms_button_text_offset",
-          "bindings": [
-            {
-              "binding_name": "#realms_subscription_button_text",
-              "binding_type": "global"
-            }
-          ]
+          "$realms_button_text": "persona.csb.see.subscription"
         }
       }
     ]
@@ -687,7 +658,7 @@
     "$realms_button_text_offset": [ 8, 0 ],
     "$pressed_button_name": "button.see_realms_subscription",
     "$button_content": "persona.realms_redeem_button_content",
-    "$realms_button_text": "#realms_subscription_button_text",
+    "$realms_button_text": "persona.csb.see.subscription",
     "bindings": [
       {
         "binding_name": "#realms_subscription_button_visible",
@@ -1647,7 +1618,6 @@
       { "debug_information@persona.right_side_stack_debug_control": {} },
       { "dressing_room_skin_model@persona.dressing_room_right_side_model": {} },
       { "padding@persona.vertical_2_padding": {} },
-      { "realms_banner@persona.realms_timer_banner": {} },
       { "csb_banner@persona.csb_timer_banner": {} },
 
       // below are the sub sections which dis/re-appear depending on context.
@@ -4145,48 +4115,13 @@
               "realms_plus_icon@common.empty_panel": {
                 "ignored": "$ignore_skin_realms_plus_icon",
                 "controls": [
-                  {
-                    "realms_banner_small@persona.realms_banner_small": {
-                      "layer": 3,
-                      "anchor_to": "bottom_left",
-                      "anchor_from": "bottom_left",
-                      "offset": [ 0, -1 ],
-                      "bindings": [
-                        {
-                          "binding_name": "(not #csb_feature_enabled)",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "realms_plus_icon@persona.realms_small_icon": {
-                      "layer": 4,
-                      "anchor_to": "bottom_left",
-                      "anchor_from": "bottom_left",
-                      "offset": [ 1, -2 ],
-                      "bindings": [
-                        {
-                          "binding_name": "(not #csb_feature_enabled)",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
                   {
                     "csb_icon@common_csb.csb_icon_large": {
                       "layer": 3,
                       "$pack_icon_size": [ 8, 10 ],
                       "offset": [ 1, 1 ],
                       "anchor_from": "bottom_left",
-                      "anchor_to": "bottom_left",
-
-                      "bindings": [
-                        {
-                          "binding_name": "#csb_feature_enabled",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
+                      "anchor_to": "bottom_left"
                     }
                   }
                 ],
@@ -4506,30 +4441,6 @@
                 "layer": 9
               }
             },
-            {
-              "realms_plus_icon@realmsPlus.markdown_background": {
-                "layer": 10,
-                "size": [ 10, 10 ],
-                "$pack_icon_size": [ "100%", "100% - 1px" ],
-                "$banner_size": [ 9, "100%" ],
-                "anchor_from": "bottom_left",
-                "anchor_to": "bottom_left",
-
-                "bindings": [
-                  {
-                    "binding_type": "$piece_section_collection_details",
-                    "binding_collection_name": "$piece_section_collection_name",
-                    "binding_collection_prefix": "$piece_section_collection_prefix"
-                  },
-                  {
-                    "binding_type": "collection",
-                    "binding_collection_name": "$persona_piece_collection_name",
-                    "binding_name": "#is_piece_realms_plus",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
             {
               "csb_icon@common_csb.csb_icon_large": {
                 "layer": 10,
@@ -6515,26 +6426,9 @@
     "$skin_collection_name": "realms_skin_collection",
 
     "controls": [
-      {
-        "realms_pack_label@persona.persona_skin_pack_label": {
-          "$persona_skin_pack_label_text": "sidebar.realmsPlus",
-          "bindings": [
-            {
-              "binding_name": "(not #csb_feature_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "csb_pack_label@persona.persona_skin_pack_label": {
-          "$persona_skin_pack_label_text": "store.csb",
-          "bindings": [
-            {
-              "binding_name": "#csb_feature_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "$persona_skin_pack_label_text": "store.csb"
         }
       },
       { "purchasable_packs_grid@persona.persona_skin_pack_grid": {} }
diff --git a/resource_pack/ui/play_screen.json b/resource_pack/ui/play_screen.json
index ce978b0d0..6c88c4f72 100644
--- a/resource_pack/ui/play_screen.json
+++ b/resource_pack/ui/play_screen.json
@@ -3687,29 +3687,6 @@
           "size": [ 2, "100%" ]
         }
       },
-      {
-        "expiration_timer": {
-          "type": "label",
-          "size": [ "default", "100%" ],
-          "max_size": [ 60, "100%" ],
-          "color": "$dark_button_default_text_color",
-          "font_type": "smooth",
-          "text": "#realms_expiration_label",
-          "bindings": [
-            {
-              "binding_type": "collection",
-              "binding_collection_name": "local_worlds",
-              "binding_name": "#realms_expiration_label"
-            },
-            {
-              "binding_type": "collection",
-              "binding_collection_name": "local_worlds",
-              "binding_name": "#realms_expiration_visible",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "pad_1": {
           "type": "panel",
diff --git a/resource_pack/ui/realmsPlus_sections/content_section.json b/resource_pack/ui/realmsPlus_sections/content_section.json
index 43a971e3a..b7ea15052 100644
--- a/resource_pack/ui/realmsPlus_sections/content_section.json
+++ b/resource_pack/ui/realmsPlus_sections/content_section.json
@@ -45,43 +45,13 @@
       },
       {
         "padding_contentSub@common.empty_panel": {
-          "size": [ "100%", 4 ],
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "size": [ "100%", 4 ]
         }
       },
       {
         "pack_types_wrapper@common.tts_label_focus_wrapper": {
           "$tts_label_panel": "realmsPlus_content.pack_types"
         }
-      },
-      {
-        "bottom_section_not_contentSub": {
-          "type": "stack_panel",
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ],
-          "controls": [
-            {
-              "section_divider@realmsPlus.full_width_section_divider": {}
-            },
-            {
-              "friends_get_access@realmsPlus_content.friends_get_access": {}
-            },
-            {
-              "padding@common.empty_panel": {
-                "size": [ "100%", 4 ]
-              }
-            }
-          ]
-        }
       }
     ]
   },
@@ -122,76 +92,18 @@
     "size": [ "100%", "100%c" ],
     "$icon_color": "$body_text_color",
     "controls": [
-      {
-        "recently_added_header": {
-          "type": "label",
-          "text": "store.realmsPlus.content.recentlyAdded",
-          "size": [ "100%", "default" ],
-          "font_type": "smooth",
-          "color": "$csb_upsell_pink-3",
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
-      {
-        "top_row@realmsPlus_content.persona_row": {
-          "$pack_type_description_text": "store.realmsPlus.content.personaDescription",
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
-      {
-        "section_divider@realmsPlus.full_width_section_divider": {
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "middle_row@realmsPlus_content.pack_type_row_panel": {
           "controls": [
-            {
-              "skins_persona@realmsPlus_content.skins": {
-                "$pack_type_description_text": "store.realmsPlus.content.skinDescriptionPersona",
-                "bindings": [
-                  {
-                    "binding_name": "(not #realms_contentSub_enabled)",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
             {
               "worlds_contentSub@realmsPlus_content.worlds_row": {
-                "$pack_type_description_text": "store.realmsPlus.content.worldDescription.contentSub",
-                "bindings": [
-                  {
-                    "binding_name": "#realms_contentSub_enabled",
-                    "binding_name_override": "#visible"
-                  }
-                ]
+                "$pack_type_description_text": "store.realmsPlus.content.worldDescription.contentSub"
               }
             },
             {
               "textures@realmsPlus_content.pack_type_description": {
                 "$pack_type_texture": "common_store.resource_pack_small_icon",
-                "$pack_type_description_text": "#texture_description_string",
-                "$description_label_binding": [
-                  {
-                    "binding_name": "$pack_type_description_text"
-                  }
-                ],
+                "$pack_type_description_text": "store.realmsPlus.content.textureDescription.contentSub",
                 "anchor_from": "right_middle",
                 "anchor_to": "right_middle"
               }
@@ -202,26 +114,9 @@
       {
         "bottom_row@realmsPlus_content.pack_type_row_panel": {
           "controls": [
-            {
-              "worlds@realmsPlus_content.worlds_row": {
-                "$pack_type_description_text": "store.realmsPlus.content.worldDescription",
-                "bindings": [
-                  {
-                    "binding_name": "(not #realms_contentSub_enabled)",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
             {
               "skins_persona_contentSub@realmsPlus_content.skins": {
-                "$pack_type_description_text": "store.realmsPlus.content.skinDescriptionPersona.contentSub",
-                "bindings": [
-                  {
-                    "binding_name": "#realms_contentSub_enabled",
-                    "binding_name_override": "#visible"
-                  }
-                ]
+                "$pack_type_description_text": "store.realmsPlus.content.skinDescriptionPersona.contentSub"
               }
             },
             {
@@ -237,13 +132,7 @@
       },
       {
         "bottom_contentSub@realmsPlus_content.persona_row": {
-          "$pack_type_description_text": "store.realmsPlus.content.personaDescription.contentSub",
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "$pack_type_description_text": "store.realmsPlus.content.personaDescription.contentSub"
         }
       }
     ]
@@ -313,26 +202,6 @@
     "orientation": "vertical",
     "size": [ "100%", "100%c" ],
     "controls": [
-      {
-        "popular_packs_label_panel": {
-          "type": "panel",
-          "size": [ "100%", "100%c" ],
-          "controls": [
-            {
-              "label_with_gradient@realmsPlus.gradient_content_panel": {
-                "size": [ "100%", 15 ],
-                "$gradient_content": "realmsPlus_content.popular_packs_label"
-              }
-            }
-          ],
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "padding_0@common.empty_panel": {
           "size": [ "100%", 2 ]
@@ -382,13 +251,7 @@
       },
       {
         "padding_2@common.empty_panel": {
-          "size": [ "100%", 2 ],
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "size": [ "100%", 2 ]
         }
       }
     ]
@@ -522,30 +385,11 @@
                   }
                 ],
                 "controls": [
-                  {
-                    "realms_chevron@realmsPlus_content.realms_plus_content_chevron": {
-                      "anchor_from": "bottom_left",
-                      "anchor_to": "bottom_left",
-                      "offset": [ 0, 0.5 ],
-                      "bindings": [
-                        {
-                          "binding_name": "(not #realms_contentSub_enabled)",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
                   {
                     "csb_chevron@csb_content.csb_content_chevron": {
                       "anchor_from": "bottom_left",
                       "anchor_to": "bottom_left",
-                      "offset": [ 0, 0.5 ],
-                      "bindings": [
-                        {
-                          "binding_name": "#realms_contentSub_enabled",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
+                      "offset": [ 0, 0.5 ]
                     }
                   }
                 ]
diff --git a/resource_pack/ui/realmsPlus_sections/faq_section.json b/resource_pack/ui/realmsPlus_sections/faq_section.json
index 0e1cf223d..7db120cbf 100644
--- a/resource_pack/ui/realmsPlus_sections/faq_section.json
+++ b/resource_pack/ui/realmsPlus_sections/faq_section.json
@@ -280,24 +280,11 @@
               "faq_image_local_path@realmsPlus_faq.faq_image_local": {}
             }
           ],
-          "$repo_image_texture": "textures/ui/realms_faq_bee",
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "$repo_image_texture": "textures/ui/realms_faq_bee"
         }
       },
       {
-        "faq_question_4_divider@realmsPlus_faq.faq_section_divider": {
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
+        "faq_question_4_divider@realmsPlus_faq.faq_section_divider": {}
       },
       {
         "faq_question_5@realmsPlus_faq.image_left_faq_question_body_flip": {
diff --git a/resource_pack/ui/realmsPlus_sections/landing_section.json b/resource_pack/ui/realmsPlus_sections/landing_section.json
index f797b83b5..46e167c7d 100644
--- a/resource_pack/ui/realmsPlus_sections/landing_section.json
+++ b/resource_pack/ui/realmsPlus_sections/landing_section.json
@@ -398,12 +398,6 @@
                 "$info_text_line": "store.realmsPlus.landing.info2.contentSub"
               }
             }
-          ],
-          "bindings": [
-            {
-              "binding_name": "#realms_contentSub_enabled",
-              "binding_name_override": "#visible"
-            }
           ]
         }
       },
@@ -441,26 +435,6 @@
 
   "info_section_text_2@realmsPlus_landing.info_section_text": {
     "controls": [
-      {
-        "info_text_bullet_notContentSub@realmsPlus_landing.info_section_text": {
-          "controls": [
-            {
-              "info_text_bullet_1@realmsPlus_landing.info_text_bullet": {
-                "$info_text_line": "store.realmsPlus.landing.info2.catalog"
-              }
-            },
-            {
-              "vertical_small_spacer@realmsPlus_landing.vertical_small_spacer": {}
-            }
-          ],
-          "bindings": [
-            {
-              "binding_name": "(not #realms_contentSub_enabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "info_text_bullet_2@realmsPlus_landing.info_text_bullet": {
           "$info_text_line": "store.realmsPlus.landing.info2.backups"
diff --git a/resource_pack/ui/resource_packs_screen.json b/resource_pack/ui/resource_packs_screen.json
index fed93ed9c..6488f93fb 100644
--- a/resource_pack/ui/resource_packs_screen.json
+++ b/resource_pack/ui/resource_packs_screen.json
@@ -2394,18 +2394,8 @@
   },
 
   "realms_packs_title_content@resource_packs.selected_packs_title_content": {
-    "variables": [
-      {
-        "requires": "$content_subscription_enabled",
-        "$title_text": "resourcePack.realmsPlus.title.packs.contentSub",
-        "$icon_texture": "textures/ui/sidebar_icons/csb_sidebar_icon"
-      },
-      {
-        "requires": "(not $content_subscription_enabled)",
-        "$title_text": "resourcePack.realmsPlus.title.packs",
-        "$icon_texture": "textures/ui/realmsIcon"
-      }
-    ],
+    "$title_text": "resourcePack.realmsPlus.title.packs.contentSub",
+    "$icon_texture": "textures/ui/sidebar_icons/csb_sidebar_icon",
     "$count_name": "#realms_count",
     "$name_collection_name": "$realms_pack_items",
     "$grid_visible": "#realms_grid_visible"
diff --git a/resource_pack/ui/start_screen.json b/resource_pack/ui/start_screen.json
index d024f2e07..88b3f27a3 100644
--- a/resource_pack/ui/start_screen.json
+++ b/resource_pack/ui/start_screen.json
@@ -1534,13 +1534,7 @@
     "controls": [
       {
         "store_button@start.store_button": {
-          "enabled": "(not $store_disabled and not ($is_ios and $pre_release)))",
-          "bindings": [
-            {
-              "binding_name": "(not #marketplace_disabled)",
-              "binding_name_override": "#visible"
-            }
-          ]
+          "enabled": "(not $store_disabled and not ($is_ios and $pre_release)))"
         }
       },
       {
@@ -1771,13 +1765,7 @@
                             "controls": [
                               {
                                 "store_button@start.store_button": {
-                                  "enabled": "(not $store_disabled)",
-                                  "bindings": [
-                                    {
-                                      "binding_name": "(not #marketplace_disabled)",
-                                      "binding_name_override": "#visible"
-                                    }
-                                  ]
+                                  "enabled": "(not $store_disabled)"
                                 }
                               },
                               {
@@ -1839,9 +1827,81 @@
                 ]
               }
             },
+            {
+              "settings_and_editions_panel@start.stacked_row": {
+                "ignored": "($trial or not $supports_launching_legacy_version)",
+                "bindings": [
+                  {
+                    "binding_name": "#realms_promo_visible",
+                    "binding_name_override": "#visible"
+                  }
+                ],
+                "controls": [
+                  {
+                    "settings_and_editions": {
+                      "type": "stack_panel",
+                      "size": [ "100%", "100%" ],
+                      "orientation": "horizontal",
+                      "ignored": "($trial or not $supports_launching_legacy_version)",
+                      "bindings": [
+                        {
+                          "binding_name": "#editions_visible",
+                          "binding_name_override": "#visible"
+                        }
+                      ],
+                      "controls": [
+                        {
+                          "settings_panel": {
+                            "type": "panel",
+                            "size": [ "fill", "100%" ],
+                            "controls": [
+                              { "settings_button@start.settings_button": {} }
+                            ]
+                          }
+                        },
+                        {
+                          "editions_panel": {
+                            "type": "panel",
+                            "size": [ "fill", "100%" ],
+                            "controls": [
+                              {
+                                "launch_editions_button@start.launch_editions_button": {}
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "settings_panel@start.stacked_row": {
+                      "bindings": [
+                        {
+                          "binding_name": "(not #editions_visible)",
+                          "binding_name_override": "#visible"
+                        }
+                      ],
+                      "controls": [
+                        {
+                          "settings_button@start.settings_button": {
+                            "$focus_override_right": "profile_button"
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
             {
               "settings@start.stacked_row": {
                 "ignored": "($trial and not $use_single_column_for_buttons)",
+                "bindings": [
+                  {
+                    "binding_name": "#not_realms_promo_visible_and_supports_launching_legacy_version",
+                    "binding_name_override": "#visible"
+                  }
+                ],
                 "controls": [
                   {
                     "settings_button@start.settings_button": {
@@ -1851,6 +1911,24 @@
                 ]
               }
             },
+            {
+              "realms@start.stacked_row": {
+                "ignored": "($trial or $is_preview_app)",
+                "bindings": [
+                  {
+                    "binding_name": "#realms_promo_visible",
+                    "binding_name_override": "#visible"
+                  }
+                ],
+                "controls": [
+                  {
+                    "realms_button@start.realms_button": {
+                      "$button_text": "menu.realms"
+                    }
+                  }
+                ]
+              }
+            },
             {
               "unlock_full_game_row@start.stacked_row": {
                 "ignored": "(not $is_edu_demo)",
@@ -1882,7 +1960,7 @@
                 ],
                 "bindings": [
                   {
-                    "binding_name": "#editions_visible",
+                    "binding_name": "#editions_visible_and_not_realms_promo_visible",
                     "binding_name_override": "#visible"
                   }
                 ]
diff --git a/resource_pack/ui/storage_management.json b/resource_pack/ui/storage_management.json
index 3f7ed656a..257df6f56 100644
--- a/resource_pack/ui/storage_management.json
+++ b/resource_pack/ui/storage_management.json
@@ -76,6 +76,12 @@
                       "$button_text": "$clear_screenshots_cache_button_text"
                     }
                   }
+                ],
+                "bindings": [
+                  {
+                    "binding_name": "#screenshots_showcase_enabled",
+                    "binding_name_override": "#visible"
+                  }
                 ]
               }
             },
@@ -95,6 +101,12 @@
                       "$button_text": "$delete_local_screenshots_button_text"
                     }
                   }
+                ],
+                "bindings": [
+                  {
+                    "binding_name": "#screenshots_gallery_enabled",
+                    "binding_name_override": "#visible"
+                  }
                 ]
               }
             },
diff --git a/resource_pack/ui/store_common.json b/resource_pack/ui/store_common.json
index 39de8eab6..f6be03c95 100644
--- a/resource_pack/ui/store_common.json
+++ b/resource_pack/ui/store_common.json
@@ -1784,101 +1784,6 @@
     ]
   },
 
-  "realms_plus_expiration": {
-    "type": "panel",
-    "size": [ "100%", "20% + 1px" ],
-    "offset": [ 0, 0.5 ],
-    "visible": false,
-    "anchor_from": "bottom_middle",
-    "anchor_to": "bottom_middle",
-    "controls": [
-      {
-        "background": {
-          "type": "image",
-          "size": [ "100%", "100%" ],
-          "anchor_from": "bottom_middle",
-          "anchor_to": "bottom_middle",
-          "texture": "textures/ui/purple_gradient",
-          "tiled": "y",
-          "layer": 3
-        }
-      },
-      {
-        "contents": {
-          "type": "stack_panel",
-          "orientation": "horizontal",
-          "size": [ "100% - 2px", "100% - 2px" ],
-          "layer": 5,
-          "controls": [
-            {
-              "realms_icon@common_store.realms_banner_icon": {}
-            },
-            {
-              "pad_0": {
-                "type": "panel",
-                "size": [ 2, "100%" ]
-              }
-            },
-            {
-              "text_panel": {
-                "type": "panel",
-                "size": [ "fill", "100%" ],
-                "controls": [
-                  {
-                    "text": {
-                      "type": "label",
-                      "size": [ "100%", "100%" ],
-                      "color": "$body_text_color",
-                      "font_type": "smooth",
-                      "font_scale_factor": 0.7,
-                      "text": "#realms_expiration_label",
-                      "bindings": [
-                        {
-                          "binding_type": "$store_factory_collection_details",
-                          "binding_collection_name": "$store_factory_collection_name",
-                          "binding_collection_prefix": "$store_factory_collection_prefix"
-                        },
-                        {
-                          "binding_type": "$offer_binding_type",
-                          "binding_collection_name": "$offer_collection_name",
-                          "binding_name": "#realms_expiration_label"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      },
-      {
-        "particles": {
-          "type": "image",
-          "size": [ "100%y", "100%" ],
-          "texture": "textures/ui/realms_particles",
-          "anchor_from": "right_middle",
-          "anchor_to": "right_middle",
-          "offset": [ -10, 0 ],
-          "layer": 4
-        }
-      }
-    ],
-    "bindings": [
-      {
-        "binding_type": "$store_factory_collection_details",
-        "binding_collection_name": "$store_factory_collection_name",
-        "binding_collection_prefix": "$store_factory_collection_prefix"
-      },
-      {
-        "binding_type": "$offer_binding_type",
-        "binding_collection_name": "$offer_collection_name",
-        "binding_name": "#realm_expiration_banner_visible",
-        "binding_name_override": "#visible"
-      }
-    ]
-  },
-
   "pack_icon_stack": {
     "type": "panel",
     "size": [ "100%c", "100%" ],
@@ -4350,7 +4255,8 @@
         "PersonaSideSelection": "@persona_sdl.side_selection_row",
         "SkinPackList": "@persona_sdl.skin_list_section_panel",
         "ExpandedSkinPackGrid": "@persona_sdl.ExpandedSkinPackGrid",
-        "Layout": "@common.empty_panel_size_y_0"
+        "Layout": "@common.empty_panel_size_y_0",
+        "DropdownSection": "@sdl_dropdowns.sdl_dropdown_rows"
       },
       "factory_variables": [
         "$ignore_search_offer_content",
@@ -4438,24 +4344,6 @@
           "size": [ 16, 12 ],
           "offset": "$subscription_chevron_offset", // polish hack - aligns the banner to be flush with the bottom of the background panel
           "controls": [
-            {
-              "realmsPlus_chevron@realmsPlus_content.realms_plus_content_chevron": {
-                "layer": 10,
-                "bindings": [
-                  {
-                    "binding_type": "$store_factory_collection_details",
-                    "binding_collection_name": "$store_factory_collection_name",
-                    "binding_collection_prefix": "$store_factory_collection_prefix"
-                  },
-                  {
-                    "binding_type": "$subscription_offer_binding_type",
-                    "binding_collection_name": "$subscription_offer_collection_name",
-                    "binding_name": "#realms_chevron_visibility",
-                    "binding_name_override": "#visible"
-                  }
-                ]
-              }
-            },
             {
               "csb_chevron@common_store.csb_banner": {
                 "layer": 10,
@@ -7519,9 +7407,6 @@
                 "layer": 3
               }
             },
-            {
-              "realms_plus_expiration_banner@common_store.realms_plus_expiration": {}
-            },
             {
               "csb_expiration_banner@common_store.csb_expiration": {}
             }
@@ -8182,9 +8067,6 @@
                       "layer": 3
                     }
                   },
-                  {
-                    "realms_plus_expiration_banner@common_store.realms_plus_expiration": {}
-                  },
                   {
                     "csb_plus_expiration_banner@common_store.csb_expiration": {}
                   }
diff --git a/resource_pack/ui/store_item_list_screen.json b/resource_pack/ui/store_item_list_screen.json
index de71ea5ef..3ee03628a 100644
--- a/resource_pack/ui/store_item_list_screen.json
+++ b/resource_pack/ui/store_item_list_screen.json
@@ -233,12 +233,6 @@
                       "layer": 2
                     }
                   },
-                  {
-                    "realms_plus_expiration_banner@common_store.realms_plus_expiration": {
-                      "$realm_expiration_banner_visible": "#realm_expiration_banner_visible",
-                      "$realms_expiration_label": "#realms_expiration_label"
-                    }
-                  },
                   {
                     "csb_expiration_banner@common_store.csb_expiration": {
                       "$realm_expiration_banner_visible": "#csb_expiration_banner_visible",
diff --git a/resource_pack/ui/store_search_screen.json b/resource_pack/ui/store_search_screen.json
index 907b8a4f8..6af9a47ca 100644
--- a/resource_pack/ui/store_search_screen.json
+++ b/resource_pack/ui/store_search_screen.json
@@ -247,4 +247,4 @@
     "$is_full_screen_layout": true
   }
 
-}
\ No newline at end of file
+}
diff --git a/resource_pack/ui/ui_template_toggles.json b/resource_pack/ui/ui_template_toggles.json
index 4a812deb9..2f1279733 100644
--- a/resource_pack/ui/ui_template_toggles.json
+++ b/resource_pack/ui/ui_template_toggles.json
@@ -35,6 +35,7 @@
               "binding_name_override": "#color",
               "binding_type": "$content_toggle_image_binding_type",
               "binding_condition": "$content_toggle_image_binding_condition",
+              "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
               "binding_collection_name": "$toggle_grid_collection_name"
             },
             {
@@ -80,6 +81,7 @@
               "binding_type": "$content_toggle_label_binding_type",
               "binding_condition": "$content_toggle_label_binding_condition",
               "binding_collection_name": "$toggle_grid_collection_name",
+              "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
               "binding_name": "$content_toggle_label"
             },
             {
@@ -90,6 +92,7 @@
             {
               "binding_type": "$content_toggle_label_tts_override_binding_type",
               "binding_collection_name": "$toggle_grid_collection_name",
+              "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
               "binding_name": "$content_toggle_label_tts_override"
             }
           ]
@@ -155,6 +158,7 @@
     "$ignore_content_toggle_icon|default": false,
     "$ignore_content_toggle_image|default": false,
     "$content_toggle_image_panel|default": "common_toggles.content_toggle_image_panel",
+    "$content_toggle_panel_content|default": "common_toggles.content_toggle_label_panel",
     "controls": [
       {
         "toggle_image_panel@$content_toggle_image_panel": {
@@ -169,7 +173,7 @@
         }
       },
       {
-        "toggle_label_panel@common_toggles.content_toggle_label_panel": {}
+        "toggle_label_panel@$content_toggle_panel_content": {}
       },
       {
         "toggle_label_padding_toggle_icon": {
@@ -203,6 +207,7 @@
     "$ignore_content_toggle_icon|default": false,
     "$ignore_content_toggle_image|default": false,
     "$content_toggle_image_panel|default": "common_toggles.content_toggle_image_panel",
+    "$content_toggle_panel_content|default": "common_toggles.content_toggle_label_panel",
     "controls": [
       {
         "toggle_image_panel@$content_toggle_image_panel": {
@@ -217,7 +222,7 @@
         }
       },
       {
-        "toggle_label_panel@common_toggles.content_toggle_label_panel": {
+        "toggle_label_panel@$content_toggle_panel_content": {
           "size": [ "fill", "100%c" ],
           "$content_toggle_label_max_size": [ "100%", 30 ]
         }
@@ -497,7 +502,8 @@
       },
       {
         "binding_collection_name": "$toggle_grid_collection_name",
-        "binding_type": "collection_details"
+        "binding_type": "collection_details",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix"
       },
       {
         "binding_type": "$toggle_parent_collection_details",
@@ -743,6 +749,7 @@
         "binding_type": "$toggle_binding_type",
         "binding_condition": "$toggle_binding_condition",
         "binding_collection_name": "$toggle_grid_collection_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
         "binding_name": "$toggle_state_binding_name",
         "binding_name_override": "#toggle_state"
       },
@@ -750,26 +757,31 @@
         "binding_type": "$toggle_enabled_binding_type",
         "binding_condition": "$toggle_enabled_binding_condition",
         "binding_collection_name": "$toggle_grid_collection_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
         "binding_name": "$toggle_enabled_binding_name",
         "binding_name_override": "#enabled"
       },
       {
         "binding_type": "collection_details",
-        "binding_collection_name": "$toggle_grid_collection_name"
+        "binding_collection_name": "$toggle_grid_collection_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix"
       },
       {
         "binding_type": "$toggle_tab_focus_binding_type",
         "binding_name": "$toggle_tab_focus_binding_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
         "binding_name_override": "#default_focus_precedence"
       },
       {
         "binding_type": "$toggle_on_hover_binding_type",
         "binding_name": "$toggle_on_hover_binding_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
         "binding_name_override": "#toggle_on_hover"
       },
       {
         "binding_type": "$toggle_tts_header_binding_type",
         "binding_collection_name": "$toggle_tts_header_binding_collection_name",
+        "binding_collection_prefix": "$toggle_parent_collection_details_prefix",
         "binding_name": "$toggle_tts_header"
       }
     ],
diff --git a/resource_pack/ui/world_templates_screen.json b/resource_pack/ui/world_templates_screen.json
index ffe798bca..a281add29 100644
--- a/resource_pack/ui/world_templates_screen.json
+++ b/resource_pack/ui/world_templates_screen.json
@@ -418,20 +418,6 @@
                 "size": [ "100%", "50%" ],
                 "offset": [ -2, 1 ],
                 "controls": [
-                  {
-                    "realms_plus_icon@world_templates.realms_plus_banner": {
-                      "size": [ "100%c", 12 ],
-                      "layer": 1,
-                      "bindings": [
-                        {
-                          "binding_type": "collection",
-                          "binding_collection_name": "$collection_name",
-                          "binding_name": "#realms_chevron_visibility",
-                          "binding_name_override": "#visible"
-                        }
-                      ]
-                    }
-                  },
                   {
                     "csb_icon@world_templates.csb_banner": {
                       "size": [ "100%c", 12 ],
@@ -500,29 +486,6 @@
           "size": [ 2, "100%" ]
         }
       },
-      {
-        "expiration_timer": {
-          "type": "label",
-          "size": [ "default", "100%" ],
-          "max_size": [ 60, "100%" ],
-          "color": "$dark_button_default_text_color",
-          "font_type": "smooth",
-          "text": "#realms_expiration_label",
-          "bindings": [
-            {
-              "binding_type": "collection",
-              "binding_collection_name": "$collection_name",
-              "binding_name": "#realms_expiration_label"
-            },
-            {
-              "binding_type": "collection",
-              "binding_collection_name": "$collection_name",
-              "binding_name": "#realms_expiration_visible",
-              "binding_name_override": "#visible"
-            }
-          ]
-        }
-      },
       {
         "pad_1": {
           "type": "panel",
diff --git a/version.json b/version.json
index 7cca4d0b7..d331fbb1a 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,6 @@
 {
-  "latest": { "version": "1.21.20.22", "date": "10-07-2024", "type": "preview" },
+  "latest": { "version": "1.21.20.23", "date": "17-07-2024", "type": "preview" },
+  "1.21.20.23": { "version": "1.21.20.23", "date": "17-07-2024", "type": "preview" },
   "1.21.20.22": { "version": "1.21.20.22", "date": "10-07-2024", "type": "preview" },
   "1.21.20.21": { "version": "1.21.20.21", "date": "27-06-2024", "type": "preview" },
   "1.21.10.24": { "version": "1.21.10.24", "date": "19-06-2024", "type": "preview" },