diff --git a/bin/test-file-extensions.js b/bin/test-file-extensions.js
old mode 100644
new mode 100755
diff --git a/bin/test-file-locations.js b/bin/test-file-locations.js
old mode 100644
new mode 100755
diff --git a/bin/test-json-brew.js b/bin/test-json-brew.js
old mode 100644
new mode 100755
diff --git a/bin/test-json-ua.js b/bin/test-json-ua.js
old mode 100644
new mode 100755
diff --git a/schema-template/items-base.json b/schema-template/items-base.json
index f37e59a..c350d05 100644
--- a/schema-template/items-base.json
+++ b/schema-template/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -140,6 +140,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -151,6 +154,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -263,6 +269,23 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+
+				"charges": {
+					"type": ["string", "integer"]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
+
+				"$$if": {
+					"modes": ["brew", "ua"],
+					"value": {
+						"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
+					}
+				},
 				"$$ifBrew": {
 					"currencyConversion": {
 						"description": "ID of a value conversion table. Homebrew only.",
@@ -356,21 +379,7 @@
 				"hasFluff": {"type": "boolean"},
 				"hasFluffImages": {"type": "boolean"}
 			},
-			"$$if": {
-				"modes": ["site", "ua"],
-				"value": {
-					"additionalProperties": false
-				}
-			},
-			"$$ifBrew": {
-				"additionalProperties": {
-					"type": [
-						"boolean",
-						"integer",
-						"string"
-					]
-				}
-			}
+			"additionalProperties": false
 		},
 
 		"baseitem": {
diff --git a/schema-template/items-shared.json b/schema-template/items-shared.json
index 01e3827..625c6c2 100644
--- a/schema-template/items-shared.json
+++ b/schema-template/items-shared.json
@@ -4,7 +4,7 @@
 
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 
 	"$defs" : {
 		"_itemModifySpeedEqual": {
@@ -222,6 +222,24 @@
 			"type": "integer"
 		},
 
+		"$$if": {
+			"modes": ["brew", "ua"],
+			"value": {
+				"customProperties": {
+					"description": "An unrestricted area for custom properties to be stored.",
+					"type": "object",
+					"additionalProperties": {
+						"type": [
+							"boolean",
+							"string",
+							"number",
+							"integer"
+						]
+					}
+				}
+			}
+		},
+
 		"$$ifBrew": {
 			"fluff": {
 				"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
diff --git a/schema-template/items.json b/schema-template/items.json
index 550a38a..a836c1e 100644
--- a/schema-template/items.json
+++ b/schema-template/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -467,6 +467,12 @@
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
 
+				"$$if": {
+					"modes": ["brew", "ua"],
+					"value": {
+						"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
+					}
+				},
 				"$$ifBrew": {
 					"acSpecial": {
 						"description": "Free text field for homebrew use.",
@@ -494,21 +500,7 @@
 					}
 				}
 			},
-			"$$if": {
-				"modes": ["site", "ua"],
-				"value": {
-					"additionalProperties": false
-				}
-			},
-			"$$ifBrew": {
-				"additionalProperties": {
-					"type": [
-						"boolean",
-						"integer",
-						"string"
-					]
-				}
-			}
+			"additionalProperties": false
 		},
 
 		"item": {
diff --git a/schema-template/magicvariants.json b/schema-template/magicvariants.json
index e2dfec7..21ac4ba 100644
--- a/schema-template/magicvariants.json
+++ b/schema-template/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -34,6 +34,12 @@
 								"crossbow": {"type": "boolean"},
 								"sword": {"type": "boolean"},
 								"weapon": {"type": "boolean"},
+								"firearm": {"type": "boolean"},
+								"mace": {"type": "boolean"},
+								"spear": {"type": "boolean"},
+								"hammer": {"type": "boolean"},
+								"club": {"type": "boolean"},
+								"dagger": {"type": "boolean"},
 								"dmgType": {"$ref": "util.json#/$defs/dataDamageTags"},
 								"name": {"type": "string"},
 								"source": {"$ref": "util.json#/$defs/source"},
@@ -41,17 +47,23 @@
 								"scfType": {"$ref": "items-shared.json#/$defs/itemScfType"},
 								"net": {"type": "boolean"},
 								"weaponCategory": {"$ref": "items-shared.json#/$defs/itemWeaponCategory"},
-								"property": {"type": "string"}
-							},
-							"$$if": {
-								"modes": ["site", "ua"],
-								"value": {
-									"additionalProperties": false
+								"property": {"type": "string"},
+								"$$if": {
+									"modes": ["brew", "ua"],
+									"value": {
+										"customProperties": {
+											"description": "A more restrictive area for custom boolean-only properties to be stored.",
+											"type": "object",
+											"additionalProperties": {
+												"type": [
+													"boolean"
+												]
+											}
+										}
+									}
 								}
 							},
-							"$$ifBrew": {
-								"additionalProperties": {"type": "boolean"}
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -73,6 +85,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -97,6 +115,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -117,6 +145,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": ["string", "boolean"]
 							},
@@ -201,6 +232,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -219,7 +253,20 @@
 							},
 							"mastery": {"$ref": "items-shared.json#/$defs/itemMastery"},
 							"reach": {"$ref": "items-shared.json#/$defs/itemReach"},
+							"$$if": {
+								"modes": ["brew", "ua"],
+								"value": {
+									"customProperties": {
+										"description": "An unrestricted area for custom properties to be stored.",
+										"type": "object"
+									}
+								}
+							},
 							"$$ifBrew": {
+								"currencyConversion": {
+									"description": "ID of a value conversion table. Homebrew only.",
+									"type": "string"
+								},
 								"fluff": {
 									"$ref": "items-shared.json#/$defs/fluff"
 								}
@@ -234,21 +281,7 @@
 							"source",
 							"page"
 						],
-						"$$if": {
-							"modes": ["site", "ua"],
-							"value": {
-								"additionalProperties": false
-							}
-						},
-						"$$ifBrew": {
-							"additionalProperties": {
-								"type": [
-									"boolean",
-									"integer",
-									"string"
-								]
-							}
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -280,25 +313,27 @@
 									}
 								]
 							},
-							"net": {
-								"type": "boolean"
-							}
-						},
-						"$$if": {
-							"modes": ["site", "ua"],
-							"value": {
-								"additionalProperties": false
+							"net": {"type": "boolean"},
+							"armor": {"type": "boolean"},
+							"axe": {"type": "boolean"},
+							"bow": {"type": "boolean"},
+							"crossbow": {"type": "boolean"},
+							"sword": {"type": "boolean"},
+							"weapon": {"type": "boolean"},
+							"firearm": {"type": "boolean"},
+							"mace": {"type": "boolean"},
+							"spear": {"type": "boolean"},
+							"hammer": {"type": "boolean"},
+							"club": {"type": "boolean"},
+							"dagger": {"type": "boolean"},
+							"$$if": {
+								"modes": ["brew", "ua"],
+								"value": {
+									"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
+								}
 							}
 						},
-						"$$ifBrew": {
-							"additionalProperties": {
-								"type": [
-									"boolean",
-									"integer",
-									"string"
-								]
-							}
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -313,6 +348,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -326,6 +362,12 @@
 					},
 					"hasFluff": {"type": "boolean"},
 					"hasFluffImages": {"type": "boolean"},
+					"$$if": {
+						"modes": ["brew", "ua"],
+						"value": {
+							"customProperties": {"$ref": "items-shared.json#/$defs/customProperties"}
+						}
+					},
 					"$$ifBrew": {
 						"fluff": {
 							"$ref": "items-shared.json#/$defs/fluff"
diff --git a/schema-template/makebrew-creature.json b/schema-template/makebrew-creature.json
index 2e96683..9ff90ff 100644
--- a/schema-template/makebrew-creature.json
+++ b/schema-template/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -30,7 +30,8 @@
 					"name",
 					{"$$ifBrew_item": "source"},
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -56,7 +57,8 @@
 					"name",
 					{"$$ifBrew_item": "source"},
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/brew-fast/items-base.json b/schema/brew-fast/items-base.json
index 738c5db..f2503c2 100644
--- a/schema/brew-fast/items-base.json
+++ b/schema/brew-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -176,6 +176,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -191,6 +194,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -301,6 +307,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -390,6 +408,9 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
+				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
 					"type": "string"
@@ -425,13 +446,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"baseitem": {
 			"anyOf": [
@@ -444,6 +459,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -459,6 +477,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -569,6 +590,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -658,6 +691,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -693,13 +729,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"type",
@@ -716,6 +746,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -731,6 +764,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -841,6 +877,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -930,6 +978,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -1031,13 +1082,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew-fast/items-shared.json b/schema/brew-fast/items-shared.json
index 59da9ab..0e2479a 100644
--- a/schema/brew-fast/items-shared.json
+++ b/schema/brew-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -276,6 +276,18 @@
 		"itemReach": {
 			"type": "integer"
 		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
+		},
 		"fluff": {
 			"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
 			"anyOf": [
diff --git a/schema/brew-fast/items.json b/schema/brew-fast/items.json
index 3604685..ae0dc9a 100644
--- a/schema/brew-fast/items.json
+++ b/schema/brew-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -546,6 +546,9 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
+				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
 					"type": "string"
@@ -589,13 +592,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"item": {
 			"anyOf": [
@@ -1141,6 +1138,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1184,13 +1184,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"rarity",
@@ -1739,6 +1733,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1848,13 +1845,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew-fast/magicvariants.json b/schema/brew-fast/magicvariants.json
index 870f2e0..a9f327a 100644
--- a/schema/brew-fast/magicvariants.json
+++ b/schema/brew-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -69,11 +87,18 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
+									"type": "object",
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
+									}
 								}
 							},
-							"additionalProperties": {
-								"type": "boolean"
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -95,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -119,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -143,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -240,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -266,6 +313,14 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
+							},
+							"currencyConversion": {
+								"description": "ID of a value conversion table. Homebrew only.",
+								"type": "string"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -275,13 +330,7 @@
 							"source",
 							"page"
 						],
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -317,15 +366,48 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
+							"customProperties": {
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -343,6 +425,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -360,6 +443,9 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
+					"customProperties": {
+						"$ref": "items-shared.json#/$defs/customProperties"
+					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
 					},
diff --git a/schema/brew-fast/makebrew-creature.json b/schema/brew-fast/makebrew-creature.json
index 681d3ac..0db638c 100644
--- a/schema/brew-fast/makebrew-creature.json
+++ b/schema/brew-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -32,7 +32,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -60,7 +61,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/brew/items-base.json b/schema/brew/items-base.json
index 738c5db..f2503c2 100644
--- a/schema/brew/items-base.json
+++ b/schema/brew/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -176,6 +176,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -191,6 +194,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -301,6 +307,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -390,6 +408,9 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
+				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
 					"type": "string"
@@ -425,13 +446,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"baseitem": {
 			"anyOf": [
@@ -444,6 +459,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -459,6 +477,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -569,6 +590,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -658,6 +691,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -693,13 +729,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"type",
@@ -716,6 +746,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -731,6 +764,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -841,6 +877,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -930,6 +978,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -1031,13 +1082,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew/items-shared.json b/schema/brew/items-shared.json
index 59da9ab..0e2479a 100644
--- a/schema/brew/items-shared.json
+++ b/schema/brew/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -276,6 +276,18 @@
 		"itemReach": {
 			"type": "integer"
 		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
+		},
 		"fluff": {
 			"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
 			"anyOf": [
diff --git a/schema/brew/items.json b/schema/brew/items.json
index 3604685..ae0dc9a 100644
--- a/schema/brew/items.json
+++ b/schema/brew/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -546,6 +546,9 @@
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
+				},
 				"acSpecial": {
 					"description": "Free text field for homebrew use.",
 					"type": "string"
@@ -589,13 +592,7 @@
 					"$ref": "items-shared.json#/$defs/fluff"
 				}
 			},
-			"additionalProperties": {
-				"type": [
-					"boolean",
-					"integer",
-					"string"
-				]
-			}
+			"additionalProperties": false
 		},
 		"item": {
 			"anyOf": [
@@ -1141,6 +1138,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1184,13 +1184,7 @@
 							"$ref": "items-shared.json#/$defs/fluff"
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"name",
 						"rarity",
@@ -1739,6 +1733,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"acSpecial": {
 							"description": "Free text field for homebrew use.",
 							"type": "string"
@@ -1848,13 +1845,7 @@
 							"additionalProperties": false
 						}
 					},
-					"additionalProperties": {
-						"type": [
-							"boolean",
-							"integer",
-							"string"
-						]
-					},
+					"additionalProperties": false,
 					"required": [
 						"_copy"
 					]
diff --git a/schema/brew/magicvariants.json b/schema/brew/magicvariants.json
index 870f2e0..a9f327a 100644
--- a/schema/brew/magicvariants.json
+++ b/schema/brew/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -69,11 +87,18 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
+									"type": "object",
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
+									}
 								}
 							},
-							"additionalProperties": {
-								"type": "boolean"
-							}
+							"additionalProperties": false
 						}
 					},
 					"inherits": {
@@ -95,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -119,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -143,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -240,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -266,6 +313,14 @@
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
+							},
+							"currencyConversion": {
+								"description": "ID of a value conversion table. Homebrew only.",
+								"type": "string"
+							},
 							"fluff": {
 								"$ref": "items-shared.json#/$defs/fluff"
 							}
@@ -275,13 +330,7 @@
 							"source",
 							"page"
 						],
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"excludes": {
 						"type": "object",
@@ -317,15 +366,48 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
+							"customProperties": {
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
-						"additionalProperties": {
-							"type": [
-								"boolean",
-								"integer",
-								"string"
-							]
-						}
+						"additionalProperties": false
 					},
 					"noDisplay": {
 						"type": "boolean"
@@ -343,6 +425,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -360,6 +443,9 @@
 					"hasFluffImages": {
 						"type": "boolean"
 					},
+					"customProperties": {
+						"$ref": "items-shared.json#/$defs/customProperties"
+					},
 					"fluff": {
 						"$ref": "items-shared.json#/$defs/fluff"
 					},
diff --git a/schema/brew/makebrew-creature.json b/schema/brew/makebrew-creature.json
index 681d3ac..0db638c 100644
--- a/schema/brew/makebrew-creature.json
+++ b/schema/brew/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -32,7 +32,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -60,7 +61,8 @@
 					"name",
 					"source",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/site-fast/items-base.json b/schema/site-fast/items-base.json
index e8d4fdb..33f8223 100644
--- a/schema/site-fast/items-base.json
+++ b/schema/site-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -196,6 +199,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +312,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -409,6 +427,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -424,6 +445,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +558,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -641,6 +677,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -656,6 +695,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +808,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
diff --git a/schema/site-fast/items-shared.json b/schema/site-fast/items-shared.json
index 51f0992..2bf0a5e 100644
--- a/schema/site-fast/items-shared.json
+++ b/schema/site-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
diff --git a/schema/site-fast/items.json b/schema/site-fast/items.json
index 87ce2fd..5aa0ad7 100644
--- a/schema/site-fast/items.json
+++ b/schema/site-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site-fast/magicvariants.json b/schema/site-fast/magicvariants.json
index 1a2d9bf..93910d5 100644
--- a/schema/site-fast/magicvariants.json
+++ b/schema/site-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -93,6 +111,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +141,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +175,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +275,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -306,6 +346,42 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +402,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
diff --git a/schema/site-fast/makebrew-creature.json b/schema/site-fast/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/site-fast/makebrew-creature.json
+++ b/schema/site-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/site/items-base.json b/schema/site/items-base.json
index e8d4fdb..33f8223 100644
--- a/schema/site/items-base.json
+++ b/schema/site/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -196,6 +199,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +312,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -409,6 +427,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -424,6 +445,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +558,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -641,6 +677,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -656,6 +695,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +808,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
diff --git a/schema/site/items-shared.json b/schema/site/items-shared.json
index 51f0992..2bf0a5e 100644
--- a/schema/site/items-shared.json
+++ b/schema/site/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
diff --git a/schema/site/items.json b/schema/site/items.json
index 87ce2fd..5aa0ad7 100644
--- a/schema/site/items.json
+++ b/schema/site/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
diff --git a/schema/site/magicvariants.json b/schema/site/magicvariants.json
index 1a2d9bf..93910d5 100644
--- a/schema/site/magicvariants.json
+++ b/schema/site/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -93,6 +111,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +141,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +175,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +275,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -306,6 +346,42 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +402,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
diff --git a/schema/site/makebrew-creature.json b/schema/site/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/site/makebrew-creature.json
+++ b/schema/site/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/ua-fast/items-base.json b/schema/ua-fast/items-base.json
index e8d4fdb..52417d9 100644
--- a/schema/ua-fast/items-base.json
+++ b/schema/ua-fast/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -196,6 +199,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +312,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -394,6 +412,9 @@
 				},
 				"hasFluffImages": {
 					"type": "boolean"
+				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -409,6 +430,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -424,6 +448,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +561,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -622,6 +661,9 @@
 						},
 						"hasFluffImages": {
 							"type": "boolean"
+						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -641,6 +683,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -656,6 +701,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +814,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -855,6 +915,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua-fast/items-shared.json b/schema/ua-fast/items-shared.json
index 469b5e9..249c11b 100644
--- a/schema/ua-fast/items-shared.json
+++ b/schema/ua-fast/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -275,6 +275,18 @@
 		},
 		"itemReach": {
 			"type": "integer"
+		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/schema/ua-fast/items.json b/schema/ua-fast/items.json
index 87ce2fd..faebad2 100644
--- a/schema/ua-fast/items.json
+++ b/schema/ua-fast/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -545,6 +545,9 @@
 				"hasRefs": {
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -1092,6 +1095,9 @@
 						"hasRefs": {
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -1643,6 +1649,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua-fast/magicvariants.json b/schema/ua-fast/magicvariants.json
index 1a2d9bf..ee8fcd2 100644
--- a/schema/ua-fast/magicvariants.json
+++ b/schema/ua-fast/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -69,6 +87,15 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
+									"type": "object",
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
+									}
 								}
 							},
 							"additionalProperties": false
@@ -93,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -263,6 +312,10 @@
 							"hasRefs": {
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"required": [
@@ -306,6 +359,45 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
+							"customProperties": {
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +418,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -342,6 +435,9 @@
 					},
 					"hasFluffImages": {
 						"type": "boolean"
+					},
+					"customProperties": {
+						"$ref": "items-shared.json#/$defs/customProperties"
 					}
 				},
 				"required": [
diff --git a/schema/ua-fast/makebrew-creature.json b/schema/ua-fast/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/ua-fast/makebrew-creature.json
+++ b/schema/ua-fast/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},
diff --git a/schema/ua/items-base.json b/schema/ua/items-base.json
index e8d4fdb..52417d9 100644
--- a/schema/ua/items-base.json
+++ b/schema/ua/items-base.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.10",
+	"version": "1.5.12",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -181,6 +181,9 @@
 				"type": {
 					"$ref": "items-shared.json#/$defs/itemType"
 				},
+				"typeAlt": {
+					"$ref": "items-shared.json#/$defs/itemType"
+				},
 				"rarity": {
 					"$ref": "items-shared.json#/$defs/itemRarity"
 				},
@@ -196,6 +199,9 @@
 				"age": {
 					"$ref": "items-shared.json#/$defs/itemAge"
 				},
+				"bonusWeapon": {
+					"type": "string"
+				},
 				"dmg1": {
 					"type": "string"
 				},
@@ -306,6 +312,18 @@
 				"speed": {
 					"$ref": "items-shared.json#/$defs/itemSpeed"
 				},
+				"charges": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"recharge": {
+					"$ref": "items-shared.json#/$defs/itemRecharge"
+				},
+				"rechargeAmount": {
+					"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+				},
 				"valueMult": {
 					"type": "number"
 				},
@@ -394,6 +412,9 @@
 				},
 				"hasFluffImages": {
 					"type": "boolean"
+				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -409,6 +430,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -424,6 +448,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -534,6 +561,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -622,6 +661,9 @@
 						},
 						"hasFluffImages": {
 							"type": "boolean"
+						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -641,6 +683,9 @@
 						"type": {
 							"$ref": "items-shared.json#/$defs/itemType"
 						},
+						"typeAlt": {
+							"$ref": "items-shared.json#/$defs/itemType"
+						},
 						"rarity": {
 							"$ref": "items-shared.json#/$defs/itemRarity"
 						},
@@ -656,6 +701,9 @@
 						"age": {
 							"$ref": "items-shared.json#/$defs/itemAge"
 						},
+						"bonusWeapon": {
+							"type": "string"
+						},
 						"dmg1": {
 							"type": "string"
 						},
@@ -766,6 +814,18 @@
 						"speed": {
 							"$ref": "items-shared.json#/$defs/itemSpeed"
 						},
+						"charges": {
+							"type": [
+								"string",
+								"integer"
+							]
+						},
+						"recharge": {
+							"$ref": "items-shared.json#/$defs/itemRecharge"
+						},
+						"rechargeAmount": {
+							"$ref": "items-shared.json#/$defs/itemRechargeAmount"
+						},
 						"valueMult": {
 							"type": "number"
 						},
@@ -855,6 +915,9 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua/items-shared.json b/schema/ua/items-shared.json
index 469b5e9..249c11b 100644
--- a/schema/ua/items-shared.json
+++ b/schema/ua/items-shared.json
@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",
@@ -275,6 +275,18 @@
 		},
 		"itemReach": {
 			"type": "integer"
+		},
+		"customProperties": {
+			"description": "An unrestricted area for custom properties to be stored.",
+			"type": "object",
+			"additionalProperties": {
+				"type": [
+					"boolean",
+					"string",
+					"number",
+					"integer"
+				]
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/schema/ua/items.json b/schema/ua/items.json
index 87ce2fd..faebad2 100644
--- a/schema/ua/items.json
+++ b/schema/ua/items.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.1",
+	"version": "1.14.3",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -545,6 +545,9 @@
 				"hasRefs": {
 					"type": "boolean",
 					"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+				},
+				"customProperties": {
+					"$ref": "items-shared.json#/$defs/customProperties"
 				}
 			},
 			"additionalProperties": false
@@ -1092,6 +1095,9 @@
 						"hasRefs": {
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
 						}
 					},
 					"additionalProperties": false,
@@ -1643,6 +1649,9 @@
 							"type": "boolean",
 							"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
 						},
+						"customProperties": {
+							"$ref": "items-shared.json#/$defs/customProperties"
+						},
 						"_copy": {
 							"type": "object",
 							"properties": {
diff --git a/schema/ua/magicvariants.json b/schema/ua/magicvariants.json
index 1a2d9bf..ee8fcd2 100644
--- a/schema/ua/magicvariants.json
+++ b/schema/ua/magicvariants.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.4",
+	"version": "1.8.6",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -46,6 +46,24 @@
 								"weapon": {
 									"type": "boolean"
 								},
+								"firearm": {
+									"type": "boolean"
+								},
+								"mace": {
+									"type": "boolean"
+								},
+								"spear": {
+									"type": "boolean"
+								},
+								"hammer": {
+									"type": "boolean"
+								},
+								"club": {
+									"type": "boolean"
+								},
+								"dagger": {
+									"type": "boolean"
+								},
 								"dmgType": {
 									"$ref": "util.json#/$defs/dataDamageTags"
 								},
@@ -69,6 +87,15 @@
 								},
 								"property": {
 									"type": "string"
+								},
+								"customProperties": {
+									"description": "A more restrictive area for custom boolean-only properties to be stored.",
+									"type": "object",
+									"additionalProperties": {
+										"type": [
+											"boolean"
+										]
+									}
 								}
 							},
 							"additionalProperties": false
@@ -93,6 +120,12 @@
 								"description": "Properties to remove from the specific variant, if present on the base item.",
 								"$ref": "items-shared.json#/$defs/itemProperty"
 							},
+							"ac": {
+								"type": "integer"
+							},
+							"age": {
+								"$ref": "items-shared.json#/$defs/itemAge"
+							},
 							"bonusAc": {
 								"type": "string"
 							},
@@ -117,6 +150,16 @@
 							"bonusAbilityCheck": {
 								"type": "string"
 							},
+							"dmg1": {
+								"type": "string"
+							},
+							"dmg2": {
+								"type": "string",
+								"description": "The versatile or alternative damage dice of the weapon, e.g. \"1d10\""
+							},
+							"dmgType": {
+								"$ref": "util.json#/$defs/dataDamageTags"
+							},
 							"modifySpeed": {
 								"$ref": "items-shared.json#/$defs/itemModifySpeed"
 							},
@@ -141,6 +184,9 @@
 							"nameRemove": {
 								"type": "string"
 							},
+							"grantsProficiency": {
+								"type": "boolean"
+							},
 							"reqAttune": {
 								"type": [
 									"string",
@@ -238,6 +284,9 @@
 								"description": "Expression used to calculate each specific variant's value.",
 								"type": "string"
 							},
+							"weaponCategory": {
+								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
+							},
 							"weightMult": {
 								"type": "number"
 							},
@@ -263,6 +312,10 @@
 							"hasRefs": {
 								"type": "boolean",
 								"description": "Whether this item has references within its data to dedicated \"itemEntry\"s."
+							},
+							"customProperties": {
+								"description": "An unrestricted area for custom properties to be stored.",
+								"type": "object"
 							}
 						},
 						"required": [
@@ -306,6 +359,45 @@
 							},
 							"net": {
 								"type": "boolean"
+							},
+							"armor": {
+								"type": "boolean"
+							},
+							"axe": {
+								"type": "boolean"
+							},
+							"bow": {
+								"type": "boolean"
+							},
+							"crossbow": {
+								"type": "boolean"
+							},
+							"sword": {
+								"type": "boolean"
+							},
+							"weapon": {
+								"type": "boolean"
+							},
+							"firearm": {
+								"type": "boolean"
+							},
+							"mace": {
+								"type": "boolean"
+							},
+							"spear": {
+								"type": "boolean"
+							},
+							"hammer": {
+								"type": "boolean"
+							},
+							"club": {
+								"type": "boolean"
+							},
+							"dagger": {
+								"type": "boolean"
+							},
+							"customProperties": {
+								"$ref": "items-shared.json#/$defs/customProperties"
 							}
 						},
 						"additionalProperties": false
@@ -326,6 +418,7 @@
 						}
 					},
 					"ammo": {
+						"description": "Adds ammunition text to the header of the generic variant.",
 						"type": "boolean"
 					},
 					"reqAttuneTags": {
@@ -342,6 +435,9 @@
 					},
 					"hasFluffImages": {
 						"type": "boolean"
+					},
+					"customProperties": {
+						"$ref": "items-shared.json#/$defs/customProperties"
 					}
 				},
 				"required": [
diff --git a/schema/ua/makebrew-creature.json b/schema/ua/makebrew-creature.json
index 48a279d..781f951 100644
--- a/schema/ua/makebrew-creature.json
+++ b/schema/ua/makebrew-creature.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "makebrew-creature.json",
-	"version": "1.1.3",
+	"version": "1.1.4",
 	"type": "object",
 	"properties": {
 		"#makebrewCreatureTrait": {
@@ -31,7 +31,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		},
 		"makebrewCreatureAction": {
@@ -58,7 +59,8 @@
 				"required": [
 					"name",
 					"entries"
-				]
+				],
+				"additionalProperties": false
 			}
 		}
 	},